bundler 1.11.2 → 1.12.0.pre.1

data/lib/bundler/fetcher/index.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "bundler/fetcher/base"
 require "rubygems/remote_fetcher"
 
@@ -13,16 +14,38 @@ module Bundler
         when /401/
           raise AuthenticationRequiredError, remote_uri
         when /403/
-          if remote_uri.userinfo
-            raise BadAuthenticationError, remote_uri
-          else
-            raise AuthenticationRequiredError, remote_uri
-          end
+          raise BadAuthenticationError, remote_uri if remote_uri.userinfo
+          raise AuthenticationRequiredError, remote_uri
         else
           Bundler.ui.trace e
           raise HTTPError, "Could not fetch specs from #{display_uri}"
         end
       end
+
+      def fetch_spec(spec)
+        spec -= [nil, "ruby", ""]
+        spec_file_name = "#{spec.join "-"}.gemspec"
+
+        uri = URI.parse("#{remote_uri}#{Gem::MARSHAL_SPEC_DIR}#{spec_file_name}.rz")
+        if uri.scheme == "file"
+          Bundler.load_marshal Gem.inflate(Gem.read_binary(uri.path))
+        elsif cached_spec_path = gemspec_cached_path(spec_file_name)
+          Bundler.load_gemspec(cached_spec_path)
+        else
+          Bundler.load_marshal Gem.inflate(downloader.fetch(uri).body)
+        end
+      rescue MarshalError
+        raise HTTPError, "Gemspec #{spec} contained invalid data.\n" \
+          "Your network or your gem server is probably having issues right now."
+      end
+
+    private
+
+      # cached gem specification path, if one exists
+      def gemspec_cached_path(spec_file_name)
+        paths = Bundler.rubygems.spec_cache_dirs.map {|dir| File.join(dir, spec_file_name) }
+        paths.find {|path| File.file? path }
+      end
     end
   end
 end

data/lib/bundler/friendly_errors.rb

@@ -1,95 +1,103 @@
 # encoding: utf-8
+# frozen_string_literal: true
 require "cgi"
 require "bundler/vendored_thor"
 
 module Bundler
+  module FriendlyErrors
+  module_function
+
+    def log_error(error)
+      case error
+      when YamlSyntaxError
+        Bundler.ui.error error.message
+        Bundler.ui.trace error.orig_exception
+      when Dsl::DSLError
+        Bundler.ui.error error.message
+      when GemRequireError
+        Bundler.ui.error error.message
+        Bundler.ui.trace error.orig_exception, nil, true
+      when BundlerError
+        Bundler.ui.error error.message, :wrap => true
+        Bundler.ui.trace error
+      when Thor::Error
+        Bundler.ui.error error.message
+      when LoadError
+        raise error unless error.message =~ /cannot load such file -- openssl|openssl.so|libcrypto.so/
+        Bundler.ui.error "\nCould not load OpenSSL."
+        Bundler.ui.warn <<-WARN, :wrap => true
+          You must recompile Ruby with OpenSSL support or change the sources in your \
+          Gemfile from 'https' to 'http'. Instructions for compiling with OpenSSL \
+          using RVM are available at http://rvm.io/packages/openssl.
+        WARN
+        Bundler.ui.trace error
+      when Interrupt
+        Bundler.ui.error "\nQuitting..."
+        Bundler.ui.trace error
+      when Gem::InvalidSpecificationException
+        Bundler.ui.error error.message, :wrap => true
+      when SystemExit
+      else request_issue_report_for(error)
+      end
+    end
+
+    def exit_status(error)
+      case error
+      when BundlerError then error.status_code
+      when Thor::Error then 15
+      when SystemExit then error.status
+      else 1
+      end
+    end
+
+    def request_issue_report_for(e)
+      Bundler.ui.info <<-EOS.gsub(/^ {8}/, "")
+        --- ERROR REPORT TEMPLATE -------------------------------------------------------
+        - What did you do?
+
+          I ran the command `#{$PROGRAM_NAME} #{ARGV.join(" ")}`
+
+        - What did you expect to happen?
+
+          I expected Bundler to...
+
+        - What happened instead?
+
+          Instead, what actually happened was...
+
+
+        Error details
+
+            #{e.class}: #{e.message}
+              #{e.backtrace.join("\n              ")}
+
+        #{Bundler::Env.new.report(:print_gemfile => false, :print_gemspecs => false).gsub(/\n/, "\n      ").strip}
+        --- TEMPLATE END ----------------------------------------------------------------
+
+      EOS
+
+      Bundler.ui.error "Unfortunately, an unexpected error occurred, and Bundler cannot continue."
+
+      Bundler.ui.warn <<-EOS.gsub(/^ {8}/, "")
+
+        First, try this link to see if there are any existing issue reports for this error:
+        #{issues_url(e)}
+
+        If there aren't any reports for this error yet, please create copy and paste the report template above into a new issue. Don't forget to anonymize any private data! The new issue form is located at:
+        https://github.com/bundler/bundler/issues/new
+      EOS
+    end
+
+    def issues_url(exception)
+      "https://github.com/bundler/bundler/search?q=" \
+        "#{CGI.escape(exception.message.lines.first.chomp)}&type=Issues"
+    end
+  end
+
   def self.with_friendly_errors
     yield
-  rescue Bundler::YamlSyntaxError => e
-    Bundler.ui.error e.message
-    Bundler.ui.trace e.orig_exception
-    exit e.status_code
-  rescue Bundler::Dsl::DSLError => e
-    Bundler.ui.error e.message
-    exit e.status_code
-  rescue Bundler::GemRequireError => e
-    Bundler.ui.error e.message
-    Bundler.ui.trace e.orig_exception, nil, true
-    exit e.status_code
-  rescue Bundler::BundlerError => e
-    Bundler.ui.error e.message, :wrap => true
-    Bundler.ui.trace e
-    exit e.status_code
-  rescue Thor::AmbiguousTaskError => e
-    Bundler.ui.error e.message
-    exit 15
-  rescue Thor::UndefinedTaskError => e
-    Bundler.ui.error e.message
-    exit 15
-  rescue Thor::Error => e
-    Bundler.ui.error e.message
-    exit 1
-  rescue LoadError => e
-    raise e unless e.message =~ /cannot load such file -- openssl|openssl.so|libcrypto.so/
-    Bundler.ui.error "\nCould not load OpenSSL."
-    Bundler.ui.warn <<-WARN, :wrap => true
-      You must recompile Ruby with OpenSSL support or change the sources in your \
-      Gemfile from 'https' to 'http'. Instructions for compiling with OpenSSL \
-      using RVM are available at http://rvm.io/packages/openssl.
-    WARN
-    Bundler.ui.trace e
-    exit 1
-  rescue Interrupt => e
-    Bundler.ui.error "\nQuitting..."
-    Bundler.ui.trace e
-    exit 1
-  rescue SystemExit => e
-    exit e.status
   rescue Exception => e
-    request_issue_report_for(e)
-    exit 1
-  end
-
-  def self.request_issue_report_for(e)
-    Bundler.ui.info <<-EOS.gsub(/^ {6}/, "")
-      --- ERROR REPORT TEMPLATE -------------------------------------------------------
-      - What did you do?
-
-        I ran the command `#{$PROGRAM_NAME} #{ARGV.join(" ")}`
-
-      - What did you expect to happen?
-
-        I expected Bundler to...
-
-      - What happened instead?
-
-        Instead, what actually happened was...
-
-
-      Error details
-
-          #{e.class}: #{e.message}
-            #{e.backtrace.join("\n            ")}
-
-      #{Bundler::Env.new.report(:print_gemfile => false, :print_gemspecs => false).gsub(/\n/, "\n      ").strip}
-      --- TEMPLATE END ----------------------------------------------------------------
-
-    EOS
-
-    Bundler.ui.error "Unfortunately, an unexpected error occurred, and Bundler cannot continue."
-
-    Bundler.ui.warn <<-EOS.gsub(/^ {6}/, "")
-
-      First, try this link to see if there are any existing issue reports for this error:
-      #{issues_url(e)}
-
-      If there aren't any reports for this error yet, please create copy and paste the report template above into a new issue. Don't forget to anonymize any private data! The new issue form is located at:
-      https://github.com/bundler/bundler/issues/new
-    EOS
-  end
-
-  def self.issues_url(exception)
-    "https://github.com/bundler/bundler/search?q=" \
-    "#{CGI.escape(exception.message.lines.first.chomp)}&type=Issues"
+    FriendlyErrors.log_error(e)
+    exit FriendlyErrors.exit_status(e)
   end
 end

