bundler 1.10.6 → 1.11.0.pre.1

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.rb

@@ -1,8 +1,8 @@
 module Bundler
   class Source
-    autoload :Rubygems, 'bundler/source/rubygems'
-    autoload :Path,     'bundler/source/path'
-    autoload :Git,      'bundler/source/git'
+    autoload :Rubygems, "bundler/source/rubygems"
+    autoload :Path,     "bundler/source/path"
+    autoload :Git,      "bundler/source/git"
 
     attr_accessor :dependency_names
 
@@ -14,7 +14,7 @@ module Bundler
       message = "#{spec.name} #{spec.version}"
 
       if Bundler.locked_gems
-        locked_spec = Bundler.locked_gems.specs.find { |s| s.name == spec.name }
+        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})"
@@ -31,6 +31,5 @@ module Bundler
     def include?(other)
       other == self
     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

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/path.rb

@@ -1,10 +1,10 @@
 module Bundler
   class Source
     class Path < Source
-      autoload :Installer, 'bundler/source/path/installer'
+      autoload :Installer, "bundler/source/path/installer"
 
-      attr_reader   :path, :options
-      attr_writer   :name
+      attr_reader :path, :options
+      attr_writer :name
       attr_accessor :version
 
       DEFAULT_GLOB = "{,*,*/*}.gemspec"
@@ -49,27 +49,27 @@ module Bundler
       end
 
       def to_s
-        "source at #{@path}"
+        "source at `#{@path}`"
       end
 
       def hash
         [self.class, expanded_path, version].hash
       end
 
-      def eql?(o)
-        o.instance_of?(Path) &&
-        expanded_path == expand(o.path) &&
-        version == o.version
+      def eql?(other)
+        other.instance_of?(Path) &&
+          expanded_path == expand(other.path) &&
+          version == other.version
       end
 
-      alias == eql?
+      alias_method :==, :eql?
 
       def name
         File.basename(expanded_path.to_s)
       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}"
         generate_bin(spec, :disable_extensions)
         nil # no post-install message
       end
@@ -77,10 +77,10 @@ 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(Bundler.root.to_s + "/") == 0
 
         unless @original_path.exist?
-          raise GemNotFound, "Can't cache gem #{version_message(spec)} because #{to_s} is missing!"
+          raise GemNotFound, "Can't cache gem #{version_message(spec)} because #{self} is missing!"
         end
 
         FileUtils.rm_rf(app_cache_path)
@@ -131,12 +131,11 @@ module Bundler
 
         if File.directory?(expanded_path)
           # We sort depth-first since `<<` will override the earlier-found specs
-          Dir["#{expanded_path}/#{@glob}"].sort_by { |p| -p.split(File::SEPARATOR).size }.each do |file|
-            if spec = Bundler.load_gemspec(file, :validate)
-              spec.loaded_from = file.to_s
-              spec.source = self
-              index << spec
-            end
+          Dir["#{expanded_path}/#{@glob}"].sort_by {|p| -p.split(File::SEPARATOR).size }.each do |file|
+            next unless spec = Bundler.load_gemspec(file, :validate)
+            spec.loaded_from = file.to_s
+            spec.source = self
+            index << spec
           end
 
           if index.empty? && @name && @version
@@ -147,11 +146,11 @@ module Bundler
               s.platform = Gem::Platform::RUBY
               s.summary  = "Fake gemspec for #{@name}"
               s.relative_loaded_from = "#{@name}.gemspec"
-              s.authors  = ["no one"]
+              s.authors = ["no one"]
               if expanded_path.join("bin").exist?
                 executables = expanded_path.join("bin").children
-                executables.reject!{|p| File.directory?(p) }
-                s.executables = executables.map{|c| c.basename.to_s }
+                executables.reject! {|p| File.directory?(p) }
+                s.executables = executables.map {|c| c.basename.to_s }
               end
             end
           end
@@ -165,7 +164,7 @@ module Bundler
       end
 
       def relative_path
-        if path.to_s.match(%r{^#{Regexp.escape Bundler.root.to_s}})
+        if path.to_s.start_with?(Bundler.root.to_s)
           return path.relative_path_from(Bundler.root)
         end
         path
@@ -212,14 +211,12 @@ module Bundler
         return unless Gem.respond_to?(hooks_meth)
         Gem.send(hooks_meth).each do |hook|
           result = hook.call(installer)
-          if result == false
-            location = " at #{$1}" if hook.inspect =~ /@(.*:\d+)/
-            message = "#{type} hook#{location} failed for #{installer.spec.full_name}"
-            raise InstallHookError, message
-          end
+          next unless result == false
+          location = " at #{$1}" if hook.inspect =~ /@(.*:\d+)/
+          message = "#{type} hook#{location} failed for #{installer.spec.full_name}"
+          raise InstallHookError, message
         end
       end
-
     end
   end
 end