bundler 1.14.0.pre.1 → 1.14.0.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 284650970c15e86a0fbd582c231218d8158c002c
-  data.tar.gz: 4c2be9c7aba084512db6d472a6741e7c0bcbe866
+  metadata.gz: 7e5d26c5df41944223ad6cde853186ec5265227b
+  data.tar.gz: 229f9861f18432b1c586790098e9d2ceea241d8a
 SHA512:
-  metadata.gz: 6162ce90ed291b285b1ecf9c31e7843c08565cd5d479b70c203b11f8e03c2a97a6c14200dd6951e19ad1b84b68216e196275356a0b14ee22556e21d21453613b
-  data.tar.gz: 42b0d4fe583dce12dad67acf0c28ac1d6a4798183fc5b8b88b05d2c513b2daf4b6bc760cb49e8ade0d683c40bc687f342d9a1e1620ef6c277b5b31c153e33f57
+  metadata.gz: a159c445236491e342e238ac657e7caeae5eb7c3ebe4ec3c73f205c8986f2170dd26572d31b8b40a32363df622df4d3876fe6027f5d1eae2389600c1dceb3faa
+  data.tar.gz: 1444c0b34ff18d8ca70d00e1488d1e782ea2322eaaa12c1b718913f03ff268b66cf3c28bd8eaa20d615b8cc0f4af0edd00589ab81ca4386b482d660b1fb6ec26

data/CHANGELOG.md