data/lib/bundler/gem_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "bundler/vendored_thor" unless defined?(Thor)
 require "bundler"
 
@@ -91,18 +92,17 @@ module Bundler
   protected
 
     def rubygem_push(path)
-      if Pathname.new("~/.gem/credentials").expand_path.exist?
-        allowed_push_host = nil
-        gem_command = "gem push '#{path}'"
-        if @gemspec.respond_to?(:metadata)
-          allowed_push_host = @gemspec.metadata["allowed_push_host"]
-          gem_command << " --host #{allowed_push_host}" if allowed_push_host
-        end
-        sh(gem_command)
-        Bundler.ui.confirm "Pushed #{name} #{version} to #{allowed_push_host ? allowed_push_host : "rubygems.org."}"
-      else
+      unless  Pathname.new("~/.gem/credentials").expand_path.file?
         raise "Your rubygems.org credentials aren't set. Run `gem push` to set them."
       end
+      allowed_push_host = nil
+      gem_command = "gem push '#{path}'"
+      if @gemspec.respond_to?(:metadata)
+        allowed_push_host = @gemspec.metadata["allowed_push_host"]
+        gem_command += " --host #{allowed_push_host}" if allowed_push_host
+      end
+      sh(gem_command)
+      Bundler.ui.confirm "Pushed #{name} #{version} to #{allowed_push_host ? allowed_push_host : "rubygems.org."}"
     end
 
     def built_gem_path
@@ -122,10 +122,9 @@ module Bundler
     end
 
     def already_tagged?
-      if sh("git tag").split(/\n/).include?(version_tag)
-        Bundler.ui.confirm "Tag #{version_tag} has already been created."
-        true
-      end
+      return false unless sh("git tag").split(/\n/).include?(version_tag)
+      Bundler.ui.confirm "Tag #{version_tag} has already been created."
+      true
     end
 
     def guard_clean
@@ -164,22 +163,22 @@ module Bundler
 
     def sh(cmd, &block)
       out, code = sh_with_code(cmd, &block)
-      if code == 0
-        out
-      else
+      unless code.zero?
         raise(out.empty? ? "Running `#{cmd}` failed. Run this command directly for more detailed output." : out)
       end
+      out
     end
 
     def sh_with_code(cmd, &block)
-      cmd << " 2>&1"
-      outbuf = ""
+      cmd += " 2>&1"
+      outbuf = String.new
       Bundler.ui.debug(cmd)
       SharedHelpers.chdir(base) do
         outbuf = `#{cmd}`
-        block.call(outbuf) if $? == 0 && block
+        status = $?.exitstatus
+        block.call(outbuf) if status.zero? && block
+        [outbuf, status]
       end
-      [outbuf, $?]
     end
 
     def gem_push?

data/lib/bundler/gem_helpers.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
 module Bundler
   module GemHelpers
-    GENERIC_CACHE = {}
+    GENERIC_CACHE = {} # rubocop:disable MutableConstant
     GENERICS = [
       [Gem::Platform.new("java"), Gem::Platform.new("java")],
       [Gem::Platform.new("mswin32"), Gem::Platform.new("mswin32")],
@@ -9,7 +10,7 @@ module Bundler
       [Gem::Platform.new("x64-mingw32"), Gem::Platform.new("x64-mingw32")],
       [Gem::Platform.new("x86_64-mingw32"), Gem::Platform.new("x64-mingw32")],
       [Gem::Platform.new("mingw32"), Gem::Platform.new("x86-mingw32")]
-    ]
+    ].freeze
 
     def generic(p)
       return p if p == Gem::Platform::RUBY
