bundler 1.11.2 → 1.12.0.pre.1

data/lib/bundler/setup.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "bundler/shared_helpers"
 
 if Bundler::SharedHelpers.in_bundle?

data/lib/bundler/shared_helpers.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "pathname"
 require "rubygems"
 
@@ -74,26 +75,14 @@ module Bundler
     end
 
     def set_bundle_environment
-      # Set PATH
-      paths = (ENV["PATH"] || "").split(File::PATH_SEPARATOR)
-      paths.unshift "#{Bundler.bundle_path}/bin"
-      ENV["PATH"] = paths.uniq.join(File::PATH_SEPARATOR)
-
-      # Set RUBYOPT
-      rubyopt = [ENV["RUBYOPT"]].compact
-      if rubyopt.empty? || rubyopt.first !~ %r{-rbundler/setup}
-        rubyopt.unshift %(-rbundler/setup)
-        ENV["RUBYOPT"] = rubyopt.join(" ")
-      end
-
-      # Set RUBYLIB
-      rubylib = (ENV["RUBYLIB"] || "").split(File::PATH_SEPARATOR)
-      rubylib.unshift File.expand_path("../..", __FILE__)
-      ENV["RUBYLIB"] = rubylib.uniq.join(File::PATH_SEPARATOR)
+      set_bundle_variables
+      set_path
+      set_rubyopt
+      set_rubylib
     end
 
     # Rescues permissions errors raised by file system operations
-    # (ie. Errno:EACCESS) and raises more friendly errors instead.
+    # (ie. Errno:EACCESS, Errno::EAGAIN) and raises more friendly errors instead.
     #
     # @param path [String] the path that the action will be attempted to
     # @param action [Symbol, #to_s] the type of operation that will be
@@ -103,6 +92,8 @@ module Bundler
     #
     # @raise [Bundler::PermissionError] if Errno:EACCES is raised in the
     #   given block
+    # @raise [Bundler::TemporaryResourceError] if Errno:EAGAIN is raised in the
+    #   given block
     #
     # @example
     #   filesystem_access("vendor/cache", :write) do
@@ -114,6 +105,15 @@ module Bundler
       yield path
     rescue Errno::EACCES
       raise PermissionError.new(path, action)
+    rescue Errno::EAGAIN
+      raise TemporaryResourceError.new(path, action)
+    end
+
+    def const_get_safely(constant_name, namespace)
+      const_in_namespace = namespace.constants.include?(constant_name.to_s) ||
+        namespace.constants.include?(constant_name.to_sym)
+      return nil unless const_in_namespace
+      namespace.const_get(constant_name)
     end
 
   private
@@ -156,6 +156,36 @@ module Bundler
       end
     end
 
+    def set_bundle_variables
+      begin
+        ENV["BUNDLE_BIN_PATH"] = Bundler.rubygems.bin_path("bundler", "bundle", VERSION)
+      rescue Gem::GemNotFoundException
+        ENV["BUNDLE_BIN_PATH"] = File.expand_path("../../../exe/bundle", __FILE__)
+      end
+
+      # Set BUNDLE_GEMFILE
+      ENV["BUNDLE_GEMFILE"] = find_gemfile.to_s
+    end
+
+    def set_path
+      paths = (ENV["PATH"] || "").split(File::PATH_SEPARATOR)
+      paths.unshift "#{Bundler.bundle_path}/bin"
+      ENV["PATH"] = paths.uniq.join(File::PATH_SEPARATOR)
+    end
+
+    def set_rubyopt
+      rubyopt = [ENV["RUBYOPT"]].compact
+      return if !rubyopt.empty? && rubyopt.first =~ %r{-rbundler/setup}
+      rubyopt.unshift %(-rbundler/setup)
+      ENV["RUBYOPT"] = rubyopt.join(" ")
+    end
+
+    def set_rubylib
+      rubylib = (ENV["RUBYLIB"] || "").split(File::PATH_SEPARATOR)
+      rubylib.unshift File.expand_path("../..", __FILE__)
+      ENV["RUBYLIB"] = rubylib.uniq.join(File::PATH_SEPARATOR)
+    end
+
     def clean_load_path
       # handle 1.9 where system gems are always on the load path
       if defined?(::Gem)

data/lib/bundler/similarity_detector.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Bundler
   class SimilarityDetector
     SimilarityScore = Struct.new(:string, :distance)

data/lib/bundler/source.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Bundler
   class Source
     autoload :Rubygems, "bundler/source/rubygems"
@@ -17,7 +18,7 @@ module Bundler
         locked_spec = Bundler.locked_gems.specs.find {|s| s.name == spec.name }
         locked_spec_version = locked_spec.version if locked_spec
         if locked_spec_version && spec.version != locked_spec_version
-          message << " (was #{locked_spec_version})"
+          message += " (was #{locked_spec_version})"
         end
       end
 

data/lib/bundler/source/git.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "fileutils"
 require "uri"
 require "digest/sha1"
