bundler 1.9.1 → 1.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41d7927009486de82bc1e93eeaef65d49419e7df
-  data.tar.gz: a03b3ee06e879cb4795e73c692d1b5d0308a807e
+  metadata.gz: 8959dab2aca0f74b3cf2ef31a9cfdefdb5b979a3
+  data.tar.gz: f8d8e8bb0eba3964ad33f760e113b517f4d0352d
 SHA512:
-  metadata.gz: d65135c439064b73f6dc08a5940c6125374395047eccd4bd39b2e848471e57643632f0df36c7600419db24934965aa169be1642d2257a8ea1a7240430bd93223
-  data.tar.gz: 99dcf65cf946d7c3752cd82034f833d9968813f9d41f15992b60a3d86998448913040d5d567361f01da3ec7f6808ced4f0072993ce9550f5bc3c2181c55e011a
+  metadata.gz: 6d020ea8360eff4a45a0cc985a79023a9d8d2e3a0c6e884dc7519fc73a8ce9c56edfaa8d27189e2e4d3483093bbdae1cc84be2823f54eff003135f46f3f9de17
+  data.tar.gz: d6ebd846da9c842b5ba185e18d7c17d9818e60c293ef1879e862cfce13c94246664ba911a915cadb9a8a61904d80dde8aa98601921db6c26be87b305884082b6

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 1.9.2 (2015-03-30)
+
+Bugfixes:
+
+  - ensure gem executables are executable (#3517, #3511, @indirect)
+  - fix warnings in Molinillo (#3516, @segiddins)
+  - ensure duplicate dependencies do not propagate (#3522, @segiddins)
+  - keep gems locked when updating another gem from the same source (#3250, @indirect)
+  - resolve race that could build gems without saved arguments (#3404, @indirect)
+
 ## 1.9.1 (2015-03-21)
 
 Bugfixes:
@@ -31,6 +41,13 @@ Features:
   - Molinillo resolver, shared with CocoaPods (@segiddins)
   - updated Thor to v0.19.1 (@segiddins)
 
+## 1.8.6 (2015-03-30)
+
+Bugfixes:
+
+  - keep gems locked when updating another gem from the same source (#3250, @indirect)
+  - resolve race that could build gems without saved arguments (#3404, @indirect)
+
 ## 1.8.5 (2015-03-11)
 
 Bugfixes:

data/bundler.gemspec

@@ -16,10 +16,11 @@ Gem::Specification.new do |s|
   s.required_ruby_version     = '>= 1.8.7'
   s.required_rubygems_version = '>= 1.3.6'
 
-  s.add_development_dependency 'mustache', '0.99.6'
+  s.add_development_dependency 'mustache',  '0.99.6'
   s.add_development_dependency 'rdiscount', '~> 1.6'
-  s.add_development_dependency 'ronn', '~> 0.7.3'
-  s.add_development_dependency 'rspec', '~> 3.0'
+  s.add_development_dependency 'ronn',      '~> 0.7.3'
+  s.add_development_dependency 'rspec',     '~> 3.0'
+  s.add_development_dependency 'rake'
 
   s.files       = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   # we don't check in man pages, but we need to ship them because

data/lib/bundler/cli/gem.rb

@@ -54,6 +54,11 @@ module Bundler
         "bin/setup.tt" => "bin/setup"
       }
 
+      executables = %w[
+        bin/console
+        bin/setup
+      ]
+
       if ask_and_set(:coc, "Do you want to include a code of conduct in gems you generate?",
           "Codes of conduct can increase contributions to your project by contributors who " \
           "prefer collaborative, safe spaces. You can read more about the code of conduct at " \
@@ -105,6 +110,12 @@ module Bundler
         thor.template("newgem/#{src}", target.join(dst), config)
       end
 
+      executables.each do |file|
+        path = target.join(file)
+        executable = (path.stat.mode | 0111)
+        path.chmod(executable)
+      end
+
       Bundler.ui.info "Initializing git repo in #{target}"
       Dir.chdir(target) { `git init`; `git add .` }
 

data/lib/bundler/definition.rb

@@ -272,7 +272,7 @@ module Bundler
           each do |spec|
             next if spec.name == 'bundler'
             out << spec.to_lock
-        end
+          end
         out << "\n"
       end
 
@@ -561,8 +561,11 @@ module Bundler
       resolve
     end
 
-    def in_locked_deps?(dep, d)
-      d && dep.source == d.source
+    def in_locked_deps?(dep, locked_dep)
+      # Because the lockfile can't link a dep to a specific remote, we need to
+      # treat sources as equivalent anytime the locked dep has all the remotes
+      # that the Gemfile dep does.
+      locked_dep && locked_dep.source && dep.source && locked_dep.source.include?(dep.source)
     end
 
     def satisfies_locked_spec?(dep)

data/lib/bundler/installer.rb

@@ -96,20 +96,26 @@ module Bundler
 
     def install_gem_from_spec(spec, standalone = false, worker = 0)
       # Fetch the build settings, if there are any
-      settings             = Bundler.settings["build.#{spec.name}"]
-      install_message      = nil
-      post_install_message = nil
-      debug_message        = nil
-      Bundler.rubygems.with_build_args [settings] do
-        install_message, post_install_message, debug_message = spec.source.install(spec)
-        if install_message.include? 'Installing'
-          Bundler.ui.confirm install_message
-        else
-          Bundler.ui.info install_message
+      settings = Bundler.settings["build.#{spec.name}"]
+      messages = nil
+
+      if settings
+        Bundler.rubygems.with_build_args [settings] do
+          messages = spec.source.install(spec)
         end
-        Bundler.ui.debug debug_message if debug_message
-        Bundler.ui.debug "#{worker}:  #{spec.name} (#{spec.version}) from #{spec.loaded_from}"
+      else
+        messages = spec.source.install(spec)
+      end
+
+      install_message, post_install_message, debug_message = *messages
+
+      if install_message.include? 'Installing'
+        Bundler.ui.confirm install_message
+      else
+        Bundler.ui.info install_message
       end
+      Bundler.ui.debug debug_message if debug_message
+      Bundler.ui.debug "#{worker}:  #{spec.name} (#{spec.version}) from #{spec.loaded_from}"
 
       if Bundler.settings[:bin] && standalone
         generate_standalone_bundler_executable_stubs(spec)

data/lib/bundler/lazy_specification.rb

@@ -41,7 +41,7 @@ module Bundler
         out = "    #{name} (#{version}-#{platform})\n"
       end
 
-      dependencies.sort_by {|d| d.to_s }.each do |dep|
+      dependencies.sort_by {|d| d.to_s }.uniq.each do |dep|
         next if dep.type == :development
         out << "    #{dep.to_lock}\n"
       end

data/lib/bundler/rubygems_integration.rb

@@ -161,12 +161,14 @@ module Bundler
     end
 
     def with_build_args(args)
-      old_args = self.build_args
-      begin
-        self.build_args = args
-        yield
-      ensure
-        self.build_args = old_args
+      ext_lock.synchronize do
+        old_args = self.build_args
+        begin
+          self.build_args = args
+          yield
+        ensure
+          self.build_args = old_args
+        end
       end
     end
 

data/lib/bundler/shared_helpers.rb

@@ -35,32 +35,27 @@ module Bundler
     end
 
     def default_bundle_dir
-      global_bundle_dir = File.join(Bundler.rubygems.user_home, ".bundle")
       bundle_dir = find_directory(".bundle")
+      return nil unless bundle_dir
 
-      if bundle_dir && bundle_dir != global_bundle_dir
-        Pathname.new(bundle_dir)
-      else
-        nil
-      end
+      global_bundle_dir = File.join(Bundler.rubygems.user_home, ".bundle")
+      return nil if bundle_dir == global_bundle_dir
+
+      Pathname.new(bundle_dir)
     end
 
     def in_bundle?
       find_gemfile
     end
 
-    def chdir_monitor
-      Bundler.rubygems.ext_lock
-    end
-
     def chdir(dir, &blk)
-      chdir_monitor.synchronize do
+      Bundler.rubygems.ext_lock.synchronize do
         Dir.chdir dir, &blk
       end
     end
 
     def pwd
-      chdir_monitor.synchronize do
+      Bundler.rubygems.ext_lock.synchronize do
         Dir.pwd
       end
     end

data/lib/bundler/source.rb

@@ -37,5 +37,10 @@ module Bundler
     def can_lock?(spec)
       spec.source == self
     end
+
+    def include?(other)
+      other == self
+    end
+
   end
 end

data/lib/bundler/source/rubygems.rb

@@ -36,11 +36,15 @@ module Bundler
       end
 
       def eql?(o)
-        o.is_a?(Rubygems) && remotes_equal?(o.remotes)
+        o.is_a?(Rubygems) && o.credless_remotes == credless_remotes
       end
 
       alias == eql?
 
+      def include?(o)
+        o.is_a?(Rubygems) && (o.credless_remotes - credless_remotes).empty?
+      end
+
       def can_lock?(spec)
         spec.source.is_a?(Rubygems)
       end
@@ -200,6 +204,10 @@ module Bundler
 
     protected
 
+      def credless_remotes
+        remotes.map(&method(:suppress_configured_credentials))
+      end
+
       def source_uris_for_spec(spec)
         specs.search_all(spec.name).inject([]) do |uris, s|
           uris << s.source_uri.without_credentials if s.source_uri
@@ -370,10 +378,6 @@ module Bundler
         spec.loaded_from && spec.loaded_from.include?("specifications/default/")
       end
 
-      def remotes_equal?(other_remotes)
-        remotes.map(&method(:suppress_configured_credentials)) == other_remotes.map(&method(:suppress_configured_credentials))
-      end
-
     end
   end
 end

data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph.rb

@@ -61,7 +61,7 @@ module Bundler::Molinillo
           hash[name] = vertex.dup.tap { |v| v.graph = self }
         end
       end
-      @root_vertices = Hash[vertices.select { |n, _v| other.root_vertices[n] }]
+      @root_vertices = Hash[@vertices.select { |n, _v| other.root_vertices[n] }]
       @edges = other.edges.map do |edge|
         Edge.new(
           vertex_named(edge.origin.name),

data/lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb

@@ -1,3 +1,3 @@
 module Bundler::Molinillo
-  VERSION = '0.2.1'
+  VERSION = '0.2.3'
 end

data/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb

@@ -73,6 +73,19 @@ module Bundler::Molinillo
         end_resolution
       end
 
+      # @return [Integer] the number of resolver iterations in between calls to
+      #   {#resolver_ui}'s {UI#indicate_progress} method
+      attr_accessor :iteration_rate
+      private :iteration_rate
+
+      # @return [Time] the time at which resolution began
+      attr_accessor :started_at
+      private :started_at
+
+      # @return [Array<ResolutionState>] the stack of states for the resolution
+      attr_accessor :states
+      private :states
+
       private
 
       # Sets up the resolution process
@@ -101,16 +114,6 @@ module Bundler::Molinillo
       require 'bundler/vendor/molinillo/lib/molinillo/state'
       require 'bundler/vendor/molinillo/lib/molinillo/modules/specification_provider'
 
-      # @return [Integer] the number of resolver iterations in between calls to
-      #   {#resolver_ui}'s {UI#indicate_progress} method
-      attr_accessor :iteration_rate
-
-      # @return [Time] the time at which resolution began
-      attr_accessor :started_at
-
-      # @return [Array<ResolutionState>] the stack of states for the resolution
-      attr_accessor :states
-
       ResolutionState.new.members.each do |member|
         define_method member do |*args, &block|
           state.send(member, *args, &block)

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.9.2
 platform: ruby
 authors:
 - André Arko
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-22 00:00:00.000000000 Z
+date: 2015-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mustache
@@ -69,6 +69,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Bundler manages an application's dependencies through its entire life,
   across many machines, systematically and repeatably
 email: