bundler 1.10.6 → 1.11.2

data/lib/bundler/settings.rb

@@ -1,10 +1,10 @@
-require 'uri'
+require "uri"
 
 module Bundler
   class Settings
-    BOOL_KEYS = %w(frozen cache_all no_prune disable_local_branch_check ignore_messages gem.mit gem.coc).freeze
-    NUMBER_KEYS = %w(retry timeout redirect).freeze
-    DEFAULT_CONFIG = {:retry => 3, :timeout => 10, :redirect => 5}
+    BOOL_KEYS = %w(frozen cache_all no_prune disable_local_branch_check ignore_messages gem.mit gem.coc silence_root_warning).freeze
+    NUMBER_KEYS = %w(retry timeout redirect ssl_verify_mode).freeze
+    DEFAULT_CONFIG = { :retry => 3, :timeout => 10, :redirect => 5 }
 
     def initialize(root = nil)
       @root          = root
@@ -17,9 +17,11 @@ module Bundler
       value = (@local_config[key] || ENV[key] || @global_config[key] || DEFAULT_CONFIG[name])
 
       case
-      when !value.nil? && is_bool(name)
+      when value.nil?
+        nil
+      when is_bool(name) || value == "false"
         to_bool(value)
-      when !value.nil? && is_num(name)
+      when is_num(name)
         value.to_i
       else
         value
@@ -27,11 +29,11 @@ module Bundler
     end
 
     def []=(key, value)
-      local_config_file or raise GemfileNotFound, "Could not locate Gemfile"
+      local_config_file || raise(GemfileNotFound, "Could not locate Gemfile")
       set_key(key, value, @local_config, local_config_file)
     end
 
-    alias :set_local :[]=
+    alias_method :set_local, :[]=
 
     def delete(key)
       @local_config.delete(key_for(key))
@@ -42,21 +44,19 @@ module Bundler
     end
 
     def all
-      env_keys = ENV.keys.select { |k| k =~ /BUNDLE_.*/ }
+      env_keys = ENV.keys.select {|k| k =~ /BUNDLE_.*/ }
 
       keys = @global_config.keys | @local_config.keys | env_keys
 
       keys.map do |key|
-        key.sub(/^BUNDLE_/, '').gsub(/__/, ".").downcase
+        key.sub(/^BUNDLE_/, "").gsub(/__/, ".").downcase
       end
     end
 
     def local_overrides
       repos = {}
       all.each do |k|