@@ -35,7 +36,7 @@ module Bundler
       end
 
       def to_lock
-        out = "GIT\n"
+        out = String.new("GIT\n")
         out << "  remote: #{@uri}\n"
         out << "  revision: #{revision}\n"
         %w(ref branch tag submodules).each do |opt|

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

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
 module Bundler
   class Source
     class Git < Path
       class GitNotInstalledError < GitError
         def initialize
-          msg =  "You need to install git to be able to use gems from git repositories. "
+          msg = String.new
+          msg << "You need to install git to be able to use gems from git repositories. "
           msg << "For help installing git, please refer to GitHub's tutorial at https://help.github.com/articles/set-up-git"
           super msg
         end
@@ -11,7 +13,8 @@ module Bundler
 
       class GitNotAllowedError < GitError
         def initialize(command)
-          msg =  "Bundler is trying to run a `git #{command}` at runtime. You probably need to run `bundle install`. However, "
+          msg = String.new
+          msg << "Bundler is trying to run a `git #{command}` at runtime. You probably need to run `bundle install`. However, "
           msg << "this error message could probably be more useful. Please submit a ticket at http://github.com/bundler/bundler/issues "
           msg << "with steps to reproduce as well as the following\n\nCALLER: #{caller.join("\n")}"
           super msg
@@ -20,13 +23,21 @@ module Bundler
 
       class GitCommandError < GitError
         def initialize(command, path = nil, extra_info = nil)
-          msg =  "Git error: command `git #{command}` in directory #{SharedHelpers.pwd} has failed."
+          msg = String.new
+          msg << "Git error: command `git #{command}` in directory #{SharedHelpers.pwd} has failed."
           msg << "\n#{extra_info}" if extra_info
           msg << "\nIf this error persists you could try removing the cache directory '#{path}'" if path && path.exist?
           super msg
         end
       end
 
+      class MissingGitRevisionError < GitError
+        def initialize(ref, repo)
+          msg = "Revision #{ref} does not exist in the repository #{repo}. Maybe you misspelled it?"
+          super msg
+        end
+      end
+
       # The GitProxy is responsible to interact with git repositories.
       # All actions required by the Git source is encapsulated in this
       # object.
@@ -44,15 +55,20 @@ module Bundler
         end
 
         def revision
-          @revision ||= allowed_in_path do
-            msg = "Ref '#{ref}' was not found. Perhaps you mispelled it?"
-            git("rev-parse --verify #{ref}", true, msg).strip
+          return @revision if @revision
+
+          begin
+            @revision ||= find_local_revision
+          rescue GitCommandError
+            raise MissingGitRevisionError.new(ref, uri)
           end
+
+          @revision
         end
 
         def branch
           @branch ||= allowed_in_path do
-            git("branch") =~ /^\* (.*)$/ && $1.strip
+            git("rev-parse --abbrev-ref HEAD").strip
           end
         end
 
@@ -143,6 +159,16 @@ module Bundler
           false
         end
 
+        def remove_cache
+          FileUtils.rm_rf(path)
+        end
+
+        def find_local_revision
+          allowed_in_path do
+            git("rev-parse --verify #{ref}", true).strip
+          end
+        end
+
         # Escape the URI for git commands
         def uri_escaped_with_configured_credentials
           remote = configured_uri_for(uri)

data/lib/bundler/source/path.rb

@@ -1,13 +1,14 @@
+# frozen_string_literal: true
 module Bundler
   class Source
     class Path < Source
       autoload :Installer, "bundler/source/path/installer"
 
-      attr_reader :path, :options
+      attr_reader :path, :options, :root_path
       attr_writer :name
       attr_accessor :version
 
-      DEFAULT_GLOB = "{,*,*/*}.gemspec"
+      DEFAULT_GLOB = "{,*,*/*}.gemspec".freeze
 
       def initialize(options)
         @options = options
@@ -16,6 +17,8 @@ module Bundler
         @allow_cached = false
         @allow_remote = false
 
+        @root_path = options["root_path"] || Bundler.root
+
         if options["path"]
           @path = Pathname.new(options["path"])
           @path = expand(@path) unless @path.relative?
@@ -42,7 +45,7 @@ module Bundler
       end
 
       def to_lock
-        out = "PATH\n"
+        out = String.new("PATH\n")
         out << "  remote: #{relative_path}\n"
         out << "  glob: #{@glob}\n" unless @glob == DEFAULT_GLOB
         out << "  specs:\n"
@@ -77,7 +80,7 @@ module Bundler
       def cache(spec, custom_path = nil)
         app_cache_path = app_cache_path(custom_path)
         return unless Bundler.settings[:cache_all]
-        return if expand(@original_path).to_s.index(Bundler.root.to_s + "/") == 0
+        return if expand(@original_path).to_s.index(root_path.to_s + "/") == 0
 
         unless @original_path.exist?
           raise GemNotFound, "Can't cache gem #{version_message(spec)} because #{self} is missing!"