@@ -1,4 +1,13 @@
-## 1.14.0.pre.1
+## 1.14.0.pre.2 (2016-01-11)
+
+Bugfixes:
+
+  - allow not selecting a gem when running `bundle open` (#5301, @segiddins)
+  - support installing gems from git branches that contain shell metacharacters (#5295, @segiddins)
+  - fix a resolver error that could leave dependencies unresolved (#5294, @segiddins)
+  - fix a stack overflow error when invoking commands (#5296, @segiddins)
+
+## 1.14.0.pre.1 (2016-12-xx)
 
 Features:
 

data/bundler.gemspec

@@ -32,4 +32,11 @@ Gem::Specification.new do |s|
   s.bindir        = "exe"
   s.executables   = %w(bundle bundler)
   s.require_paths = ["lib"]
+
+  s.post_install_message = <<-END.lines.map(&:strip).join(" ")
+    Bundler and RubyGems.org are free for anyone to use, but maintaining them
+    costs more than $25,000 USD every month. Help us cover those costs so that
+    we can keep the gem ecosystem free for everyone:
+    https://ruby.to/support-bundler
+  END
 end

data/lib/bundler/cli.rb

@@ -401,6 +401,8 @@ module Bundler
       Viz.new(options.dup).run
     end
 
+    old_gem = instance_method(:gem)
+
     desc "gem GEM [OPTIONS]", "Creates a skeleton for creating a rubygem"
     method_option :exe, :type => :boolean, :default => false, :aliases => ["--bin", "-b"], :desc => "Generate a binary executable for your library."
     method_option :coc, :type => :boolean, :desc => "Generate a code of conduct file. Set a default with `bundle config gem.coc true`."
@@ -412,10 +414,30 @@ module Bundler
     method_option :test, :type => :string, :lazy_default => "rspec", :aliases => "-t", :banner => "rspec",
                          :desc => "Generate a test directory for your library, either rspec or minitest. Set a default with `bundle config gem.test rspec`."
     def gem(name)
-      require "bundler/cli/gem"
-      Gem.new(options, name, self).run
     end
 
+    commands["gem"].tap do |gem_command|
+      def gem_command.run(instance, args = [])
+        arity = 1 # name
+
+        require "bundler/cli/gem"
+        cmd_args = args + [instance]
+        cmd_args.unshift(instance.options)
+
+        cmd = begin
+          Gem.new(*cmd_args)
+        rescue ArgumentError => e
+          instance.class.handle_argument_error(self, e, args, arity)
+        end
+
+        cmd.run
+      end
+    end
+
+    undef_method(:gem)
+    define_method(:gem, old_gem)
+    private :gem
+
     def self.source_root
       File.expand_path(File.join(File.dirname(__FILE__), "templates"))
     end

data/lib/bundler/cli/open.rb

@@ -13,7 +13,8 @@ module Bundler
     def run
       editor = [ENV["BUNDLER_EDITOR"], ENV["VISUAL"], ENV["EDITOR"]].find {|e| !e.nil? && !e.empty? }
       return Bundler.ui.info("To open a bundled gem, set $EDITOR or $BUNDLER_EDITOR") unless editor
-      path = Bundler::CLI::Common.select_spec(name, :regex_match).full_gem_path
+      return unless spec = Bundler::CLI::Common.select_spec(name, :regex_match)
+      path = spec.full_gem_path
       Dir.chdir(path) do
         command = Shellwords.split(editor) + [path]
         Bundler.with_clean_env do

data/lib/bundler/source/git/git_proxy.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require "shellwords"
 require "tempfile"
 module Bundler
   class Source
@@ -180,7 +181,7 @@ module Bundler
 
         def find_local_revision
           allowed_in_path do
-            git("rev-parse --verify #{ref}", true).strip
+            git("rev-parse --verify #{Shellwords.shellescape(ref)}", true).strip
           end
         end
 

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

@@ -119,6 +119,7 @@ module Bundler::Molinillo
     #   {Vertex#successors}
     def ==(other)
       return false unless other
+      return true if equal?(other)
       vertices.each do |name, vertex|
         other_vertex = other.vertex_named(name)
         return false unless other_vertex
@@ -134,6 +135,7 @@ module Bundler::Molinillo
     def add_child_vertex(name, payload, parent_names, requirement)
       root = !parent_names.delete(nil) { true }
       vertex = add_vertex(name, payload, root)
+      vertex.explicit_requirements << requirement if root
       parent_names.each do |parent_name|
         parent_node = vertex_named(parent_name)
         add_edge(parent_node, vertex, requirement)
@@ -152,7 +154,7 @@ module Bundler::Molinillo
     # Detaches the {#vertex_named} `name` {Vertex} from the graph, recursively
     # removing any non-root vertices that were orphaned in the process
     # @param [String] name
-    # @return [void]
+    # @return [Array<Vertex>] the vertices which have been detached
     def detach_vertex_named(name)
       log.detach_vertex_named(self, name)
     end

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

@@ -14,16 +14,23 @@ module Bundler::Molinillo
 
       # (see Action#up)
       def up(graph)
-        return unless @vertex = graph.vertices.delete(name)
+        return [] unless @vertex = graph.vertices.delete(name)
+
+        removed_vertices = [@vertex]
         @vertex.outgoing_edges.each do |e|
           v = e.destination
           v.incoming_edges.delete(e)
-          graph.detach_vertex_named(v.name) unless v.root? || v.predecessors.any?
+          if !v.root? && v.incoming_edges.empty?
+            removed_vertices.concat graph.detach_vertex_named(v.name)
+          end
         end
+
         @vertex.incoming_edges.each do |e|
           v = e.origin
           v.outgoing_edges.delete(e)
         end
+
+        removed_vertices
       end
 
       # (see Action#down)

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

@@ -81,6 +81,7 @@ module Bundler::Molinillo
       # @return [Boolean] whether the two vertices are equal, determined
       #   by a recursive traversal of each {Vertex#successors}
       def ==(other)
+        return true if equal?(other)
         shallow_eql?(other) &&
           successors.to_set == other.successors.to_set
       end
@@ -89,6 +90,7 @@ module Bundler::Molinillo
       # @return [Boolean] whether the two vertices are equal, determined
       #   solely by {#name} and {#payload} equality
       def shallow_eql?(other)
+        return true if equal?(other)
         other &&
           name == other.name &&
           payload == other.payload

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module Bundler::Molinillo
   # The version of Bundler::Molinillo.
-  VERSION = '0.5.4'.freeze
+  VERSION = '0.5.5'.freeze
 end

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

@@ -366,13 +366,12 @@ module Bundler::Molinillo
           if matching_deps.empty? && !succ.root? && succ.predecessors.to_a == [vertex]
             debug(depth) { "Removing orphaned spec #{succ.name} after swapping #{name}" }
             succ.requirements.each { |r| @parent_of.delete(r) }
-            activated.detach_vertex_named(succ.name)
 
-            all_successor_names = succ.recursive_successors.map(&:name)
-
-            requirements.delete_if do |requirement|
-              requirement_name = name_for(requirement)
-              (requirement_name == succ.name) || all_successor_names.include?(requirement_name)
+            removed_names = activated.detach_vertex_named(succ.name).map(&:name)
+            requirements.delete_if do |r|
+              # the only removed vertices are those with no other requirements,
+              # so it's safe to delete only based upon name here
+              removed_names.include?(name_for(r))
             end
           elsif !matching_deps.include?(outgoing_edge.requirement)
             activated.delete_edge(outgoing_edge)

data/lib/bundler/version.rb

@@ -7,5 +7,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.14.0.pre.1" unless defined?(::Bundler::VERSION)
+  VERSION = "1.14.0.pre.2" unless defined?(::Bundler::VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 1.14.0.pre.1
+  version: 1.14.0.pre.2
 platform: ruby
 authors:
 - André Arko
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-29 00:00:00.000000000 Z
+date: 2017-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: automatiek
@@ -371,7 +371,9 @@ homepage: http://bundler.io
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message: 'Bundler and RubyGems.org are free for anyone to use, but maintaining
+  them costs more than $25,000 USD every month. Help us cover those costs so that
+  we can keep the gem ecosystem free for everyone: https://ruby.to/support-bundler'
 rdoc_options: []
 require_paths:
 - lib