Skip to content
Browse files

Reverse 821525e and wrap run_generator call

Ruby 2.1.0 includes the json gem 1.8.1 by default so we need bundler 1.5.1
for `bundle install` to work. To fix this reverse the downgrade to 1.3.5
and wrap the `run_generator` call with a block that resets `THOR_DEBUG`.
  • Loading branch information...
1 parent 02d3668 commit a1d0c0fa3d8ca97edc8f2a1d6ba96af19221dbad @pixeltrix pixeltrix committed Jan 2, 2014
Showing with 14 additions and 4 deletions.
  1. +1 −1 .travis.yml
  2. +13 −3 railties/lib/rails/generators/testing/behaviour.rb
View
2 .travis.yml
@@ -1,6 +1,6 @@
script: 'ci/travis.rb'
before_install:
- - travis_retry gem install bundler -v 1.3.5
+ - travis_retry gem install bundler
- "rvm current | grep 'jruby' && export AR_JDBC=true || echo"
rvm:
- 1.9.3
View
16 railties/lib/rails/generators/testing/behaviour.rb
@@ -61,9 +61,11 @@ def destination(path)
# You can provide a configuration hash as second argument. This method returns the output
# printed by the generator.
def run_generator(args=self.default_arguments, config={})
- capture(:stdout) do
- args += ['--skip-bundle'] unless args.include? '--dev'
- self.generator_class.start(args, config.reverse_merge(destination_root: destination_root))
+ without_thor_debug do
+ capture(:stdout) do
+ args += ['--skip-bundle'] unless args.include? '--dev'
+ self.generator_class.start(args, config.reverse_merge(destination_root: destination_root))
+ end
end
end
@@ -100,6 +102,14 @@ def migration_file_name(relative) # :nodoc:
dirname, file_name = File.dirname(absolute), File.basename(absolute).sub(/\.rb$/, '')
Dir.glob("#{dirname}/[0-9]*_*.rb").grep(/\d+_#{file_name}.rb$/).first
end
+
+ # TODO: remove this once Bundler 1.5.2 is released
+ def without_thor_debug # :nodoc:
+ thor_debug, ENV['THOR_DEBUG'] = ENV['THOR_DEBUG'], nil
+ yield
+ ensure
+ ENV['THOR_DEBUG'] = thor_debug
+ end
end
end
end

0 comments on commit a1d0c0f

Please sign in to comment.
Something went wrong with that request. Please try again.