bundler 1.2.5 → 1.3.0.pre

data/spec/spec_helper.rb

@@ -71,6 +71,10 @@ RSpec.configure do |config|
     pending "JRuby executables do not have a proper shebang" if RUBY_PLATFORM == "java"
   end
 
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
+
   config.before :all do
     build_repo1
   end
@@ -82,6 +86,8 @@ RSpec.configure do |config|
   end
 
   config.after :each do
+    puts @out if example.exception
+
     Dir.chdir(original_wd)
     # Reset ENV
     ENV['PATH']           = original_path

data/spec/support/artifice/endpoint.rb

@@ -1,4 +1,5 @@
 require File.expand_path("../../path.rb", __FILE__)
+require File.expand_path("../../../../lib/bundler/deprecate", __FILE__)
 include Spec::Path
 
 # Set up pretend http gem server with FakeWeb
@@ -13,20 +14,30 @@ require 'sinatra/base'
 class Endpoint < Sinatra::Base
 
   helpers do
-    def dependencies_for(gem_names, marshal = gem_repo1("Marshal.4.8"))
+    def dependencies_for(gem_names, marshal = gem_repo1("specs.4.8"))
       require 'rubygems'
-      Marshal.load(File.open(marshal).read).map do |gem, spec|
-        if gem_names.include?(spec.name)
-          {
-            :name         => spec.name,
-            :number       => spec.version.version,
-            :platform     => spec.platform.to_s,
-            :dependencies => spec.dependencies.select {|dep| dep.type == :runtime }.map do |dep|
-              [dep.name, dep.requirement.requirements.map {|a| a.join(" ") }.join(", ")]
-            end
-          }
-        end
-      end.compact
+      require 'bundler'
+      Bundler::Deprecate.skip_during do
+        Marshal.load(File.open(marshal).read).map do |name, version, platform|
+          spec = load_spec(name, version, platform)
+          if gem_names.include?(spec.name)
+            {
+              :name         => spec.name,
+              :number       => spec.version.version,
+              :platform     => spec.platform.to_s,
+              :dependencies => spec.dependencies.select {|dep| dep.type == :runtime }.map do |dep|
+                [dep.name, dep.requirement.requirements.map {|a| a.join(" ") }.join(", ")]
+              end
+            }
+          end
+        end.compact
+      end
+    end
+
+    def load_spec(name, version, platform)
+      full_name = "#{name}-#{version}"
+      full_name += "-#{platform}" if platform != "ruby"
+      Marshal.load(Gem.inflate(File.open(gem_repo1("quick/Marshal.4.8/#{full_name}.gemspec.rz")).read))
     end
   end
 
@@ -49,6 +60,10 @@ class Endpoint < Sinatra::Base
   get "/specs.4.8.gz" do
     File.read("#{gem_repo1}/specs.4.8.gz")
   end
+
+  get "/prerelease_specs.4.8.gz" do
+    File.read("#{gem_repo1}/prerelease_specs.4.8.gz")
+  end
 end
 
 Artifice.activate_with(Endpoint)

data/spec/support/artifice/endpoint_extra.rb

@@ -11,6 +11,10 @@ class EndpointExtra < Endpoint
     File.read("#{gem_repo2}/specs.4.8.gz")
   end
 
+  get "/extra/prerelease_specs.4.8.gz" do
+    File.read("#{gem_repo2}/prerelease_specs.4.8.gz")
+  end
+
   get "/extra/quick/Marshal.4.8/:id" do
     redirect "/extra/fetch/actual/gem/#{params[:id]}"
   end

data/spec/support/builders.rb

@@ -587,7 +587,7 @@ module Spec
             @spec.authors = ["that guy"]
           end
 
-          Gem::Builder.new(@spec).build
+          Bundler.rubygems.build(@spec)
           if opts[:to_system]
             `gem install --ignore-dependencies #{@spec.full_name}.gem`
           else

data/spec/support/helpers.rb

@@ -148,7 +148,7 @@ module Spec
       str  = args.shift || ""
       path.dirname.mkpath
       File.open(path.to_s, 'w') do |f|
-        f.puts str
+        f.puts strip_whitespace(str)
       end
     end
 
@@ -156,13 +156,8 @@ module Spec
       path = bundled_app("Gemfile.lock")
       path = args.shift if Pathname === args.first
       str  = args.shift || ""