@@ -21,5 +22,11 @@ module Bundler
         found || Gem::Platform::RUBY
       end
     end
+    module_function :generic
+
+    def generic_local_platform
+      generic(Gem::Platform.local)
+    end
+    module_function :generic_local_platform
   end
 end

data/lib/bundler/gem_remote_fetcher.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "rubygems/remote_fetcher"
 
 module Bundler

data/lib/bundler/gem_tasks.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "rake/clean"
 CLOBBER.include "pkg"
 

data/lib/bundler/graph.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "set"
 module Bundler
   class Graph
@@ -31,25 +32,23 @@ module Bundler
     def _populate_relations
       parent_dependencies = _groups.values.to_set.flatten
       loop do
-        if parent_dependencies.empty?
-          break
-        else
-          tmp = Set.new
-          parent_dependencies.each do |dependency|
-            # if the dependency is a prerelease, allow to_spec to be non-nil
-            dependency.prerelease = true
-
-            child_dependencies = dependency.to_spec.runtime_dependencies.to_set
-            @relations[dependency.name] += child_dependencies.map(&:name).to_set
-            tmp += child_dependencies
-
-            @node_options[dependency.name] = _make_label(dependency, :node)
-            child_dependencies.each do |c_dependency|
-              @edge_options["#{dependency.name}_#{c_dependency.name}"] = _make_label(c_dependency, :edge)
-            end
+        break if parent_dependencies.empty?
+
+        tmp = Set.new
+        parent_dependencies.each do |dependency|
+          # if the dependency is a prerelease, allow to_spec to be non-nil
+          dependency.prerelease = true
+
+          child_dependencies = dependency.to_spec.runtime_dependencies.to_set
+          @relations[dependency.name] += child_dependencies.map(&:name).to_set
+          tmp += child_dependencies
+
+          @node_options[dependency.name] = _make_label(dependency, :node)
+          child_dependencies.each do |c_dependency|
+            @edge_options["#{dependency.name}_#{c_dependency.name}"] = _make_label(c_dependency, :edge)
           end
-          parent_dependencies = tmp
         end
+        parent_dependencies = tmp
       end
     end
 

data/lib/bundler/index.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "set"
 
 module Bundler
@@ -139,12 +140,9 @@ module Bundler
     end
 
     def add_source(index)
-      if index.is_a?(Index)
-        @sources << index
-        @sources.uniq! # need to use uniq! here instead of checking for the item before adding
-      else
-        raise ArgumentError, "Source must be an index, not #{index.class}"
-      end
+      raise ArgumentError, "Source must be an index, not #{index.class}" unless index.is_a?(Index)
+      @sources << index
+      @sources.uniq! # need to use uniq! here instead of checking for the item before adding
     end
 
   private

data/lib/bundler/injector.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Bundler
   class Injector
     def self.inject(new_deps)

data/lib/bundler/inline.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Allows for declaring a Gemfile inline in a ruby script, optionally installing
 # any gems that aren't already installed on the user's system.
 #
@@ -27,8 +28,13 @@
 #
 #          puts Pod::VERSION # => "0.34.4"
 #
-def gemfile(install = false, &gemfile)
+def gemfile(install = false, options = {}, &gemfile)
   require "bundler"
+
+  opts = options.dup
+  ui = opts.delete(:ui) { Bundler::UI::Shell.new }
+  raise ArgumentError, "Unknown options: #{opts.keys.join(", ")}" unless opts.empty?
+
   old_root = Bundler.method(:root)
   def Bundler.root
     Bundler::SharedHelpers.pwd.expand_path
@@ -43,7 +49,7 @@ def gemfile(install = false, &gemfile)
   definition.validate_ruby!
 
   if install
-    Bundler.ui = Bundler::UI::Shell.new
+    Bundler.ui = ui
     Bundler::Installer.install(Bundler.root, definition, :system => true)
     Bundler::Installer.post_install_messages.each do |name, message|
       Bundler.ui.info "Post-install message from #{name}:\n#{message}"