kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Bundle automatically if --dev or --edge is given as option.

Browse source
This commit is contained in:
José Valim 2010-01-15 13:39:56 +01:00
parent c905fce35f
commit 5252f5c1c9
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
railties/lib/rails/generators/rails/app/app_generator.rb
View file

@ -168,12 +168,14 @@ module Rails::Generators
raise Error, "The template [#{rails_template}] could not be loaded. Error: #{e}"
end
def bundle_if_dev_or_edge
run "gem bundle" if dev_or_edge?
end
protected
attr_accessor :rails_template
def set_default_accessors!
app_name # Cache app name
self.rails_template = case options[:template]
when /^http:\/\//
options[:template]

8
railties/test/generators/app_generator_test.rb
View file

@ -144,7 +144,7 @@ class AppGeneratorTest < GeneratorsTestCase
template = %{ say "It works!" }
template.instance_eval "def read; self; end" # Make the string respond to read
generator([destination_root], :template => path, :database => "sqlite3").expects(:open).with(path).returns(template)
generator([destination_root], :template => path).expects(:open).with(path).returns(template)
assert_match /It works!/, silence(:stdout){ generator.invoke }
end
@ -168,14 +168,16 @@ class AppGeneratorTest < GeneratorsTestCase
end
def test_dev_option
run_generator [destination_root, "--dev"]
generator([destination_root], :dev => true).expects(:run).with("gem bundle")
silence(:stdout){ generator.invoke }
rails_path = File.expand_path('../../..', Rails.root)
dev_gem = %(directory #{rails_path.inspect}, :glob => "{*/,}*.gemspec")
assert_file 'Gemfile', /^#{Regexp.escape(dev_gem)}$/
end
def test_edge_option
run_generator [destination_root, "--edge"]
generator([destination_root], :edge => true).expects(:run).with("gem bundle")
silence(:stdout){ generator.invoke }
edge_gem = %(gem "rails", :git => "git://github.com/rails/rails.git")
assert_file 'Gemfile', /^#{Regexp.escape(edge_gem)}$/
end