-
-      # Trim the leading spaces
-      spaces = str[/\A\s+/, 0] || ""
-      str.gsub!(/^#{spaces}/, '')
-
       File.open(path.to_s, 'w') do |f|
-        f.puts str
+        f.puts strip_whitespace(str)
       end
     end
 

data/spec/support/indexes.rb

@@ -26,7 +26,7 @@ module Spec
     def should_resolve_as(specs)
       got = resolve
       got = got.map { |s| s.full_name }.sort
-      got.should == specs.sort
+      expect(got).to eq(specs.sort)
     end
 
     def should_conflict_on(names)
@@ -34,7 +34,7 @@ module Spec
         got = resolve
         flunk "The resolve succeeded with: #{got.map { |s| s.full_name }.sort.inspect}"
       rescue Bundler::VersionConflict => e
-        Array(names).sort.should == e.conflicts.sort
+        expect(Array(names).sort).to eq(e.conflicts.sort)
       end
     end
 
@@ -109,4 +109,4 @@ module Spec
       end
     end
   end
-end
+end

data/spec/support/matchers.rb

@@ -35,8 +35,8 @@ module Spec
         version_const = name == 'bundler' ? 'Bundler::VERSION' : Spec::Builders.constantize(name)
         run "require '#{name}.rb'; puts #{version_const}", *groups
         actual_version, actual_platform = out.split(/\s+/)
-        Gem::Version.new(actual_version).should eq(Gem::Version.new(version))
-        actual_platform.should == platform
+        expect(Gem::Version.new(actual_version)).to eq(Gem::Version.new(version))
+        expect(actual_platform).to eq(platform)
       end
     end
 
@@ -56,22 +56,22 @@ module Spec
           end
         R
         if version.nil? || out == "WIN"
-          out.should == "WIN"
+          expect(out).to eq("WIN")
         else
-          Gem::Version.new(out).should_not == Gem::Version.new(version)
+          expect(Gem::Version.new(out)).not_to eq(Gem::Version.new(version))
         end
       end
     end
 
     def should_be_locked
-      bundled_app("Gemfile.lock").should exist
+      expect(bundled_app("Gemfile.lock")).to exist
     end
 
     def lockfile_should_be(expected)
       should_be_locked
       spaces = expected[/\A\s+/, 0] || ""
       expected.gsub!(/^#{spaces}/, '')
-      bundled_app("Gemfile.lock").read.should == expected
+      expect(bundled_app("Gemfile.lock").read).to eq(expected)
     end
   end
 end

data/spec/update/gems_spec.rb

@@ -29,19 +29,19 @@ describe "bundle update" do
         exit!
       G
       bundle "update"
-      bundled_app("Gemfile.lock").should exist
+      expect(bundled_app("Gemfile.lock")).to exist
     end
   end
 
   describe "--quiet argument" do
     it 'shows UI messages without --quiet argument' do
       bundle "update"
-      out.should include("Fetching source")
+      expect(out).to include("Fetching source")
     end
 
     it 'does not show UI messages with --quiet argument' do
       bundle "update --quiet"
-      out.should_not include("Fetching source")
+      expect(out).not_to include("Fetching source")
     end
   end
 
@@ -56,12 +56,23 @@ describe "bundle update" do
     end
   end
 
+  describe "with a unknown dependency" do
+    it "should inform the user" do
+      bundle "update halting-problem-solver", :expect_err=>true
+      expect(out).to include "Could not find gem 'halting-problem-solver'"
+    end
+    it "should suggest alternatives" do
+      bundle "update active-support", :expect_err=>true
+      expect(out).to include "Did you mean activesupport?"
+    end
+  end
+
   describe "with --local option" do
     it "doesn't hit repo2" do
       FileUtils.rm_rf(gem_repo2)
 
       bundle "update --local"
-      out.should_not match(/Fetching source index/)
+      expect(out).not_to match(/Fetching source index/)
     end
   end
 end
@@ -122,13 +133,13 @@ describe "bundle update when a gem depends on a newer version of bundler" do
 
   it "should not explode" do
     bundle "update"
-    err.should be_empty
+    expect(err).to be_empty
   end
 
   it "should explain that bundler conflicted" do
     bundle "update"
-    out.should_not =~ /in snapshot/i
-    out.should =~ /current Bundler version/i
-    out.should =~ /perhaps you need to update bundler/i
+    expect(out).not_to match(/in snapshot/i)
+    expect(out).to match(/current Bundler version/i)
+    expect(out).to match(/perhaps you need to update bundler/i)
   end
 end

data/spec/update/git_spec.rb

@@ -32,7 +32,7 @@ describe "bundle update" do
       G
 
       bundle "update rails"
-      out.should include("Using activesupport (3.0) from #{lib_path('rails')} (at master)")
+      expect(out).to include("Using activesupport (3.0) from #{lib_path('rails')} (at master)")
       should_be_installed "rails 3.0", "activesupport 3.0"
     end
 
@@ -89,9 +89,9 @@ describe "bundle update" do
         gem "foo", "1.0", :git => "#{lib_path('foo_two')}"
       G
 
-      err.should be_empty
-      out.should include("Fetching #{lib_path}/foo_two")
-      out.should include("Your bundle is complete!")
+      expect(err).to be_empty
+      expect(out).to include("Fetching #{lib_path}/foo_two")
+      expect(out).to include("Your bundle is complete!")
     end
 
 
@@ -114,7 +114,7 @@ describe "bundle update" do
       G
 
       bundle "update", :exitstatus => true
-      exitstatus.should == 0
+      expect(exitstatus).to eq(0)
     end
 
     describe "with submodules" do
@@ -145,7 +145,7 @@ describe "bundle update" do
         G
 
         run "require 'submodule'"
-        out.should eq('GEM')
+        expect(out).to eq('GEM')
 
         install_gemfile <<-G
           git "#{lib_path('has_submodule-1.0')}", :submodules => true do
@@ -154,7 +154,7 @@ describe "bundle update" do
         G
 
         run "require 'submodule'"
-        out.should == 'GIT'
+        expect(out).to eq('GIT')
       end
 
       it "it unlocks the source when submodules is removed from git source" do
@@ -166,7 +166,7 @@ describe "bundle update" do
         G
 
         run "require 'submodule'"
-        out.should eq('GIT')
+        expect(out).to eq('GIT')
 
         install_gemfile <<-G
           git "#{lib_path('has_submodule-1.0')}" do
@@ -175,7 +175,7 @@ describe "bundle update" do
         G
 
         run "require 'submodule'"
-        out.should == 'GEM'
+        expect(out).to eq('GEM')
       end
     end
 
@@ -189,7 +189,7 @@ describe "bundle update" do
       lib_path("foo-1.0").join(".git").rmtree
 
       bundle :update, :expect_err => true
-      out.should include(lib_path("foo-1.0").to_s)
+      expect(out).to include(lib_path("foo-1.0").to_s)
     end
 
   end

data/spec/update/source_spec.rb

@@ -28,7 +28,7 @@ describe "bundle update" do
           puts "WIN" if defined?(FOO_PREV_REF)
         RUBY
 
-        out.should == "WIN"
+        expect(out).to eq("WIN")
       end
     end
 

metadata

@@ -1,64 +1,65 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: bundler
-version: !ruby/object:Gem::Version
-  version: 1.2.5
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: true
+  segments: 
+  - 1
+  - 3
+  - 0
+  - pre
+  version: 1.3.0.pre
 platform: ruby
-authors:
-- André Arko
+authors: 
+- "Andr\xC3\xA9 Arko"
 - Terence Lee
 - Carl Lerche
 - Yehuda Katz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-25 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-11-30 00:00:00 -08:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: ronn
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
-description: Bundler manages an application's dependencies through its entire life,
-  across many machines, systematically and repeatably
-email:
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 11
+        version: "2.11"
+  type: :development
+  version_requirements: *id002
+description: Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably
+email: 
 - andre@arko.net
-executables:
+executables: 
 - bundle
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
-- .rspec
 - .travis.yml
 - CHANGELOG.md
+- CONTRIBUTE.md
 - ISSUES.md
 - LICENSE
 - README.md
@@ -73,6 +74,7 @@ files:
 - lib/bundler/dep_proxy.rb
 - lib/bundler/dependency.rb
 - lib/bundler/deployment.rb
+- lib/bundler/deprecate.rb
 - lib/bundler/dsl.rb
 - lib/bundler/endpoint_specification.rb
 - lib/bundler/environment.rb
@@ -85,6 +87,7 @@ files:
 - lib/bundler/gem_tasks.rb
 - lib/bundler/graph.rb
 - lib/bundler/index.rb
+- lib/bundler/injector.rb
 - lib/bundler/installer.rb
 - lib/bundler/lazy_specification.rb
 - lib/bundler/lockfile_parser.rb
@@ -99,7 +102,13 @@ files:
 - lib/bundler/settings.rb
 - lib/bundler/setup.rb
 - lib/bundler/shared_helpers.rb
+- lib/bundler/similarity_detector.rb
 - lib/bundler/source.rb
+- lib/bundler/source/git.rb
+- lib/bundler/source/git/git_proxy.rb
+- lib/bundler/source/path.rb
+- lib/bundler/source/path/installer.rb
+- lib/bundler/source/rubygems.rb
 - lib/bundler/spec_set.rb
 - lib/bundler/templates/Executable
 - lib/bundler/templates/Executable.standalone
@@ -113,7 +122,13 @@ files:
 - lib/bundler/templates/newgem/lib/newgem.rb.tt
 - lib/bundler/templates/newgem/lib/newgem/version.rb.tt
 - lib/bundler/templates/newgem/newgem.gemspec.tt
+- lib/bundler/templates/newgem/rspec.tt
+- lib/bundler/templates/newgem/spec/newgem_spec.rb.tt
+- lib/bundler/templates/newgem/spec/spec_helper.rb.tt
+- lib/bundler/templates/newgem/test/minitest_helper.rb.tt
+- lib/bundler/templates/newgem/test/test_newgem.rb.tt
 - lib/bundler/ui.rb
+- lib/bundler/vendor/.document
 - lib/bundler/vendor/net/http/faster.rb
 - lib/bundler/vendor/net/http/persistent.rb
 - lib/bundler/vendor/thor.rb
@@ -160,6 +175,7 @@ files:
 - man/gemfile.5.ronn
 - man/index.txt
 - spec/bundler/bundler_spec.rb
+- spec/bundler/cli_rspec.rb
 - spec/bundler/definition_spec.rb
 - spec/bundler/dsl_spec.rb
 - spec/bundler/gem_helper_spec.rb
@@ -188,6 +204,7 @@ files:
 - spec/install/invalid_spec.rb
 - spec/install/path_spec.rb
 - spec/install/upgrade_spec.rb
+- spec/integration/inject.rb
 - spec/lock/git_spec.rb
 - spec/lock/lockfile_spec.rb
 - spec/other/check_spec.rb
@@ -204,6 +221,7 @@ files:
 - spec/other/platform_spec.rb
 - spec/other/show_spec.rb
 - spec/quality_spec.rb
+- spec/realworld/dependency_api_spec.rb
 - spec/realworld/edgecases_spec.rb
 - spec/resolver/basic_spec.rb
 - spec/resolver/platform_spec.rb
@@ -256,32 +274,43 @@ files:
 - lib/bundler/man/bundle.txt
 - lib/bundler/man/gemfile.5
 - lib/bundler/man/gemfile.5.txt
+has_rdoc: true
 homepage: http://gembundler.com
-licenses: []
+licenses: 
+- MIT
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 8
+      - 7
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 3
+      - 6
       version: 1.3.6
 requirements: []
+
 rubyforge_project: bundler
-rubygems_version: 1.8.23
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: The best way to manage your application's dependencies
-test_files:
+test_files: 
 - spec/bundler/bundler_spec.rb
+- spec/bundler/cli_rspec.rb
 - spec/bundler/definition_spec.rb
 - spec/bundler/dsl_spec.rb
 - spec/bundler/gem_helper_spec.rb
@@ -310,6 +339,7 @@ test_files:
 - spec/install/invalid_spec.rb
 - spec/install/path_spec.rb
 - spec/install/upgrade_spec.rb
+- spec/integration/inject.rb
 - spec/lock/git_spec.rb
 - spec/lock/lockfile_spec.rb
 - spec/other/check_spec.rb
@@ -326,6 +356,7 @@ test_files:
 - spec/other/platform_spec.rb
 - spec/other/show_spec.rb
 - spec/quality_spec.rb
+- spec/realworld/dependency_api_spec.rb
 - spec/realworld/edgecases_spec.rb
 - spec/resolver/basic_spec.rb
 - spec/resolver/platform_spec.rb