@@ -111,7 +114,7 @@ module Bundler
       end
 
       def expand(somepath)
-        somepath.expand_path(Bundler.root)
+        somepath.expand_path(root_path)
       rescue ArgumentError => e
         Bundler.ui.debug(e)
         raise PathError, "There was an error while trying to use the path " \
@@ -154,18 +157,22 @@ module Bundler
               end
             end
           end
-        elsif File.exist?(expanded_path)
-          raise PathError, "The path `#{expanded_path}` is not a directory."
         else
-          raise PathError, "The path `#{expanded_path}` does not exist."
+          message = String.new("The path `#{expanded_path}` ")
+          message << if File.exist?(expanded_path)
+                       "is not a directory."
+                     else
+                       "does not exist."
+                     end
+          raise PathError, message
         end
 
         index
       end
 
       def relative_path
-        if path.to_s.start_with?(Bundler.root.to_s)
-          return path.relative_path_from(Bundler.root)
+        if path.to_s.start_with?(root_path.to_s)
+          return path.relative_path_from(root_path)
         end
         path
       end

data/lib/bundler/source/path/installer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Bundler
   class Source
     class Path

data/lib/bundler/source/rubygems.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "uri"
 require "rubygems/user_interaction"
 require "rubygems/spec_fetcher"
@@ -60,7 +61,7 @@ module Bundler
       end
 
       def to_lock
-        out = "GEM\n"
+        out = String.new("GEM\n")
         remotes.reverse_each do |remote|
           out << "  remote: #{suppress_configured_credentials remote}\n"
         end
@@ -118,7 +119,7 @@ module Bundler
 
         unless Bundler.settings[:no_install]
           message = "Installing #{version_message(spec)}"
-          message << " with native extensions" if spec.extensions.any?
+          message += " with native extensions" if spec.extensions.any?
           Bundler.ui.confirm message
 
           path = cached_gem(spec)
@@ -327,7 +328,7 @@ module Bundler
       end
 
       def api_fetchers
-        fetchers.select(&:use_api)
+        fetchers.select {|f| f.use_api && f.fetchers.first.api_fetcher? }
       end
 
       def remote_specs

data/lib/bundler/source/rubygems/remote.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Bundler
   class Source
     class Rubygems
@@ -14,6 +15,21 @@ module Bundler
           @anonymized_uri = remove_auth(@uri).freeze
         end
 
+        # @return [String] A slug suitable for use as a cache key for this
+        #         remote.
+        #
+        def cache_slug
+          @cache_slug ||= begin
+            cache_uri = original_uri || uri
+
+            uri_parts = [cache_uri.host, cache_uri.user, cache_uri.port, cache_uri.path]
+            uri_digest = Digest::MD5.hexdigest(uri_parts.compact.join("."))
+
+            uri_parts[-1] = uri_digest
+            uri_parts.compact.join(".")
+          end
+        end
+
       private
 
         def apply_auth(uri, auth)

data/lib/bundler/source_list.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Bundler
   class SourceList
     attr_reader :path_sources,

data/lib/bundler/spec_set.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "tsort"
 require "forwardable"
 

data/lib/bundler/ssl_certs/certificate_manager.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "fileutils"
 require "net/https"
 require "openssl"

data/lib/bundler/stub_specification.rb

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

data/lib/bundler/templates/Executable

@@ -1,4 +1,5 @@
 #!/usr/bin/env <%= Bundler.settings[:shebang] || RbConfig::CONFIG['ruby_install_name'] %>
+# frozen_string_literal: true
 #
 # This file was generated by Bundler.
 #

data/lib/bundler/templates/Gemfile

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # A sample Gemfile
 source "https://rubygems.org"
 

data/lib/bundler/templates/newgem/.travis.yml.tt

@@ -1,3 +1,4 @@
+sudo: false
 language: ruby
 rvm:
   - <%= RUBY_VERSION %>

data/lib/bundler/templates/newgem/newgem.gemspec.tt

@@ -16,8 +16,8 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
 <%- end -%>
 
-  # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
-  # delete this section to allow pushing this gem to any host.
+  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
+  # to allow pushing to a single host or delete this section to allow pushing to any host.
   if spec.respond_to?(:metadata)
     spec.metadata['allowed_push_host'] = "TODO: Set to 'http://mygemserver.com'"
   else

data/lib/bundler/ui.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Bundler
   module UI
     autoload :RGProxy, "bundler/ui/rg_proxy"

data/lib/bundler/ui/rg_proxy.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "bundler/ui"
 require "rubygems/user_interaction"
 

data/lib/bundler/ui/shell.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
 require "bundler/vendored_thor"
 
 module Bundler
   module UI
     class Shell
-      LEVELS = %w(silent error warn confirm info debug)
+      LEVELS = %w(silent error warn confirm info debug).freeze
 
       attr_writer :shell