diff --git a/middleman-cli/lib/middleman-cli/init.rb b/middleman-cli/lib/middleman-cli/init.rb index 0dab0b11..4376db2a 100644 --- a/middleman-cli/lib/middleman-cli/init.rb +++ b/middleman-cli/lib/middleman-cli/init.rb @@ -28,10 +28,6 @@ module Middleman::Cli :type => :boolean, :default => false, :desc => 'Include a config.ru file' - method_option 'skip-gemfile', - :type => :boolean, - :default => false, - :desc => "Don't create a Gemfile" method_option 'skip-bundle', :type => :boolean, :aliases => '-B', diff --git a/middleman-templates/lib/middleman-templates.rb b/middleman-templates/lib/middleman-templates.rb index 06c83f55..467c1345 100644 --- a/middleman-templates/lib/middleman-templates.rb +++ b/middleman-templates/lib/middleman-templates.rb @@ -62,17 +62,13 @@ module Middleman end class_option :'skip-bundle', :type => :boolean, :default => false - class_option :'skip-gemfile', :type => :boolean, :default => false # Write a Bundler Gemfile file for project # @return [void] def generate_bundler! - return if options[:'skip-gemfile'] - template self.class.gemfile_template, File.join(location, 'Gemfile') - return if options[:'skip-bundle'] inside(location) do - ::Middleman::Cli::Bundle.new.invoke(:bundle) + run('bundle install') end unless ENV['TEST'] end