[Inline] Remove dependence on #define_singleton_method so things work on 1.8.7

2 files changed, 6 insertions, 7 deletions

diff --git a/lib/bundler/inline.rb b/lib/bundler/inline.rb
index b8c84f2c87..427ee619ab 100644
--- a/lib/bundler/inline.rb
+++ b/lib/bundler/inline.rb
@@ -16,5 +16,6 @@ def gemfile(install = false, &blk)
   runtime.setup_environment
   runtime.setup.require
 
-  Bundler.send(:define_singleton_method, :root, old_root)
+  bundler_module = class << Bundler; self; end
+  bundler_module.send(:define_method, :root, old_root)
 end
diff --git a/spec/runtime/inline_spec.rb b/spec/runtime/inline_spec.rb
index d7e613f1af..176c962953 100644
--- a/spec/runtime/inline_spec.rb
+++ b/spec/runtime/inline_spec.rb
@@ -58,11 +58,10 @@ describe "bundler/inline#gemfile" do
         path "#{lib_path}"
         gem "two"
       end
-
-      puts "success"
     RUBY
 
-    expect(out).to eq("two\nsuccess")
+    expect(out).to eq("two")
+    expect(exitstatus).to be_zero if exitstatus
 
     script <<-RUBY, :expect_err => true
       gemfile do
@@ -81,10 +80,9 @@ describe "bundler/inline#gemfile" do
         source "file://#{gem_repo1}"
         gem "rack"
       end
-
-      puts "success"
     RUBY
 
-    expect(out).to eq("Rack's post install message\nsuccess")
+    expect(out).to eq("Rack's post install message")
+    expect(exitstatus).to be_zero if exitstatus
   end
 end