-        if k =~ /^local\./
-          repos[$'] = self[k]
-        end
+        repos[$'] = self[k] if k =~ /^local\./
       end
       repos
     end
@@ -147,7 +147,7 @@ module Bundler
     end
 
     def ignore_config?
-      ENV['BUNDLE_IGNORE_CONFIG']
+      ENV["BUNDLE_IGNORE_CONFIG"]
     end
 
     def app_cache_path
@@ -159,10 +159,9 @@ module Bundler
     end
 
   private
+
     def key_for(key)
-      if key.is_a?(String) && /https?:/ =~ key
-        key = normalize_uri(key).to_s
-      end
+      key = normalize_uri(key).to_s if key.is_a?(String) && /https?:/ =~ key
       key = key.to_s.gsub(".", "__").upcase
       "BUNDLE_#{key}"
     end
@@ -184,7 +183,7 @@ module Bundler
     end
 
     def to_bool(value)
-      !(value.nil? || value == '' || value =~ /^(false|f|no|n|0)$/i || value == false)
+      !(value.nil? || value == "" || value =~ /^(false|f|no|n|0)$/i || value == false)
     end
 
     def is_num(value)
@@ -192,11 +191,11 @@ module Bundler
     end
 
     def get_array(key)
-      self[key] ? self[key].split(":").map { |w| w.to_sym } : []
+      self[key] ? self[key].split(":").map(&:to_sym) : []
     end
 
     def set_array(key, array)
-     self[key] = (array.empty? ? nil : array.join(":")) if array
+      self[key] = (array.empty? ? nil : array.join(":")) if array
     end
 
     def set_key(key, value, hash, file)
@@ -205,9 +204,11 @@ module Bundler
       unless hash[key] == value
         hash[key] = value
         hash.delete(key) if value.nil?
-        FileUtils.mkdir_p(file.dirname)
-        require 'bundler/psyched_yaml'
-        File.open(file, "w") { |f| f.puts YAML.dump(hash) }
+        SharedHelpers.filesystem_access(file) do |p|
+          FileUtils.mkdir_p(p.dirname)
+          require "bundler/psyched_yaml"
+          File.open(p, "w") {|f| f.puts YAML.dump(hash) }
+        end
       end
 
       value
@@ -226,6 +227,7 @@ module Bundler
       valid_file = config_file && config_file.exist? && !config_file.size.zero?
       if !ignore_config? && valid_file
         config_regex = /^(BUNDLE_.+): (['"]?)(.*(?:\n(?!BUNDLE).+)?)\2$/
+        raise PermissionError.new(config_file, :read) unless config_file.readable?
         config_pairs = config_file.read.scan(config_regex).map do |m|
           key, _, value = m
           [convert_to_backward_compatible_key(key), value.gsub(/\s+/, " ").tr('"', "'")]
@@ -237,7 +239,7 @@ module Bundler
     end
 
     def convert_to_backward_compatible_key(key)
-      key = "#{key}/" if key =~ /https?:/i && key !~ %r[/\Z]
+      key = "#{key}/" if key =~ /https?:/i && key !~ %r{/\Z}
       key = key.gsub(".", "__") if key.include?(".")
       key
     end
@@ -246,13 +248,12 @@ module Bundler
     # TODO: is this the correct place to validate mirror URIs?
     def normalize_uri(uri)
       uri = uri.to_s
-      uri = "#{uri}/" unless uri =~ %r[/\Z]
+      uri = "#{uri}/" unless uri =~ %r{/\Z}
       uri = URI(uri)
       unless uri.absolute?
         raise ArgumentError, "Gem sources must be absolute. You provided '#{uri}'."
       end
       uri
     end
-
   end
 end

data/lib/bundler/setup.rb

@@ -1,9 +1,9 @@
-require 'bundler/shared_helpers'
+require "bundler/shared_helpers"
 
 if Bundler::SharedHelpers.in_bundle?
-  require 'bundler'
+  require "bundler"
 
-  if STDOUT.tty? || ENV['BUNDLER_FORCE_TTY']
+  if STDOUT.tty? || ENV["BUNDLER_FORCE_TTY"]
     begin
       Bundler.setup
     rescue Bundler::BundlerError => e

data/lib/bundler/shared_helpers.rb

@@ -1,13 +1,13 @@
-require 'pathname'
-require 'rubygems'
+require "pathname"
+require "rubygems"
 
-require 'bundler/constants'
-require 'bundler/rubygems_integration'
-require 'bundler/current_ruby'
+require "bundler/constants"
+require "bundler/rubygems_integration"
+require "bundler/current_ruby"
 
 module Gem
   class Dependency
-    if !instance_methods.map { |m| m.to_s }.include?("requirement")
+    unless method_defined? :requirement
       def requirement
         version_requirements
       end
@@ -29,7 +29,7 @@ module Bundler
       gemfile = default_gemfile
 
       case gemfile.basename.to_s
-      when 'gems.rb' then Pathname.new(gemfile.sub(/.rb$/, '.locked'))
+      when "gems.rb" then Pathname.new(gemfile.sub(/.rb$/, ".locked"))
       else Pathname.new("#{gemfile}.lock")
       end
     end
@@ -56,12 +56,12 @@ module Bundler
 
     def pwd
       Bundler.rubygems.ext_lock.synchronize do
-        Dir.pwd
+        Pathname.pwd
       end
     end
 
     def with_clean_git_env(&block)
-      keys    = %w[GIT_DIR GIT_WORK_TREE]
+      keys    = %w(GIT_DIR GIT_WORK_TREE)
       old_env = keys.inject({}) do |h, k|
         h.update(k => ENV[k])
       end
@@ -81,30 +81,54 @@ module Bundler
 
       # Set RUBYOPT
       rubyopt = [ENV["RUBYOPT"]].compact
-      if rubyopt.empty? || rubyopt.first !~ /-rbundler\/setup/
-        rubyopt.unshift %|-rbundler/setup|
-        ENV["RUBYOPT"] = rubyopt.join(' ')
+      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__)
+      rubylib.unshift File.expand_path("../..", __FILE__)
       ENV["RUBYLIB"] = rubylib.uniq.join(File::PATH_SEPARATOR)
     end
 
+    # Rescues permissions errors raised by file system operations
+    # (ie. Errno:EACCESS) 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
+    #   performed. For example: :write, :read, :exec
+    #
+    # @yield path
+    #
+    # @raise [Bundler::PermissionError] if Errno:EACCES is raised in the
+    #   given block
+    #
+    # @example
+    #   filesystem_access("vendor/cache", :write) do
+    #     FileUtils.mkdir_p("vendor/cache")
+    #   end
+    #
+    # @see {Bundler::PermissionError}
+    def filesystem_access(path, action = :write)
+      yield path
+    rescue Errno::EACCES
+      raise PermissionError.new(path, action)
+    end
+
   private
 
     def find_gemfile
-      given = ENV['BUNDLE_GEMFILE']
+      given = ENV["BUNDLE_GEMFILE"]
       return given if given && !given.empty?
 
-      find_file('Gemfile', 'gems.rb')
+      find_file("Gemfile", "gems.rb")
     end
 
     def find_file(*names)
-      search_up(*names) {|filename|
+      search_up(*names) do |filename|
         return filename if File.file?(filename)
-      }
+      end
     end
 
     def find_directory(*names)
@@ -118,16 +142,17 @@ module Bundler
       current  = File.expand_path(SharedHelpers.pwd)
 
       until !File.directory?(current) || current == previous
-        if ENV['BUNDLE_SPEC_RUN']
+        if ENV["BUNDLE_SPEC_RUN"]
           # avoid stepping above the tmp directory when testing
-          return nil if File.file?(File.join(current, 'bundler.gemspec'))
+          return nil if File.file?(File.join(current, "bundler.gemspec"))
         end
 
         names.each do |name|
           filename = File.join(current, name)
           yield filename
         end
-        current, previous = File.expand_path("..", current), current
+        previous = current
+        current = File.expand_path("..", current)
       end
     end
 

data/lib/bundler/similarity_detector.rb

@@ -8,56 +8,54 @@ module Bundler
     end
 
     # return an array of words similar to 'word' from the corpus
-    def similar_words(word, limit=3)
-      words_by_similarity = @corpus.map{|w| SimilarityScore.new(w, levenshtein_distance(word, w))}
-      words_by_similarity.select{|s| s.distance<=limit}.sort_by(&:distance).map(&:string)
+    def similar_words(word, limit = 3)
+      words_by_similarity = @corpus.map {|w| SimilarityScore.new(w, levenshtein_distance(word, w)) }
+      words_by_similarity.select {|s| s.distance <= limit }.sort_by(&:distance).map(&:string)
     end
 
     # return the result of 'similar_words', concatenated into a list
     # (eg "a, b, or c")
-    def similar_word_list(word, limit=3)
-      words = similar_words(word,limit)
-      if words.length==1
+    def similar_word_list(word, limit = 3)
+      words = similar_words(word, limit)
+      if words.length == 1
         words[0]
-      elsif words.length>1
-        [words[0..-2].join(', '), words[-1]].join(' or ')
+      elsif words.length > 1
+        [words[0..-2].join(", "), words[-1]].join(" or ")
       end
     end
 
-
   protected
+
     # http://www.informit.com/articles/article.aspx?p=683059&seqNum=36
-    def levenshtein_distance(this, that, ins=2, del=2, sub=1)
+    def levenshtein_distance(this, that, ins = 2, del = 2, sub = 1)
       # ins, del, sub are weighted costs
       return nil if this.nil?
       return nil if that.nil?
-      dm = []        # distance matrix
+      dm = [] # distance matrix
 
       # Initialize first row values
-      dm[0] = (0..this.length).collect { |i| i * ins }
+      dm[0] = (0..this.length).collect {|i| i * ins }
       fill = [0] * (this.length - 1)
 
       # Initialize first column values
-      for i in 1..that.length
+      (1..that.length).each do |i|
         dm[i] = [i * del, fill.flatten]
       end
 
       # populate matrix
-      for i in 1..that.length
-        for j in 1..this.length
+      (1..that.length).each do |i|
+        (1..this.length).each do |j|
           # critical comparison
           dm[i][j] = [
-               dm[i-1][j-1] +
-                 (this[j-1] == that[i-1] ? 0 : sub),
-                   dm[i][j-1] + ins,
-               dm[i-1][j] + del
-         ].min
+            dm[i - 1][j - 1] + (this[j - 1] == that[i - 1] ? 0 : sub),
+            dm[i][j - 1] + ins,
+            dm[i - 1][j] + del
+          ].min
         end
       end
 
       # The last value in matrix is the Levenshtein distance between the strings
       dm[that.length][this.length]
     end
-
   end
 end

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

@@ -1,7 +1,6 @@
 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. "
@@ -20,8 +19,9 @@ module Bundler
       end
 
       class GitCommandError < GitError
-        def initialize(command, path = nil)
-          msg =  "Git error: command `git #{command}` in directory #{Dir.pwd} has failed."
+        def initialize(command, path = nil, extra_info = nil)
+          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
@@ -44,7 +44,10 @@ module Bundler
         end
 
         def revision
-          @revision ||= allowed_in_path { git("rev-parse #{ref}").strip }
+          @revision ||= allowed_in_path do
+            msg = "Ref '#{ref}' was not found. Perhaps you mispelled it?"
+            git("rev-parse --verify #{ref}", true, msg).strip
+          end
         end
 
         def branch
@@ -67,32 +70,44 @@ module Bundler
         def checkout
           if path.exist?
             return if has_revision_cached?
-            Bundler.ui.confirm "Updating #{uri}"
+            Bundler.ui.info "Fetching #{uri}"
             in_path do
-              git_retry %|fetch --force --quiet --tags #{uri_escaped} "refs/heads/*:refs/heads/*"|
+              git_retry %(fetch --force --quiet --tags #{uri_escaped_with_configured_credentials} "refs/heads/*:refs/heads/*")
             end
           else
             Bundler.ui.info "Fetching #{uri}"
-            FileUtils.mkdir_p(path.dirname)
-            git_retry %|clone #{uri_escaped} "#{path}" --bare --no-hardlinks --quiet|
+            SharedHelpers.filesystem_access(path.dirname) do |p|
+              FileUtils.mkdir_p(p)
+            end
+            git_retry %(clone #{uri_escaped_with_configured_credentials} "#{path}" --bare --no-hardlinks --quiet)
           end
         end
 
-        def copy_to(destination, submodules=false)
+        def copy_to(destination, submodules = false)
+          # method 1
           unless File.exist?(destination.join(".git"))
-            FileUtils.mkdir_p(destination.dirname)
-            FileUtils.rm_rf(destination)
-            git_retry %|clone --no-checkout --quiet "#{path}" "#{destination}"|
-            File.chmod(((File.stat(destination).mode | 0777) & ~File.umask), destination)
+            begin
+              SharedHelpers.filesystem_access(destination.dirname) do |p|
+                FileUtils.mkdir_p(p)
+              end
+              SharedHelpers.filesystem_access(destination) do |p|
+                FileUtils.rm_rf(p)
+              end
+              git_retry %(clone --no-checkout --quiet "#{path}" "#{destination}")
+              File.chmod(((File.stat(destination).mode | 0777) & ~File.umask), destination)
+            rescue Errno::EEXIST => e
+              file_path = e.message[%r{.*?(/.*)}, 1]
+              raise GitError, "Bundler could not install a gem because it needs to " \
+                "create a directory, but a file exists - #{file_path}. Please delete " \
+                "this file and try again."
+            end
           end
-
+          # method 2
           SharedHelpers.chdir(destination) do
-            git_retry %|fetch --force --quiet --tags "#{path}"|
+            git_retry %(fetch --force --quiet --tags "#{path}")
             git "reset --hard #{@revision}"
 
-            if submodules
-              git_retry "submodule update --init --recursive"
-            end
+            git_retry "submodule update --init --recursive" if submodules
           end
         end
 
@@ -113,10 +128,10 @@ module Bundler
           end
         end
 
-        def git(command, check_errors=true)
+        def git(command, check_errors = true, error_msg = nil)
           raise GitNotAllowedError.new(command) unless allow?
-          out = SharedHelpers.with_clean_git_env { %x{git #{command}} }
-          raise GitCommandError.new(command, path) if check_errors && !$?.success?
+          out = SharedHelpers.with_clean_git_env { `git #{command}` }
+          raise GitCommandError.new(command, path, error_msg) if check_errors && !$?.success?
           out
         end
 
@@ -129,15 +144,28 @@ module Bundler
         end
 
         # Escape the URI for git commands
-        def uri_escaped
+        def uri_escaped_with_configured_credentials
+          remote = configured_uri_for(uri)
           if Bundler::WINDOWS
             # Windows quoting requires double quotes only, with double quotes
             # inside the string escaped by being doubled.
-            '"' + uri.gsub('"') {|s| '""'} + '"'
+            '"' + remote.gsub('"') { '""' } + '"'
           else
             # Bash requires single quoted strings, with the single quotes escaped
             # by ending the string, escaping the quote, and restarting the string.
-            "'" + uri.gsub("'") {|s| "'\\''"} + "'"
+            "'" + remote.gsub("'") { "'\\''" } + "'"
+          end
+        end
+
+        # Adds credentials to the URI as Fetcher#configured_uri_for does
+        def configured_uri_for(uri)
+          if /https?:/ =~ uri
+            remote = URI(uri)
+            config_auth = Bundler.settings[remote.to_s] || Bundler.settings[remote.host]
+            remote.userinfo ||= config_auth
+            remote.to_s
+          else
+            uri
           end
         end
 
@@ -154,9 +182,7 @@ module Bundler
           return in_path { yield } if allow?
           raise GitError, "The git source #{uri} is not yet checked out. Please run `bundle install` before trying to start your application"
         end
-
       end
-
     end
   end
 end

data/lib/bundler/source/git.rb

@@ -1,12 +1,11 @@
-require 'fileutils'
-require 'uri'
-require 'digest/sha1'
+require "fileutils"
+require "uri"
+require "digest/sha1"
 
 module Bundler
   class Source
-
     class Git < Path
-      autoload :GitProxy, 'bundler/source/git/git_proxy'
+      autoload :GitProxy, "bundler/source/git/git_proxy"
 
       attr_reader :uri, :ref, :branch, :options, :submodules
 
@@ -18,11 +17,11 @@ module Bundler
         @allow_remote = false
 
         # Stringify options that could be set as symbols
-        %w(ref branch tag revision).each{|k| options[k] = options[k].to_s if options[k] }
+        %w(ref branch tag revision).each {|k| options[k] = options[k].to_s if options[k] }
 
-        @uri        = options["uri"] || ''
+        @uri        = options["uri"] || ""
         @branch     = options["branch"]
-        @ref        = options["ref"] || options["branch"] || options["tag"] || 'master'
+        @ref        = options["ref"] || options["branch"] || options["tag"] || "master"
         @submodules = options["submodules"]
         @name       = options["name"]
         @version    = options["version"]
@@ -50,17 +49,13 @@ module Bundler
         [self.class, uri, ref, branch, name, version, submodules].hash
       end
 
-      def eql?(o)
-        o.is_a?(Git)         &&
-        uri == o.uri         &&
-        ref == o.ref         &&
-        branch == o.branch   &&
-        name == o.name       &&
-        version == o.version &&
-        submodules == o.submodules
+      def eql?(other)
+        other.is_a?(Git) && uri == other.uri && ref == other.ref &&
+          branch == other.branch && name == other.name &&
+          version == other.version && submodules == other.submodules
       end
 
-      alias == eql?
+      alias_method :==, :eql?
 
       def to_s
         at = if local?
@@ -70,11 +65,18 @@ module Bundler
         else
           ref
         end
-        "#{uri} (at #{at})"
+
+        rev = begin
+                "@#{shortref_for_display(revision)}"
+              rescue GitError
+                nil
+              end
+
+        "#{uri} (at #{at}#{rev})"
       end
 
       def name
-        File.basename(@uri, '.git')
+        File.basename(@uri, ".git")
       end
 
       # This is the path which is going to contain a specific
@@ -93,7 +95,7 @@ module Bundler
         end
       end
 
-      alias :path :install_path
+      alias_method :path, :install_path
 
       def extension_dir_name
         "#{base_name}-#{shortref_for_path(revision)}"
@@ -145,9 +147,7 @@ module Bundler
 
       # TODO: actually cache git specs
       def specs(*)
-        if has_app_cache? && !local?
-          set_local!(app_cache_path)
-        end
+        set_local!(app_cache_path) if has_app_cache? && !local?
 
         if requires_checkout? && !@copied
           git_proxy.checkout
@@ -160,7 +160,7 @@ module Bundler
       end
 
       def install(spec, force = false)
-        Bundler.ui.info "Using #{version_message(spec)} from #{to_s}"
+        Bundler.ui.info "Using #{version_message(spec)} from #{self}"
 
         if requires_checkout? && !@copied && !force
           Bundler.ui.debug "  * Checking out revision: #{ref}"
@@ -188,7 +188,7 @@ module Bundler
         super
       rescue PathError => e
         Bundler.ui.trace e
-        raise GitError, "#{to_s} is not yet checked out. Run `bundle install` first."
+        raise GitError, "#{self} is not yet checked out. Run `bundle install` first."
       end
 
       # This is the path which is going to contain a cache
@@ -219,7 +219,7 @@ module Bundler
         @allow_remote || @allow_cached
       end
 
-      private
+    private
 
       def serialize_gemspecs_in(destination)
         expanded_path = destination.expand_path(Bundler.root)
@@ -229,7 +229,7 @@ module Bundler
           # The gemspecs we cache should already be evaluated.
           spec = Bundler.load_gemspec(spec_path)
           next unless spec
-          File.open(spec_path, 'wb') {|file| file.write(spec.to_ruby) }
+          File.open(spec_path, "wb") {|file| file.write(spec.to_ruby) }
         end
       end
 
@@ -252,7 +252,7 @@ module Bundler
       end
 
       def base_name
-        File.basename(uri.sub(%r{^(\w+://)?([^/:]+:)?(//\w*/)?(\w*/)*},''),".git")
+        File.basename(uri.sub(%r{^(\w+://)?([^/:]+:)?(//\w*/)?(\w*/)*}, ""), ".git")
       end
 
       def shortref_for_display(ref)
@@ -267,7 +267,7 @@ module Bundler
         if uri =~ %r{^\w+://(\w+@)?}
           # Downcase the domain component of the URI
           # and strip off a trailing slash, if one is present
-          input = URI.parse(uri).normalize.to_s.sub(%r{/$},'')
+          input = URI.parse(uri).normalize.to_s.sub(%r{/$}, "")
         else
           # If there is no URI scheme, assume it is an ssh/git URI
           input = uri
@@ -286,8 +286,6 @@ module Bundler
       def git_proxy
         @git_proxy ||= GitProxy.new(cache_path, uri, ref, cached_revision, self)
       end
-
     end
-
   end
 end