bundler 1.1.rc.8 → 1.1.0

data/CHANGELOG.md

@@ -1,4 +1,12 @@
-## 1.1.rc.8 (Jan 13, 2011)
+## 1.1.0 (Mar 7, 2012)
+
+Bugfixes:
+
+  - Clean up corrupted lockfiles on bundle installs
+  - Prevent duplicate GIT sources
+  - Fix post_install_message when uing the endpoint API
+
+## 1.1.rc.8 (Mar 3, 2012)
 
 Performance:
 

data/lib/bundler/dsl.rb

@@ -104,7 +104,11 @@ module Bundler
         return
       else
         @source = source
-        options[:prepend] ? @sources.unshift(@source) : @sources << @source
+        if options[:prepend]
+          @sources = [@source] | @sources
+        else
+          @sources = @sources | [@source]
+        end
 
         yield if block_given?
         return @source

data/lib/bundler/endpoint_specification.rb

@@ -53,6 +53,15 @@ module Bundler
       end
     end
 
+    # needed for post_install_messages during install
+    def post_install_message
+      if @remote_specification
+        @remote_specification.post_install_message
+      elsif _local_specification
+        _local_specification.post_install_message
+      end
+    end
+
     def _local_specification
       eval(File.read(local_specification_path)) if @loaded_from && File.exists?(local_specification_path)
     end

data/lib/bundler/lazy_specification.rb

@@ -25,6 +25,11 @@ module Bundler
       end
     end
 
+    def ==(other)
+      [name, version, dependencies, platform, source] ==
+        [other.name, other.version, other.dependencies, other.platform, other.source]
+    end
+
     def satisfies?(dependency)
       @name == dependency.name && dependency.requirement.satisfied_by?(Gem::Version.new(@version))
     end

data/lib/bundler/lockfile_parser.rb

@@ -1,5 +1,15 @@
 require "strscan"
 
+# Some versions of the Bundler 1.1 RC series introduced corrupted
+# lockfiles. There were two major problems:
+#
+# * multiple copies of the same GIT section appeared in the lockfile
+# * when this happened, those sections got multiple copies of gems
+#   in those sections.
+#
+# As a result, Bundler 1.1 contains code that fixes the earlier
+# corruption. We will remove this fix-up code in Bundler 1.2.
+
 module Bundler
   class LockfileParser
     attr_reader :sources, :dependencies, :specs, :platforms
@@ -37,6 +47,12 @@ module Bundler
         @opts, @type = {}, line
       when "  specs:"
         @current_source = TYPES[@type].from_lock(@opts)
+
+        # Strip out duplicate GIT sections
+        if @sources.include?(@current_source)
+          @current_source = @sources.find { |s| s == @current_source }
+        end
+
         @sources << @current_source
       when /^  ([a-z]+): (.*)$/i
         value = $2
@@ -89,7 +105,10 @@ module Bundler
         platform = $3 ? Gem::Platform.new($3) : Gem::Platform::RUBY
         @current_spec = LazySpecification.new(name, version, platform)
         @current_spec.source = @current_source
