bundler 1.3.4 → 1.3.5

data/CHANGELOG.md

@@ -1,8 +1,21 @@
+## 1.3.5 (3 April 2013)
+
+Features:
+
+  - progress indicator while resolver is running (@chief)
+
+Bugfixes:
+
+  - update local overrides with orphaned revisions (@jamesferguson)
+  - revert to working quoting of RUBYOPT on Windows (@ogra)
+  - use basic auth even when SSL is not available (@jayniz)
+  - installing git gems without dependencies in deployment now works
+
 ## 1.3.4 (15 March 2103)
 
 Bugfixes:
 
-  - load YAML on Rubygems version that define module YAML
+  - load YAML on Rubygems versions that define module YAML
   - fix regression that broke --without on ruby 1.8.7
 
 ## 1.3.3 (13 March 2013)
@@ -16,7 +29,6 @@ Features:
 Bugfixes:
 
   - require rbconfig for standalone mode
-  - revert to working quoting of RUBYOPT on Windows (@ogra)
 
 ## 1.3.2 (7 March 2013)
 

data/CONTRIBUTE.md

@@ -6,7 +6,7 @@ You can start learning about Bundler by reading [the documentation](http://gembu
 
 ## Core Team
 
-The Bundler core team consists of André Arko ([@indirect](http://github.com/indirect)) and Terence Lee ([@hone](http://github.com/hone)), with support and advice from original Bundler author Yehuda Katz ([@wycats](http://github.com/wycats)).
+The Bundler core team consists of André Arko ([@indirect](http://github.com/indirect)), Terence Lee ([@hone](http://github.com/hone)), and Jessica Lynn Suttles ([@jlsuttles](http://github.com/jlsuttles)), with support and advice from original Bundler author Yehuda Katz ([@wycats](http://github.com/wycats)).
 
 # Adding new features
 
@@ -71,7 +71,7 @@ Bundler has two main sources of documentation: the built-in help (including usag
 
 If you’d like to submit a patch to the man pages, follow the steps for adding a feature above. All of the man pages are located in the `man` directory. Just use the “Documentation” heading when you describe what you did in the changelog.
 
-If you have a suggestion or proposed change for [gembundler.com](http://gembundler.com), please open an issue or send a pull request to the [bundler-site](http://github.com/carlhuda/bundler-site) repository.
+If you have a suggestion or proposed change for [gembundler.com](http://gembundler.com), please open an issue or send a pull request to the [bundler-site-middleman](https://github.com/bundler/bundler-site-middleman) repository.
 
 
 # Community
@@ -80,7 +80,7 @@ Community is an important part of all we do. If you’d like to be part of the B
 
 It would be tremendously helpful to have more people answering questions about Bundler (and often simply about Rubygems or Ruby itself) in our [issue tracker](https://github.com/carlhuda/bundler/issues) or on [Stack Overflow](http://stackoverflow.com/questions/tagged/bundler).
 
-Additional documentation and explanation is always helpful, too. If you have any suggestions for the Bundler website [gembundler.com](http://www.gembundler.com), we would absolutely love it if you opened an issue or pull request on the [bundler-site repository](http://github.com/carlhuda/bundler-site).
+Additional documentation and explanation is always helpful, too. If you have any suggestions for the Bundler website [gembundler.com](http://www.gembundler.com), we would absolutely love it if you opened an issue or pull request on the [bundler-site-middleman](https://github.com/bundler/bundler-site-middleman) repository.
 
 Finally, sharing your experiences and discoveries by writing them up is a valuable way to help others who have similar problems or experiences in the future. You can write a blog post, create an example and commit it to Github, take screenshots, or make videos.
 

data/ISSUES.md

@@ -14,10 +14,14 @@ Detailed information about each Bundler command, including help with common prob
 
 Please open a ticket with Heroku if you're having trouble deploying. They have a professional support team who can help you resolve Heroku issues far better than the Bundler team can. If the problem that you are having turns out to be a bug in Bundler itself, Heroku support can get the exact details to us.
 
-### Something else
+### Other problems
 
 First, figure out exactly what it is that you're trying to do. Then, go to the [Bundler documentation website](http://gembundler.com) and see if we have instructions on how to do that.
 
+Second, check [the compatibility
+list](http://gembundler.com/compatibility.html), and make sure that the version of Bundler that you are
+using works with the versions of Ruby and Rubygems that you are using.
+
 If the instructions don't work, or you can't find any instructions, you can try these troubleshooting steps:
 
     # remove user-specific gems and git repos

data/lib/bundler.rb

@@ -245,17 +245,29 @@ module Bundler
     end
 
     def requires_sudo?
-      return @requires_sudo if defined?(@checked_for_sudo)
+      return @requires_sudo if defined?(@requires_sudo_ran)
 
-      path = bundle_path
-      path = path.parent until path.exist?
-      sudo_present = which "sudo"
-      bin_dir = Pathname.new(Bundler.system_bindir)
-      bin_dir = bin_dir.parent until bin_dir.exist?
+      if settings.allow_sudo?
+        sudo_present = which "sudo"
+      end
+
+      if sudo_present
+        # the bundle path and subdirectories need to be writable for Rubygems
+        # to be able to unpack and install gems without exploding
+        path = bundle_path
+        path = path.parent until path.exist?
+
+        # bins are written to a different location on OS X
+        bin_dir = Pathname.new(Bundler.system_bindir)
+        bin_dir = bin_dir.parent until bin_dir.exist?
+
+        # if any directory is not writable, we need sudo
+        dirs = [path, bin_dir] | Dir[path.join('*')]
+        sudo_needed = dirs.find{|d| !File.writable?(d) }
+      end
 
-      @checked_for_sudo = true
-      sudo_gems = !File.writable?(path) || !File.writable?(bin_dir)
-      @requires_sudo = settings.allow_sudo? && sudo_gems && sudo_present
+      @requires_sudo_ran = true
+      @requires_sudo = settings.allow_sudo? && sudo_present && sudo_needed
     end
 
     def mkdir_p(path)

data/lib/bundler/cli.rb

@@ -402,7 +402,8 @@ module Bundler
     def outdated(*gems)
       sources = Array(options[:source])
       Bundler.definition.validate_ruby!
-      current_specs = Bundler.load.specs
+
+      current_specs = Bundler.ui.silence { Bundler.load.specs }
 
       if gems.empty? && sources.empty?
         # We're doing a full update

data/lib/bundler/definition.rb

@@ -403,6 +403,7 @@ module Bundler
         spec   = @dependencies.find { |s| s.name == k }
         source = spec && spec.source
         if source && source.respond_to?(:local_override!)
+          source.unlock! if @unlock[:gems].include?(spec.name)
           locals << [ source, source.local_override!(v) ]
         end
       end

data/lib/bundler/fetcher.rb

@@ -202,6 +202,7 @@ module Bundler
           response = @connection.request(uri)
         else
           req = Net::HTTP::Get.new uri.request_uri
+          req.basic_auth(uri.user, uri.password) if uri.user && uri.password
           response = @connection.request(req)
         end
       rescue OpenSSL::SSL::SSLError

data/lib/bundler/resolver.rb

@@ -109,7 +109,7 @@ module Bundler
       end
     end
 
-    attr_reader :errors
+    attr_reader :errors, :started_at, :iteration_rate, :iteration_counter
 
     # Figures out the best possible configuration of gems that satisfies
     # the list of passed dependencies and any child dependencies without
@@ -122,7 +122,7 @@ module Bundler
     # <GemBundle>,nil:: If the list of dependencies can be resolved, a
     #   collection of gemspecs is returned. Otherwise, nil is returned.
     def self.resolve(requirements, index, source_requirements = {}, base = [])
-      Bundler.ui.info "Resolving dependencies..."
+      Bundler.ui.info "Resolving dependencies...", false
       base = SpecSet.new(base) unless base.is_a?(SpecSet)
       resolver = new(index, source_requirements, base)
       result = catch(:success) do
@@ -130,11 +130,14 @@ module Bundler
         raise resolver.version_conflict
         nil
       end
+      Bundler.ui.info "" # new line now that dots are done
       SpecSet.new(result)
+    rescue => e
+      Bundler.ui.info "" # new line before the error
+      raise e
     end
 
     def initialize(index, source_requirements, base)
-      @iteration_counter    = 0
       @errors               = {}
       @stack                = []
       @base                 = base
@@ -142,6 +145,8 @@ module Bundler
       @deps_for             = {}
       @missing_gems         = Hash.new(0)
       @source_requirements  = source_requirements
+      @iteration_counter    = 0
+      @started_at           = Time.now
     end
 
     def debug
@@ -168,10 +173,7 @@ module Bundler
       # gem dependencies have been resolved.
       throw :success, successify(activated) if reqs.empty?
 
-      @iteration_counter += 1
-      if((@iteration_counter % 10000) == 0)
-        Bundler.ui.info ".", false
-      end
+      indicate_progress
 
       debug { print "\e[2J\e[f" ; "==== Iterating ====\n\n" }
 
@@ -505,5 +507,24 @@ module Bundler
         o
       end
     end
+
+    private
+
+    # Indicates progress by writing a '.' every iteration_rate time which is
+    # aproximately every second. iteration_rate is calculated in the first
+    # second of resolve running.
+    def indicate_progress
+      @iteration_counter += 1
+
+      if iteration_rate.nil?
+        if ((Time.now - started_at) % 3600).round >= 1
+          @iteration_rate = iteration_counter
+        end
+      else
+        if ((iteration_counter % iteration_rate) == 0)
+          Bundler.ui.info ".", false
+        end
+      end
+    end
   end
 end

data/lib/bundler/source/git.rb

@@ -92,6 +92,7 @@ module Bundler
 
       def unlock!
         git_proxy.revision = nil
+        @unlocked = true
       end
 
       def local_override!(path)
@@ -124,7 +125,7 @@ module Bundler
 
         changed = cached_revision && cached_revision != git_proxy.revision
 
-        if changed && !git_proxy.contains?(cached_revision)
+        if changed && !@unlocked && !git_proxy.contains?(cached_revision)
           raise GitError, "The Gemfile lock is pointing to revision #{shortref_for_display(cached_revision)} " \
             "but the current branch in your local override for #{name} does not contain such commit. " \
             "Please make sure your branch is up to date."

data/lib/bundler/source/rubygems.rb

@@ -15,6 +15,7 @@ module Bundler
         @options = options
         @remotes = (options["remotes"] || []).map { |r| normalize_uri(r) }
         @fetchers = {}
+        @dependency_names = []
         @allow_remote = false
         @allow_cached = false
 

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.3.4" unless defined?(::Bundler::VERSION)
+  VERSION = "1.3.5" unless defined?(::Bundler::VERSION)
 end

data/spec/bundler/gem_helper_spec.rb

@@ -185,8 +185,11 @@ describe "Bundler::GemHelper tasks" do
           `git init --bare`
         }
         Dir.chdir(@app) {
-         `git commit -a -m "another commit"`
-         `git tag -a -m \"Version 0.0.1\" v0.0.1`
+          `git init`
+          `git config user.email "you@example.com"`
+          `git config user.name "name"`
+          `git commit -a -m "another commit"`
+          `git tag -a -m \"Version 0.0.1\" v0.0.1`
         }
         @helper.release_gem
       end

data/spec/install/gems/dependency_api_spec.rb

@@ -99,6 +99,20 @@ describe "gemcutter's dependency API" do
     should_be_installed("rails 2.3.2")
   end
 
+  it "doesn't fail if you only have a git gem with no deps when using --deployment" do
+    build_git "foo"
+    gemfile <<-G
+      source "#{source_uri}"
+      gem 'foo', :git => "file:///#{lib_path('foo-1.0')}"
+    G
+
+    bundle "install", :artifice => "endpoint"
+    bundle "install --deployment", :artifice => "endpoint", :exitstatus => true
+
+    expect(exitstatus).to eq(0)
+    should_be_installed("foo 1.0")
+  end
+
   it "falls back when the API errors out" do
     simulate_platform mswin
 

data/spec/install/gems/platform_spec.rb

@@ -109,7 +109,7 @@ describe "bundle install across platforms" do
     bundle "install --path vendor/bundle"
 
     new_version = Gem::ConfigMap[:ruby_version] == "1.8" ? "1.9.1" : "1.8"
-    FileUtils.mv(vendored_gems, bundled_app("vendor/bundle/#{Gem.ruby_engine}/#{new_version}"))
+    FileUtils.mv(vendored_gems, bundled_app("vendor/bundle", Gem.ruby_engine, new_version))
 
     bundle "install --path ./vendor/bundle"
     expect(vendored_gems("gems/rack-1.0.0")).to exist

data/spec/install/gems/sudo_spec.rb

@@ -1,6 +1,27 @@
 require "spec_helper"
 
 describe "when using sudo", :sudo => true do
+  describe "and BUNDLE_PATH is writable" do
+    context "but BUNDLE_PATH/build_info is not writable" do
+      before do
+        subdir = system_gem_path('cache')
+        subdir.mkpath
+        sudo "chmod u-w #{subdir}"
+      end
+
+      it "installs" do
+        install_gemfile <<-G
+          source "file://#{gem_repo1}"
+          gem "rack"
+        G
+
+        expect(out).to_not match(/an error occurred/i)
+        expect(system_gem_path("cache/rack-1.0.0.gem")).to exist
+        should_be_installed "rack 1.0"
+      end
+    end
+  end
+
   describe "and GEM_HOME is owned by root" do
     before :each do
       chown_system_gems_to_root

data/spec/support/path.rb

@@ -33,7 +33,7 @@ module Spec
     end
 
     def vendored_gems(path = nil)
-      bundled_app("vendor/bundle/#{Gem.ruby_engine}/#{Gem::ConfigMap[:ruby_version]}/#{path}")
+      bundled_app(*["vendor/bundle", Gem.ruby_engine, Gem::ConfigMap[:ruby_version], path].compact)
     end
 
     def cached_gem(path)

data/spec/update/git_spec.rb

@@ -192,5 +192,22 @@ describe "bundle update" do
       expect(out).to include(lib_path("foo-1.0").to_s)
     end
 
+    it "should not explode on invalid revision on update of gem by name" do
+      build_git "rack", "0.8"
+
+      build_git "rack", "0.8", :path => lib_path('local-rack') do |s|
+        s.write "lib/rack.rb", "puts :LOCAL"
+      end
+
+      install_gemfile <<-G
+        source "file://#{gem_repo1}"
+        gem "rack", :git => "#{lib_path('rack-0.8')}", :branch => "master"
+      G
+
+      bundle %|config local.rack #{lib_path('local-rack')}|
+      bundle "update rack"
+      expect(out).to include("Your bundle is updated!")
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-15 00:00:00.000000000 Z
+date: 2013-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ronn