by default, bundle install is run for new sites, the skip_bundle option disables this behavior and comments the Gemfile
did
committed May 26, 2014
commit a76b7b9ffae616887d04166163023c3c04660c33
Showing 9
changed files with
21 additions
and 34 deletions
generators/blank/Gemfile.tt
+1
-5
| @@ | @@ -1,10 +1,6 @@ |
| source 'https://rubygems.org' | |
| - | # ruby '1.9.3' |
| - | |
| - | # gem 'locomotivecms_wagon', '<%= config[:version] -%>' |
| - | gem 'locomotivecms_mounter', path: '/Users/didier/Documents/LocomotiveCMS/gems/mounter' |
| - | gem 'locomotivecms_wagon', path: '/Users/didier/Documents/LocomotiveCMS/wagon' |
| + | gem 'locomotivecms_wagon', '<%= config[:version] -%>' |
| group :development do | |
| # Mac OS X | |
generators/bootstrap2/Gemfile.tt
+1
-5
| @@ | @@ -1,10 +1,6 @@ |
| source 'https://rubygems.org' | |
| - | # ruby '1.9.3' |
| - | |
| - | # gem 'locomotivecms_wagon', '<%= config[:version] -%>' |
| - | gem 'locomotivecms_mounter', path: '/Users/didier/Documents/LocomotiveCMS/gems/mounter' |
| - | gem 'locomotivecms_wagon', path: '/Users/didier/Documents/LocomotiveCMS/wagon' |
| + | gem 'locomotivecms_wagon', '<%= config[:version] -%>' |
| group :development do | |
| # Mac OS X | |
generators/bootstrap3/Gemfile.tt
+1
-5
| @@ | @@ -1,10 +1,6 @@ |
| source 'https://rubygems.org' | |
| - | # ruby '1.9.3' |
| - | |
| - | # gem 'locomotivecms_wagon', '<%= config[:version] -%>' |
| - | gem 'locomotivecms_mounter', path: '/Users/didier/Documents/LocomotiveCMS/gems/mounter' |
| - | gem 'locomotivecms_wagon', path: '/Users/didier/Documents/LocomotiveCMS/wagon' |
| + | gem 'locomotivecms_wagon', '<%= config[:version] -%>' |
| group :development do | |
| # Mac OS X | |
generators/cloned/Gemfile.tt
+0
-2
| @@ | @@ -1,7 +1,5 @@ |
| source 'https://rubygems.org' | |
| - | # ruby '1.9.3' |
| - | |
| gem 'locomotivecms_wagon', '<%= config[:version] -%>' | |
| group :development do | |
generators/foundation4/Gemfile.tt
+1
-5
| @@ | @@ -1,10 +1,6 @@ |
| source 'https://rubygems.org' | |
| - | # ruby '1.9.3' |
| - | |
| - | # gem 'locomotivecms_wagon', '<%= config[:version] -%>' |
| - | gem 'locomotivecms_mounter', path: '/Users/didier/Documents/LocomotiveCMS/gems/mounter' |
| - | gem 'locomotivecms_wagon', path: '/Users/didier/Documents/LocomotiveCMS/wagon' |
| + | gem 'locomotivecms_wagon', '<%= config[:version] -%>' |
| group :development do | |
| # Mac OS X | |
generators/foundation5/Gemfile.tt
+1
-5
| @@ | @@ -1,10 +1,6 @@ |
| source 'https://rubygems.org' | |
| - | # ruby '1.9.3' |
| - | |
| - | # gem 'locomotivecms_wagon', '<%= config[:version] -%>' |
| - | gem 'locomotivecms_mounter', path: '/Users/didier/Documents/LocomotiveCMS/gems/mounter' |
| - | gem 'locomotivecms_wagon', path: '/Users/didier/Documents/LocomotiveCMS/wagon' |
| + | gem 'locomotivecms_wagon', '<%= config[:version] -%>' |
| group :development do | |
| # Mac OS X | |
generators/line_case/Gemfile.tt
+1
-3
| @@ | @@ -1,8 +1,6 @@ |
| source 'https://rubygems.org' | |
| - | # gem 'locomotivecms_wagon', '<%= config[:version] -%>' |
| - | gem 'locomotivecms_mounter', path: '/Users/didier/Documents/LocomotiveCMS/gems/mounter' |
| - | gem 'locomotivecms_wagon', path: '/Users/didier/Documents/LocomotiveCMS/wagon' |
| + | gem 'locomotivecms_wagon', '<%= config[:version] -%>' |
| group :development do | |
| # Mac OS X | |
locomotive/wagon/cli.rb b/lib/locomotive/wagon/cli.rb
+2
-2
| @@ | @@ -336,8 +336,8 @@ module Locomotive |
| say 'Next steps:', :bold | |
| next_instructions = "\tcd #{path}/#{name}\n\t" | |
| - | next_instructions += "bundle install\n\t" if skip_bundle |
| - | next_instructions += "bundle exec wagon serve\n\topen http://0.0.0.0:3333" |
| + | next_instructions += "bundle install\n\t" unless skip_bundle |
| + | next_instructions += "#{'bundle exec ' unless skip_bundle}wagon serve\n\topen http://0.0.0.0:3333" |
| say next_instructions | |
| end | |
locomotive/wagon/generators/site/base.rb b/lib/locomotive/wagon/generators/site/base.rb
+13
-2
| @@ | @@ -23,6 +23,14 @@ module Locomotive |
| }) | |
| end | |
| + | def comment_gemfile |
| + | return unless skip_bundle? |
| + | |
| + | gsub_file File.join(self.destination, 'Gemfile'), /^(.*)$/ do |match| |
| + | "# #{match}" |
| + | end |
| + | end |
| + | |
| def self.source_root | |
| File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'generators', self.name.demodulize.underscore) | |
| end | |
| @@ | @@ -38,7 +46,6 @@ module Locomotive |
| end | |
| def haml? | |
| - | puts options.inspect |
| if options[:haml].nil? | |
| yes?('Do you prefer HAML templates ?') | |
| else | |
| @@ | @@ -46,8 +53,12 @@ module Locomotive |
| end | |
| end | |
| + | def skip_bundle? |
| + | [true, 'true'].include?(skip_bundle) |
| + | end |
| + | |
| def bundle_install | |
| - | return if [true, 'true'].include?(skip_bundle) |
| + | return if skip_bundle? |
| FileUtils.cd self.destination | |