-        @specs << @current_spec
+
+        # Avoid introducing multiple copies of the same spec (caused by
+        # duplicate GIT sections)
+        @specs << @current_spec unless @specs.include?(@current_spec)
       elsif line =~ %r{^ {6}#{NAME_VERSION}$}
         name, version = $1, $2
         version = version.split(',').map { |d| d.strip } if version

data/lib/bundler/version.rb

@@ -2,5 +2,5 @@ module Bundler
   # We're doing this because we might write tests that deal
   # with other versions of bundler and we are unsure how to
   # handle this better.
-  VERSION = "1.1.rc.8" unless defined?(::Bundler::VERSION)
+  VERSION = "1.1.0" unless defined?(::Bundler::VERSION)
 end

data/spec/install/gems/dependency_api_spec.rb

@@ -312,6 +312,27 @@ OUTPUT
     vendored_gems("bin/rackup").should exist
   end
 
+  it "prints post_install_messages" do
+    gemfile <<-G
+      source "#{source_uri}"
+      gem 'rack-obama'
+    G
+
+    bundle :install, :artifice => "endpoint"
+    out.should include("Post-install message from rack:")
+  end
+
+  it "should display the post install message for a dependency" do
+    gemfile <<-G
+      source "#{source_uri}"
+      gem 'rack_middleware'
+    G
+
+    bundle :install, :artifice => "endpoint"
+    out.should include("Post-install message from rack:")
+    out.should include("Rack's post install message")
+  end
+
   context "when using basic authentication" do
     let(:user)     { "user" }
     let(:password) { "pass" }

data/spec/install/git_spec.rb

@@ -478,6 +478,22 @@ describe "bundle install with git sources" do
     exitstatus.should == 0
   end
 
+  it "does not duplicate git gem sources" do
+    build_lib "foo", :path => lib_path('nested/foo')
+    build_lib "bar", :path => lib_path('nested/bar')
+
+    build_git "foo", :path => lib_path('nested')
+    build_git "bar", :path => lib_path('nested')
+
+    gemfile <<-G
+      gem "foo", :git => "#{lib_path('nested')}"
+      gem "bar", :git => "#{lib_path('nested')}"
+    G
+
+    bundle "install"
+    File.read(bundled_app("Gemfile.lock")).scan('GIT').size.should == 1
+  end
+
   describe "switching sources" do
     it "doesn't explode when switching Path to Git sources" do
       build_gem "foo", "1.0", :to_system => true do |s|

data/spec/lock/lockfile_spec.rb

@@ -670,6 +670,76 @@ describe "the lockfile format" do
 
   end
 
+  # Some versions of the Bundler 1.1 RC series introduced corrupted
+  # lockfiles. There were two major problems:
+  #
+  # * multiple copies of the same GIT section appeared in the lockfile
+  # * when this happened, those sections got multiple copies of gems
+  #   in those sections.
+  it "fix corrupted lockfiles" do
+    build_git "omg", :path => lib_path('omg')
+    revision = revision_for(lib_path('omg'))
+
+    gemfile <<-G
+      source "file://#{gem_repo1}"
+      gem "omg", :git => "#{lib_path('omg')}", :branch => 'master'
+    G
+
+    bundle "install --path vendor"
+    should_be_installed "omg 1.0"
+
+    # Create a Gemfile.lock that has duplicate GIT sections
+    lockfile <<-L
+      GIT
+        remote: #{lib_path('omg')}
+        revision: #{revision}
+        branch: master
+        specs:
+          omg (1.0)
+
+      GIT
+        remote: #{lib_path('omg')}
+        revision: #{revision}
+        branch: master
+        specs:
+          omg (1.0)
+
+      GEM
+        remote: file:#{gem_repo1}/
+        specs:
+
+      PLATFORMS
+        #{local}
+
+      DEPENDENCIES
+        omg!
+    L
+
+    FileUtils.rm_rf(bundled_app('vendor'))
+    bundle "install"
+    should_be_installed "omg 1.0"
+
+    # Confirm that duplicate specs do not appear
+    File.read(bundled_app('Gemfile.lock')).should == strip_whitespace(<<-L)
+      GIT
+        remote: #{lib_path('omg')}
+        revision: #{revision}
+        branch: master
+        specs:
+          omg (1.0)
+
+      GEM
+        remote: file:#{gem_repo1}/
+        specs:
+
+      PLATFORMS
+        #{local}
+
+      DEPENDENCIES
+        omg!
+    L
+  end
+
   describe "line endings" do
     def set_lockfile_mtime_to_known_value
       time = Time.local(2000, 1, 1, 0, 0, 0)

data/spec/support/helpers.rb

@@ -162,6 +162,12 @@ module Spec
       end
     end
 
+    def strip_whitespace(str)
+      # Trim the leading spaces
+      spaces = str[/\A\s+/, 0] || ""
+      str.gsub(/^#{spaces}/, '')
+    end
+
     def install_gemfile(*args)
       gemfile(*args)
       opts = args.last.is_a?(Hash) ? args.last : {}

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bundler
 version: !ruby/object:Gem::Version 
-  hash: 15424237
-  prerelease: 4
+  hash: 19
+  prerelease: 
   segments: 
   - 1
   - 1
-  - rc
-  - 8
-  version: 1.1.rc.8
+  - 0
+  version: 1.1.0
 platform: ruby
 authors: 
 - "Andr\xC3\xA9 Arko"
@@ -19,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-03 00:00:00 Z
+date: 2012-03-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ronn
@@ -281,7 +280,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: bundler
-rubygems_version: 1.8.11
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: The best way to manage your application's dependencies