wip

dekellum · Jan 18, 2011 · 6dfc075 · 6dfc075
1 parent 4d6c3da
commit 6dfc075
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 3 deletions.
diff --git a/bin/bundle b/bin/bundle
@@ -2,6 +2,7 @@
 
 # Check if an older version of bundler is installed
 require 'bundler'
+$STDERR.puts Bundler::VERSION
 $:.each do |path|
   if path =~ %r'/bundler-0.(\d+)' && $1.to_i < 9
     abort "Please remove older versions of bundler. This can be done by running `gem cleanup bundler`."

diff --git a/spec/install/gems/packed_spec.rb b/spec/install/gems/packed_spec.rb
@@ -68,5 +68,16 @@
         out.should == "1.0.0 RUBY"
       end
     end
+
+    it "does not update the cache if --no-cache is passed" do
+      gemfile <<-G
+        source "file://#{gem_repo1}"
+        gem "rack"
+      G
+      bundled_app("vendor/cache").mkpath
+
+      bundle "install --no-cache"
+      bundled_app("vendor/cache").children.should be_empty
+    end
   end
 end
diff --git a/spec/other/help_spec.rb b/spec/other/help_spec.rb
@@ -1,10 +1,11 @@
 require "spec_helper"
 
 describe "bundle help" do
-  it "complains if older versions of bundler are installed" do
+  fit "complains if older versions of bundler are installed" do
     system_gems "bundler-0.8.1"
 
-    bundle "help", :expect_err => true
+    ruby "STDERR.puts $:.inspect"
+    # bundle "help", :expect_err => true
     err.should == "Please remove older versions of bundler. This can be done by running `gem cleanup bundler`."
   end
 

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -26,7 +26,7 @@
 
 Spec::Rubygems.setup
 FileUtils.rm_rf(Spec::Path.gem_repo1)
-ENV['RUBYOPT'] = "-I#{Spec::Path.root}/spec/support/rubygems_hax #{ENV['RUBYOPT']}"
+ENV['RUBYOPT'] = "#{ENV['RUBYOPT']} -r#{Spec::Path.root}/spec/support/rubygems_hax/platform.rb"
 ENV['BUNDLE_SPEC_RUN'] = "true"
 
 RSpec.configure do |config|

diff --git a/spec/support/rubygems_hax/rubygems_plugin.rb → spec/support/rubygems_hax/platform.rb b/spec/support/rubygems_hax/rubygems_plugin.rb → spec/support/rubygems_hax/platform.rb
@@ -1,3 +1,5 @@
+require 'rubygems'
+
 class Gem::Platform
   @local = new(ENV['BUNDLER_SPEC_PLATFORM']) if ENV['BUNDLER_SPEC_PLATFORM']
 end