bundler 1.1.pre.1 → 1.1.pre.2

data/spec/lock/git_spec.rb

@@ -27,7 +27,7 @@ describe "bundle lock with git gems" do
 
   it "provides correct #full_gem_path" do
     run <<-RUBY
-      puts Gem.source_index.find_name('foo').first.full_gem_path
+      puts Bundler.rubygems.find_name('foo').first.full_gem_path
     RUBY
     out.should == bundle("show foo")
   end

data/spec/lock/lockfile_spec.rb

@@ -329,6 +329,29 @@ describe "the lockfile format" do
     G
   end
 
+  it "orders dependencies according to version" do
+    install_gemfile <<-G
+      source "file://#{gem_repo1}"
+      gem 'double_deps'
+    G
+
+    lockfile_should_be <<-G
+      GEM
+        remote: file:#{gem_repo1}/
+        specs:
+          double_deps (1.0)
+            net-ssh
+            net-ssh (>= 1.0.0)
+          net-ssh (1.0)
+
+      PLATFORMS
+        #{generic(Gem::Platform.local)}
+
+      DEPENDENCIES
+        double_deps
+    G
+  end
+
   it "does not add the :require option to the lockfile" do
     install_gemfile <<-G
       source "file://#{gem_repo1}"

data/spec/other/exec_spec.rb

@@ -83,7 +83,8 @@ describe "bundle exec" do
       gem "rack"
     G
 
-    rubyopt = "-I#{bundler_path} -rbundler/setup"
+    rubyopt = ENV['RUBYOPT']
+    rubyopt = "-I#{bundler_path} -rbundler/setup #{rubyopt}"
 
     bundle "exec 'echo $RUBYOPT'"
     out.should have_rubyopts(rubyopt)

data/spec/other/ext_spec.rb

@@ -14,3 +14,24 @@ describe "Bundler::GemHelpers#generic" do
     generic(pl('x86-darwin-10')).should == pl('ruby')
   end
 end
+
+describe "Gem::SourceIndex#refresh!" do
+  rubygems_1_7 = Gem::Version.new(Gem::VERSION) >= Gem::Version.new("1.7.0")
+
+  before do
+    install_gemfile <<-G
+      source "file://#{gem_repo1}"
+      gem "rack"
+    G
+  end
+
+  it "does not explode when called", :if => rubygems_1_7 do
+    run "Gem.source_index.refresh!"
+    run "Gem::SourceIndex.new([]).refresh!"
+  end
+
+  it "does not explode when called", :unless => rubygems_1_7 do
+    run "Gem.source_index.refresh!"
+    run "Gem::SourceIndex.from_gems_in([]).refresh!"
+  end
+end

data/spec/runtime/setup_spec.rb

@@ -166,7 +166,7 @@ describe "Bundler.setup" do
     should_be_installed "rack 1.0.0"
   end
 
-  describe "crippling rubygems" do
+  describe "integrate with rubygems" do
     describe "by replacing #gem" do
       before :each do
         install_gemfile <<-G
@@ -522,7 +522,7 @@ describe "Bundler.setup" do
 
     run <<-R
       Gem.refresh
-      puts Gem.source_index.find_name("rack").inspect
+      puts Bundler.rubygems.find_name("rack").inspect
     R
 
     out.should == "[]"

data/spec/support/builders.rb

@@ -217,6 +217,12 @@ module Spec
           s.add_dependency "net_d"
         end
 
+        # Capistrano did this (at least until version 2.5.10)
+        build_gem "double_deps" do |s|
+          s.add_dependency "net-ssh", ">= 1.0.0"
+          s.add_dependency "net-ssh"
+        end
+
         build_gem "foo"
       end
     end

data/spec/support/matchers.rb

@@ -67,23 +67,11 @@ module Spec
       bundled_app("Gemfile.lock").should exist
     end
 
-    RSpec::Matchers.define :be_with_diff do |expected|
+    def lockfile_should_be(expected)
+      should_be_locked
       spaces = expected[/\A\s+/, 0] || ""
       expected.gsub!(/^#{spaces}/, '')
-
-      failure_message_for_should do |actual|
-        "The lockfile did not match.\n=== Expected:\n" <<
-          expected << "\n=== Got:\n" << actual << "\n===========\n"
-      end
-
-      match do |actual|
-        expected == actual
-      end
-    end
-
-    def lockfile_should_be(expected)
-      lock = File.read(bundled_app("Gemfile.lock"))
-      lock.should be_with_diff(expected)
+      bundled_app("Gemfile.lock").read.should == expected
     end
   end
 end

metadata

@@ -1,26 +1,26 @@
 --- !ruby/object:Gem::Specification 
 name: bundler
 version: !ruby/object:Gem::Version 
-  hash: 1923831875
+  hash: 1923831877
   prerelease: true
   segments: 
   - 1
   - 1
   - pre
-  - 1
-  version: 1.1.pre.1
+  - 2
+  version: 1.1.pre.2
 platform: ruby
 authors: 
-- Carl Lerche
-- Yehuda Katz
 - "Andr\xC3\xA9 Arko"
 - Terence Lee
+- Carl Lerche
+- Yehuda Katz
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-02-02 00:00:00 -08:00
-default_executable: bundle
+date: 2011-04-28 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ronn
@@ -42,20 +42,18 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7712058
+        hash: 3
         segments: 
         - 2
         - 0
-        - 0
-        - rc
-        version: 2.0.0.rc
+        version: "2.0"
   type: :development
   version_requirements: *id002
 description: Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably
 email: 
-- carlhuda@engineyard.com
+- andre@arko.net
 executables: 
 - bundle
 extensions: []
@@ -90,6 +88,7 @@ files:
 - lib/bundler/remote_specification.rb
 - lib/bundler/resolver.rb
 - lib/bundler/rubygems_ext.rb
+- lib/bundler/rubygems_integration.rb
 - lib/bundler/runtime.rb
 - lib/bundler/settings.rb
 - lib/bundler/setup.rb