From b4f9377b3a8bc85cb98913163f66760df6650ccf Mon Sep 17 00:00:00 2001 From: Arun Agrawal Date: Sat, 11 Jan 2014 08:50:31 +0100 Subject: Removing without_thor_debug a1d0c0fa3d8ca97edc8f2a1d6ba96af19221dbad as bundler 1.5.2 is out now --- railties/lib/rails/generators/testing/behaviour.rb | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'railties/lib/rails') diff --git a/railties/lib/rails/generators/testing/behaviour.rb b/railties/lib/rails/generators/testing/behaviour.rb index 8e9028a3fb..7576eba6e0 100644 --- a/railties/lib/rails/generators/testing/behaviour.rb +++ b/railties/lib/rails/generators/testing/behaviour.rb @@ -61,11 +61,9 @@ module Rails # 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={}) - 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 + capture(:stdout) do + args += ['--skip-bundle'] unless args.include? '--dev' + self.generator_class.start(args, config.reverse_merge(destination_root: destination_root)) end end @@ -102,14 +100,6 @@ module Rails 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 -- cgit v1.2.3