bundler 1.14.3 → 1.14.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: cfda683805022f66fb558637cf980dabfe07056c
-  data.tar.gz: 718e6c198cfcc5ad05a45ac395ad9ab5afcb0c83
+SHA256:
+  metadata.gz: 2e0f2e439c63ecff52ba92e4ad2909db13bb291c705609e245105a04a0ae89ac
+  data.tar.gz: 79b7f7de1d3cacf9ca9552fb0981bfbfb886c38d5667e2f12db52b429ba908a0
 SHA512:
-  metadata.gz: '094cf4d2ef082b9a2d47ce30c0edc25af7f14a2bfad2aecc4b407efd962a8fea306af7e34f3ce5987a505b2cba528cecbb352717482305462c17ff4d7d106cb4'
-  data.tar.gz: e230e123af453843bd39dcbbab9fa256ecd792b85f022733b1cf1b040263da29b9754e5e9c4374fe8a4040eda7b2a50e9210776bdc46504b28d2239eb40f9d83
+  metadata.gz: 31397cf61f59e568acfce1d5646303f18107679f3a3e0d9e87d360d95108eedab6ad303548863bf77329a6129fbeccf3958f4939676017f548067100efbecc10
+  data.tar.gz: 6f1ed7f36b19027ec440a8659a492dddd72e289c6855ec3ed288ef31f07e9724d5a2a416db9a4e5d36c3c0889212aa4b1ba5c5b4568952166a147d07829f6bea

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## 1.14.4 (2017-02-12)
+
+Bugfixes:
+
+  - fail gracefully when attempting to overwrite an existing directory with `bundle gem` (#5358, @nodo)
+  - fix a resolver bug that would cause bundler to report conflicts that it could resolve (#5359, #5362, @segiddins)
+  - set native extension build arguments for git gems (#5401, @segiddins)
+  - fix the suggested `bundle lock` command printed when a dependency is unused on any platform (@5t111111)
+  - ensure the version passed to `ruby` in the Gemfile is valid during Gemfile parsing (#5380, @segiddins)
+  - show `bundle inject` usage when too many arguments are passed (#5384, @Shekharrajak)
+  - stop `bundle show --outdated` from implicitly running `bundle update` (#5375, @colby-swandale)
+  - allow the temporary home directory fallback to work for multiple users (@svoop)
+
 ## 1.14.3 (2017-01-24)
 
 Bugfixes:

data/bundler.gemspec

@@ -34,9 +34,9 @@ Gem::Specification.new do |s|
   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
+    Did you know that maintaining and improving Bundler and RubyGems.org costs
+    more than $25,000 USD every month? Help us keep the gem ecosystem free for
+    everyone by joining the hundreds of companies and individuals who help
+    cover these costs: https://ruby.to/support-bundler
   END
 end

data/lib/bundler.rb

@@ -146,34 +146,37 @@ module Bundler
     def user_home
       @user_home ||= begin
         home = Bundler.rubygems.user_home
-        warning = "Your home directory is not set properly:"
-        if home.nil?
-          warning += "\n * It is not set at all"
+
+        warning = if home.nil?
+          "Your home directory is not set."
         elsif !File.directory?(home)
-          warning += "\n * `#{home}` is not a directory"
+          "`#{home}` is not a directory."
         elsif !File.writable?(home)
-          warning += "\n * `#{home}` is not writable"
-        else
-          return @user_home = Pathname.new(home)
+          "`#{home}` is not writable."
         end
 
-        login = Etc.getlogin || "unknown"
-
-        tmp_home = Pathname.new(Dir.tmpdir).join("bundler", "home", login)
-        begin
-          SharedHelpers.filesystem_access(tmp_home, :write) do |p|
-            FileUtils.mkdir_p(p)
-          end
-        rescue => e
-          warning += "\n\nBundler also failed to create a temporary home directory at `#{tmp_home}`:\n#{e}"
-          raise warning
+        if warning
+          user_home = tmp_home_path(Etc.getlogin, warning)
+          Bundler.ui.warn "#{warning}\nBundler will use `#{user_home}' as your home directory temporarily.\n"
+          user_home
+        else
+          Pathname.new(home)
         end
+      end
+    end
 
-        warning += "\n\nBundler will use `#{tmp_home}` as your home directory temporarily"
-
-        Bundler.ui.warn(warning)
-        tmp_home
+    def tmp_home_path(login, warning)
+      login ||= "unknown"
+      path = Pathname.new(Dir.tmpdir).join("bundler", "home")
+      SharedHelpers.filesystem_access(path) do |tmp_home_path|
+        unless tmp_home_path.exist?
+          tmp_home_path.mkpath
+          tmp_home_path.chmod(0o777)
+        end
+        tmp_home_path.join(login).tap(&:mkpath)
       end
+    rescue => e
+      raise "#{warning}\nBundler also failed to create a temporary home directory at `#{path}':\n#{e}"
     end
 
     def user_bundle_path

data/lib/bundler/cli.rb

@@ -460,11 +460,11 @@ module Bundler
       Platform.new(options).run
     end
 
-    desc "inject GEM VERSION ...", "Add the named gem(s), with version requirements, to the resolved Gemfile"
-    def inject(name, version, *gems)
+    desc "inject GEM VERSION", "Add the named gem, with version requirements, to the resolved Gemfile"
+    def inject(name, version)
       SharedHelpers.major_deprecation "The `inject` command has been replaced by the `add` command"
       require "bundler/cli/inject"
-      Inject.new(options, name, version, gems).run
+      Inject.new(options, name, version).run
     end
 
     desc "lock", "Creates a lockfile without installing"

data/lib/bundler/cli/gem.rb

@@ -122,7 +122,10 @@ module Bundler
       end
 
       templates.each do |src, dst|
-        thor.template("newgem/#{src}", target.join(dst), config)
+        destination = target.join(dst)
+        SharedHelpers.filesystem_access(destination) do
+          thor.template("newgem/#{src}", destination, config)
+        end
       end
 
       executables.each do |file|
@@ -139,6 +142,8 @@ module Bundler
 
       # Open gemspec in editor
       open_editor(options["edit"], target.join("#{name}.gemspec")) if options[:edit]
+    rescue Errno::EEXIST => e
+      raise GenericSystemCallError.new(e, "There was a conflict while creating the new gem.")
     end
 
   private

data/lib/bundler/cli/inject.rb

@@ -2,13 +2,13 @@
 module Bundler
   class CLI::Inject
     attr_reader :options, :name, :version, :group, :source, :gems
-    def initialize(options, name, version, gems)
+    def initialize(options, name, version)
       @options = options
       @name = name
       @version = version || last_version_number
       @group = options[:group]
       @source = options[:source]
-      @gems = gems
+      @gems = []
     end
 
     def run
@@ -18,6 +18,8 @@ module Bundler
 
       # Build an array of Dependency objects out of the arguments
       deps = []
+      # when `inject` support addition of more than one gem, then this loop will
+      # help. Currently this loop is running once.
       gems.each_slice(4) do |gem_name, gem_version, gem_group, gem_source|
         ops = Gem::Requirement::OPS.map {|key, _val| key }
         has_op = ops.any? {|op| gem_version.start_with? op }

data/lib/bundler/cli/show.rb

@@ -64,6 +64,7 @@ module Bundler
       else
         definition.resolve_with_cache!
       end
+      Bundler.reset!
       definition.specs
     end
 

data/lib/bundler/definition.rb

@@ -825,11 +825,13 @@ module Bundler
         next if !remote && !dep.current_platform?
         platforms = dep.gem_platforms(@platforms)
         if platforms.empty?
+          mapped_platforms = dep.platforms.map {|p| Dependency::PLATFORM_MAP[p] }
           Bundler.ui.warn \
             "The dependency #{dep} will be unused by any of the platforms Bundler is installing for. " \
             "Bundler is installing for #{@platforms.join ", "} but the dependency " \
-            "is only for #{dep.platforms.map {|p| Dependency::PLATFORM_MAP[p] }.join ", "}. " \
-            "To add those platforms to the bundle, run `bundle lock --add-platform #{dep.platforms.join ", "}`."
+            "is only for #{mapped_platforms.join ", "}. " \
+            "To add those platforms to the bundle, " \
+            "run `bundle lock --add-platform #{mapped_platforms.join " "}`."
         end
         platforms.each do |p|
           deps << DepProxy.new(dep, p) if remote || p == generic_local_platform

data/lib/bundler/friendly_errors.rb

@@ -81,7 +81,7 @@ module Bundler
 
           I tried...
 
-        - **Have you read our issues document, https://github.com/bundler/bundler/blob/master/ISSUES.md?**
+        - **Have you read our issues document, https://github.com/bundler/bundler/blob/master/doc/contributing/ISSUES.md?**
 
           ...
 

data/lib/bundler/ruby_version.rb

@@ -21,7 +21,11 @@ module Bundler
       #   must not be specified, or the engine version
       #   specified must match the version.
 
-      @versions           = Array(versions)
+      @versions = Array(versions).map do |v|
+        op, v = Gem::Requirement.parse(v)
+        op == "=" ? v.to_s : "#{op} #{v}"
+      end
+
       @gem_version        = Gem::Requirement.create(@versions.first).requirements.first.last
       @input_engine       = engine && engine.to_s
       @engine             = engine && engine.to_s || "ruby"

data/lib/bundler/source/git.rb

@@ -161,7 +161,9 @@ module Bundler
         local_specs
       end
 
-      def install(spec, force = false)
+      def install(spec, options = {})
+        force = options[:force]
+
         Bundler.ui.info "Using #{version_message(spec)} from #{self}"
 
         if requires_checkout? && !@copied && !force
@@ -170,7 +172,8 @@ module Bundler
           serialize_gemspecs_in(install_path)
           @copied = true
         end
-        generate_bin(spec, !Bundler.rubygems.spec_missing_extensions?(spec))
+        generate_bin_options = { :disable_extensions => !Bundler.rubygems.spec_missing_extensions?(spec), :build_args => options[:build_args] }
+        generate_bin(spec, generate_bin_options)
 
         requires_checkout? ? spec.post_install_message : nil
       end

data/lib/bundler/source/path.rb

@@ -71,9 +71,9 @@ module Bundler
         File.basename(expanded_path.to_s)
       end
 
-      def install(spec, force = false)
+      def install(spec, options = {})
         Bundler.ui.info "Using #{version_message(spec)} from #{self}"
-        generate_bin(spec, :disable_extensions)
+        generate_bin(spec, :disable_extensions => true)
         nil # no post-install message
       end
 
@@ -193,7 +193,7 @@ module Bundler
         path
       end
 
-      def generate_bin(spec, disable_extensions = false)
+      def generate_bin(spec, options = {})
         gem_dir = Pathname.new(spec.full_gem_path)
 
         # Some gem authors put absolute paths in their gemspec
@@ -208,7 +208,12 @@ module Bundler
           end
         end.compact
 
-        installer = Path::Installer.new(spec, :env_shebang => false, :disable_extensions => disable_extensions)
+        installer = Path::Installer.new(
+          spec,
+          :env_shebang => false,
+          :disable_extensions => options[:disable_extensions],
+          :build_args => options[:build_args]
+        )
         installer.post_install
       rescue Gem::InvalidSpecificationException => e
         Bundler.ui.warn "\n#{spec.name} at #{spec.full_gem_path} did not have a valid gemspec.\n" \

data/lib/bundler/ui/silent.rb

@@ -2,6 +2,8 @@
 module Bundler
   module UI
     class Silent
+      attr_writer :shell
+
       def initialize
         @warnings = []
       end
@@ -37,13 +39,21 @@ module Bundler
       def ask(message)
       end
 
+      def yes?(msg)
+        raise "Cannot ask yes? with a silent shell"
+      end
+
+      def no?
+        raise "Cannot ask no? with a silent shell"
+      end
+
       def level=(name)
       end
 
       def level(name = nil)
       end
 
-      def trace(message, newline = nil)
+      def trace(message, newline = nil, force = false)
       end
 
       def silence

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

@@ -98,18 +98,27 @@ module Bundler::Molinillo
       "#{self.class}:#{vertices.values.inspect}"
     end
 
+    # @param [Hash] options options for dot output.
     # @return [String] Returns a dot format representation of the graph
-    def to_dot
+    def to_dot(options = {})
+      edge_label = options.delete(:edge_label)
+      raise ArgumentError, "Unknown options: #{options.keys}" unless options.empty?
+
       dot_vertices = []
       dot_edges = []
       vertices.each do |n, v|
         dot_vertices << "  #{n} [label=\"{#{n}|#{v.payload}}\"]"
         v.outgoing_edges.each do |e|
-          dot_edges << "  #{e.origin.name} -> #{e.destination.name} [label=\"#{e.requirement}\"]"
+          label = edge_label ? edge_label.call(e) : e.requirement
+          dot_edges << "  #{e.origin.name} -> #{e.destination.name} [label=#{label.to_s.dump}]"
         end
       end
+
+      dot_vertices.uniq!
       dot_vertices.sort!
+      dot_edges.uniq!
       dot_edges.sort!
+
       dot = dot_vertices.unshift('digraph G {').push('') + dot_edges.push('}')
       dot.join("\n")
     end

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

@@ -23,8 +23,8 @@ module Bundler::Molinillo
       # (see Action#down)
       def down(graph)
         edge = make_edge(graph)
-        edge.origin.outgoing_edges.delete(edge)
-        edge.destination.incoming_edges.delete(edge)
+        delete_first(edge.origin.outgoing_edges, edge)
+        delete_first(edge.destination.incoming_edges, edge)
       end
 
       # @!group AddEdgeNoCircular
@@ -53,6 +53,13 @@ module Bundler::Molinillo
         @destination = destination
         @requirement = requirement
       end
+
+      private
+
+      def delete_first(array, item)
+        return unless index = array.index(item)
+        array.delete_at(index)
+      end
     end
   end
 end

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.5'.freeze
+  VERSION = '0.5.6'.freeze
 end

data/lib/bundler/vendor/molinillo/lib/molinillo/modules/ui.rb

@@ -48,7 +48,7 @@ module Bundler::Molinillo
       if debug?
         debug_info = yield
         debug_info = debug_info.inspect unless debug_info.is_a?(String)
-        output.puts debug_info.split("\n").map { |s| '  ' * depth + s }
+        output.puts debug_info.split("\n").map { |s| ' ' * depth + s }
       end
     end
 

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

@@ -356,13 +356,20 @@ module Bundler::Molinillo
       # Ensures there are no orphaned successors to the given {vertex}.
       # @param [DependencyGraph::Vertex] vertex the vertex to fix up.
       # @return [void]
-      def fixup_swapped_children(vertex)
+      def fixup_swapped_children(vertex) # rubocop:disable Metrics/CyclomaticComplexity
         payload = vertex.payload
         deps = dependencies_for(payload).group_by(&method(:name_for))
         vertex.outgoing_edges.each do |outgoing_edge|
-          @parent_of[outgoing_edge.requirement] = states.size - 1
+          requirement = outgoing_edge.requirement
+          parent_index = @parent_of[requirement]
           succ = outgoing_edge.destination
           matching_deps = Array(deps[succ.name])
+          dep_matched = matching_deps.include?(requirement)
+
+          # only reset the parent index when it was originally required by the
+          # same named spec
+          @parent_of[requirement] = states.size - 1 if parent_index && states[parent_index].name == name
+
           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) }
@@ -373,9 +380,13 @@ module Bundler::Molinillo
               # 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)
+          elsif !dep_matched
+            # also reset if we're removing the edge, but only if its parent has
+            # already been fixed up
+            @parent_of[requirement] = states.size - 1 if @parent_of[requirement].nil?
+
             activated.delete_edge(outgoing_edge)
-            requirements.delete(outgoing_edge.requirement)
+            requirements.delete(requirement)
           end
         end
       end

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 1.14.3
+  version: 1.14.4
 platform: ruby
 authors:
 - André Arko
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-24 00:00:00.000000000 Z
+date: 2017-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: automatiek
@@ -371,9 +371,10 @@ homepage: http://bundler.io
 licenses:
 - MIT
 metadata: {}
-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'
+post_install_message: 'Did you know that maintaining and improving Bundler and RubyGems.org
+  costs more than $25,000 USD every month? Help us keep the gem ecosystem free for
+  everyone by joining the hundreds of companies and individuals who help cover these
+  costs: https://ruby.to/support-bundler'
 rdoc_options: []
 require_paths:
 - lib
@@ -389,7 +390,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.9
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: The best way to manage your application's dependencies