bundler 1.5.3 → 1.6.0.pre.1

data/lib/bundler/rubygems_ext.rb

@@ -56,10 +56,8 @@ module Gem
     end
 
     def git_version
-      if loaded_from && File.exist?(File.join(full_gem_path, ".git"))
-        sha = Bundler::SharedHelpers.chdir(full_gem_path){ `git rev-parse HEAD`.strip }
-        " #{sha[0..6]}"
-      end
+      return unless loaded_from && source.is_a?(Bundler::Source::Git)
+      " #{source.revision[0..6]}"
     end
 
     def to_gemfile(path = nil)

data/lib/bundler/rubygems_integration.rb

@@ -290,6 +290,11 @@ module Bundler
 
         if exec_name
           spec = specs.find { |s| s.executables.include?(exec_name) }
+          unless spec.name == name
+            warn "Bundler is using a binstub that was created for a different gem.\n" \
+              "This is deprecated, in future versions you may need to `bundle binstub #{name}` " \
+              "to work around a system/bundle conflict."
+          end
           spec or raise Gem::Exception, "can't find executable #{exec_name}"
         else
           spec = specs.find  { |s| s.name == name }

data/lib/bundler/runtime.rb

@@ -104,13 +104,14 @@ module Bundler
 
     alias gems specs
 
-    def cache
+    def cache(custom_path = nil)
+      cache_path = cache_path(custom_path)
       FileUtils.mkdir_p(cache_path) unless File.exists?(cache_path)
 
       Bundler.ui.info "Updating files in vendor/cache"
       specs.each do |spec|
         next if spec.name == 'bundler'
-        spec.source.cache(spec) if spec.source.respond_to?(:cache)
+        spec.source.cache(spec, custom_path) if spec.source.respond_to?(:cache)
       end
 
       Dir[cache_path.join("*/.git")].each do |git_dir|
@@ -118,14 +119,15 @@ module Bundler
         FileUtils.touch(File.expand_path("../.bundlecache", git_dir))
       end
 
-      prune_cache unless Bundler.settings[:no_prune]
+      prune_cache(custom_path) unless Bundler.settings[:no_prune]
     end
 
-    def prune_cache
+    def prune_cache(custom_path)
+      cache_path = cache_path(custom_path)
       FileUtils.mkdir_p(cache_path) unless File.exists?(cache_path)
       resolve = @definition.resolve
-      prune_gem_cache(resolve)
-      prune_git_and_path_cache(resolve)
+      prune_gem_cache(resolve, custom_path)
+      prune_git_and_path_cache(resolve, custom_path)
     end
 
     def clean(dry_run = false)
@@ -239,8 +241,8 @@ module Bundler
 
   private
 
-    def prune_gem_cache(resolve)
-      cached  = Dir["#{cache_path}/*.gem"]
+    def prune_gem_cache(resolve, custom_path)
+      cached  = Dir["#{cache_path(custom_path)}/*.gem"]
 
       cached = cached.delete_if do |path|
         spec = Bundler.rubygems.spec_from_gem path
@@ -260,8 +262,8 @@ module Bundler
       end
     end
 
-    def prune_git_and_path_cache(resolve)
-      cached  = Dir["#{cache_path}/*/.bundlecache"]
+    def prune_git_and_path_cache(resolve, custom_path)
+      cached  = Dir["#{cache_path(custom_path)}/*/.bundlecache"]
 
       cached = cached.delete_if do |path|
         name = File.basename(File.dirname(path))
@@ -300,8 +302,9 @@ module Bundler
       end
     end
 
-    def cache_path
-      root.join("vendor/cache")
+    def cache_path(custom_path = nil)
+      path = custom_path || root
+      path.join("vendor/cache")
     end
   end
 end

data/lib/bundler/settings.rb

@@ -13,7 +13,7 @@ module Bundler
     end
 
     def []=(key, value)
-      local_config_file || raise(GemfileNotFound)
+      local_config_file or raise GemfileNotFound, "Could not locate Gemfile"
       set_key(key, value, @local_config, local_config_file)
     end
 
@@ -154,7 +154,9 @@ module Bundler
     def load_config(config_file)
       valid_file = config_file && config_file.exist? && !config_file.size.zero?
       if !ignore_config? && valid_file
-        Hash[config_file.read.scan(/^(BUNDLE_.+): ['"]?(.+?)['"]?$/)]
+        config_regex = /^(BUNDLE_.+): (?:['"](.*)['"]|(.+))$/
+        config_pairs = config_file.read.scan(config_regex).map{|m| m.compact }
+        Hash[config_pairs]
       else
         {}
       end

data/lib/bundler/source.rb

@@ -1,5 +1,5 @@
 module Bundler
-  module Source
+  class Source
     autoload :Rubygems, 'bundler/source/rubygems'
     autoload :Path,     'bundler/source/path'
     autoload :Git,      'bundler/source/git'
@@ -14,5 +14,15 @@ module Bundler
       mirrors[normalized_key] || uri
     end
 
+    def version_message(spec)
+      locked_spec = Bundler.locked_gems.specs.find { |s| s.name == spec.name } if Bundler.locked_gems
+      locked_spec_version = locked_spec.version if locked_spec
+      message = "#{spec.name} #{spec.version}"
+      if locked_spec_version && spec.version != locked_spec_version
+        message << " (was #{locked_spec_version})"
+      end
+      message
+    end
+
   end
 end

data/lib/bundler/source/git.rb

@@ -3,7 +3,7 @@ require 'uri'
 require 'digest/sha1'
 
 module Bundler
-  module Source
+  class Source
 
     class Git < Path
       autoload :GitProxy, 'bundler/source/git/git_proxy'
@@ -159,10 +159,14 @@ module Bundler
           @copied = true
         end
         generate_bin(spec)
-        ["Using #{spec.name} (#{spec.version}) from #{to_s}", nil, debug]
+        if requires_checkout? && spec.post_install_message
+          Installer.post_install_messages[spec.name] = spec.post_install_message
+        end
+        ["Using #{version_message(spec)} from #{to_s}", nil, debug]
       end
 
-      def cache(spec)
+      def cache(spec, custom_path = nil)
+        app_cache_path = app_cache_path(custom_path)
         return unless Bundler.settings[:cache_all]
         return if path == app_cache_path
         cached!
@@ -199,6 +203,10 @@ module Bundler
         "#{base_name}-#{shortref_for_path(cached_revision || revision)}"
       end
 
+      def revision
+        git_proxy.revision
+      end
+
     private
 
       def serialize_gemspecs_in(destination)
@@ -263,10 +271,6 @@ module Bundler
         options["revision"]
       end
 
-      def revision
-        git_proxy.revision
-      end
-
       def cached?
         cache_path.exist?
       end

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

@@ -1,6 +1,7 @@
 module Bundler
-  module Source
+  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. "
@@ -61,7 +62,7 @@ module Bundler
         def checkout
           if path.exist?
             return if has_revision_cached?
-            Bundler.ui.info "Updating #{uri}"
+            Bundler.ui.confirm "Updating #{uri}"
             in_path do
               git %|fetch --force --quiet --tags #{uri_escaped} "refs/heads/*:refs/heads/*"|
             end
@@ -100,11 +101,7 @@ module Bundler
         # If it doesn't, everything will work fine, but the user
         # will get the $stderr messages as well.
         def git_null(command)
-          if !Bundler::WINDOWS && File.exist?("/dev/null")
-            git("#{command} 2>/dev/null", false)
-          else
-            git(command, false)
-          end
+          git("#{command} 2>#{Bundler::NULL}", false)
         end
 
         def git(command, check_errors=true)

data/lib/bundler/source/path.rb

@@ -1,7 +1,7 @@
 module Bundler
-  module Source
+  class Source
 
-    class Path
+    class Path < Source
       autoload :Installer, 'bundler/source/path/installer'
 
       attr_reader   :path, :options
@@ -19,7 +19,7 @@ module Bundler
 
         if options["path"]
           @path = Pathname.new(options["path"])
-          @path = @path.expand_path(Bundler.root) unless @path.relative?
+          @path = expand(@path) unless @path.relative?
         end
 
         @name    = options["name"]
@@ -59,24 +59,25 @@ module Bundler
 
       def eql?(o)
         o.instance_of?(Path) &&
-        path.expand_path(Bundler.root) == o.path.expand_path(Bundler.root) &&
+        expand(path) == expand(o.path) &&
         version == o.version
       end
 
       alias == eql?
 
       def name
-        File.basename(path.expand_path(Bundler.root).to_s)
+        File.basename(expand(path).to_s)
       end
 
       def install(spec)
         generate_bin(spec, :disable_extensions)
-        ["Using #{spec.name} (#{spec.version}) from #{to_s}", nil]
+        ["Using #{version_message(spec)} from #{to_s}", nil]
       end
 
-      def cache(spec)
+      def cache(spec, custom_path = nil)
+        app_cache_path = app_cache_path(custom_path)
         return unless Bundler.settings[:cache_all]
-        return if @original_path.expand_path(Bundler.root).to_s.index(Bundler.root.to_s) == 0
+        return if expand(@original_path).to_s.index(Bundler.root.to_s) == 0
         FileUtils.rm_rf(app_cache_path)
         FileUtils.cp_r("#{@original_path}/.", app_cache_path)
         FileUtils.touch(app_cache_path.join(".bundlecache"))
@@ -97,10 +98,18 @@ module Bundler
         name
       end
 
-    private
+      private
 
-      def app_cache_path
-        @app_cache_path ||= Bundler.app_cache.join(app_cache_dirname)
+      def expand(somepath)
+        somepath.expand_path(Bundler.root)
+      rescue ArgumentError => e
+        Bundler.ui.debug(e)
+        raise PathError, "There was an error while trying to use the path " \
+          "`#{somepath}`.\nThe error message was: #{e.message}."
+      end
+
+      def app_cache_path(custom_path = nil)
+        @app_cache_path ||= Bundler.app_cache(custom_path).join(app_cache_dirname)
       end
 
       def has_app_cache?
@@ -109,7 +118,7 @@ module Bundler
 
       def load_spec_files
         index = Index.new
-        expanded_path = path.expand_path(Bundler.root)
+        expanded_path = expand(path)
 
         if File.directory?(expanded_path)
           Dir["#{expanded_path}/#{@glob}"].each do |file|

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

@@ -1,5 +1,5 @@
 module Bundler
-  module Source
+  class Source
     class Path
 
       class Installer < Bundler::GemInstaller

data/lib/bundler/source/rubygems.rb

@@ -3,8 +3,9 @@ require 'rubygems/user_interaction'
 require 'rubygems/spec_fetcher'
 
 module Bundler
-  module Source
-    class Rubygems
+  class Source
+    # TODO: Refactor this class
+    class Rubygems < Source
       API_REQUEST_LIMIT = 100 # threshold for switching back to the modern index instead of fetching every spec
 
       attr_reader :remotes, :caches
@@ -67,8 +68,8 @@ module Bundler
       end
 
       def install(spec)
-        if installed_specs[spec].any?
-          return ["Using #{spec.name} (#{spec.version})", nil]
+        if installed_specs[spec].any? && gem_dir_exists?(spec)
+          return ["Using #{version_message(spec)}", nil]
         end
 
         # Download the gem to get the spec, because some specs that are returned
@@ -79,7 +80,6 @@ module Bundler
           spec.__swap__(s)
         end
 
-        install_message = "Installing #{spec.name} (#{spec.version})"
         path = cached_gem(spec)
         if Bundler.requires_sudo?
           install_path = Bundler.tmp
@@ -113,15 +113,15 @@ module Bundler
         end
         installed_spec.loaded_from = "#{Bundler.rubygems.gem_dir}/specifications/#{spec.full_name}.gemspec"
         spec.loaded_from = "#{Bundler.rubygems.gem_dir}/specifications/#{spec.full_name}.gemspec"
-        [install_message, spec.post_install_message]
+        ["Installing #{version_message(spec)}", spec.post_install_message]
       end
 
-      def cache(spec)
+      def cache(spec, custom_path = nil)
         cached_path = cached_gem(spec)
         raise GemNotFound, "Missing gem file '#{spec.full_name}.gem'." unless cached_path
         return if File.dirname(cached_path) == Bundler.app_cache.to_s
         Bundler.ui.info "  * #{File.basename(cached_path)}"
-        FileUtils.cp(cached_path, Bundler.app_cache)
+        FileUtils.cp(cached_path, Bundler.app_cache(custom_path))
       end
 
       def add_remote(source)
@@ -276,6 +276,16 @@ module Bundler
         end
       end
 
+      def gem_dir_exists?(spec)
+        return true if spec.name == "bundler"
+        # Ruby 2 default gems
+        return true if spec.loaded_from.include?("specifications/default/")
+        # Ruby 1.9 default gems
+        return true if spec.summary =~ /is bundled with Ruby/
+
+        File.directory?(spec.full_gem_path)
+      end
     end
+
   end
 end

data/lib/bundler/ssl_certs/certificate_manager.rb

@@ -0,0 +1,41 @@
+require 'fileutils'
+
+module Bundler
+  module SSLCerts
+    class CertificateManager
+      attr_reader :bundler_cert_path, :bundler_certs, :rubygems_certs
+
+      def self.update_from!(rubygems_path)
+        new(rubygems_path).update!
+      end
+
+      def initialize(rubygems_path)
+        rubygems_certs = File.join(rubygems_path, 'lib/rubygems/ssl_certs')
+        @rubygems_certs = certificates_in(rubygems_certs)
+
+        @bundler_cert_path = File.expand_path("..", __FILE__)
+        @bundler_certs = certificates_in(bundler_cert_path)
+      end
+
+      def up_to_date?
+        bundler_certs.zip(rubygems_certs).all? do |bc, rc|
+          File.basename(bc) == File.basename(rc) && FileUtils.compare_file(bc, rc)
+        end
+      end
+
+      def update!
+        return if up_to_date?
+
+        FileUtils.rm bundler_certs
+        FileUtils.cp rubygems_certs, bundler_cert_path
+      end
+
+    private
+
+      def certificates_in(path)
+        Dir[File.join(path, "*.pem")].sort
+      end
+
+    end
+  end
+end

data/lib/bundler/templates/newgem/README.md.tt

@@ -22,7 +22,7 @@ TODO: Write usage instructions here
 
 ## Contributing
 
-1. Fork it ( http://github.com/<my-github-username>/<%=config[:name]%>/fork )
+1. Fork it ( http://github.com/[my-github-username]/<%=config[:name]%>/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/lib/bundler/templates/newgem/spec/newgem_spec.rb.tt

@@ -2,10 +2,10 @@ require 'spec_helper'
 
 describe <%= config[:constant_name] %> do
   it 'should have a version number' do
-    <%= config[:constant_name] %>::VERSION.should_not be_nil
+    expect(<%= config[:constant_name] %>::VERSION).not_to be nil
   end
 
   it 'should do something useful' do
-    false.should eq(true)
+    expect(false).to be true
   end
 end

data/lib/bundler/ui.rb

@@ -1,144 +1,7 @@
-require 'rubygems/user_interaction'
-
 module Bundler
-  class UI
-    def warn(message, newline = nil)
-    end
-
-    def debug(message, newline = nil)
-    end
-
-    def trace(message, newline = nil)
-    end
-
-    def error(message, newline = nil)
-    end
-
-    def info(message, newline = nil)
-    end
-
-    def confirm(message, newline = nil)
-    end
-
-    def quiet?
-      false
-    end
-
-    def debug?
-      false
-    end
-
-    def ask(message)
-    end
-
-    class Shell < UI
-      LEVELS = %w(silent error warn confirm info debug)
-
-      attr_writer :shell
-
-      def initialize(options = {})
-        if options["no-color"] || !STDOUT.tty?
-          Thor::Base.shell = Thor::Shell::Basic
-        end
-        @shell = Thor::Base.shell.new
-        @level = ENV['DEBUG'] ? "debug" : "info"
-      end
-
-      def info(msg, newline = nil)
-        tell_me(msg, nil, newline) if level("info")
-      end
-
-      def confirm(msg, newline = nil)
-        tell_me(msg, :green, newline) if level("confirm")
-      end
-
-      def warn(msg, newline = nil)
-        tell_me(msg, :yellow, newline) if level("warn")
-      end
-
-      def error(msg, newline = nil)
-        tell_me(msg, :red, newline) if level("error")
-      end
-
-      def debug(msg, newline = nil)
-        tell_me(msg, nil, newline) if level("debug")
-      end
-
-      def debug?
-        # needs to be false instead of nil to be newline param to other methods
-        level("debug")
-      end
-
-      def quiet?
-        LEVELS.index(@level) <= LEVELS.index("warn")
-      end
-
-      def ask(msg)
-        @shell.ask(msg)
-      end
-
-      def level=(level)
-        raise ArgumentError unless LEVELS.include?(level.to_s)
-        @level = level
-      end
-
-      def level(name = nil)
-        name ? LEVELS.index(name) <= LEVELS.index(@level) : @level
-      end
-
-      def trace(e, newline = nil)
-        msg = ["#{e.class}: #{e.message}", *e.backtrace].join("\n")
-        if debug?
-          tell_me(msg, nil, newline)
-        elsif @trace
-          STDERR.puts "#{msg}#{newline}"
-        end
-      end
-
-      def silence
-        old_level, @level = @level, "silent"
-        yield
-      ensure
-        @level = old_level
-      end
-
-    private
-
-      # valimism
-      def tell_me(msg, color = nil, newline = nil)
-        msg = word_wrap(msg) if newline.is_a?(Hash) && newline[:wrap]
-        if newline.nil?
-          @shell.say(msg, color)
-        else
-          @shell.say(msg, color, newline)
-        end
-      end
-
-      def strip_leading_spaces(text)
-        spaces = text[/\A\s+/, 0]
-        spaces ? text.gsub(/#{spaces}/, '') : text
-      end
-
-      def word_wrap(text, line_width = @shell.terminal_width)
-        strip_leading_spaces(text).split("\n").collect do |line|
-          line.length > line_width ? line.gsub(/(.{1,#{line_width}})(\s+|$)/, "\\1\n").strip : line
-        end * "\n"
-      end
-    end
-
-    class RGProxy < ::Gem::SilentUI
-      def initialize(ui)
-        @ui = ui
-        super()
-      end
-
-      def say(message)
-        if message =~ /native extensions/
-          @ui.info "with native extensions "
-        else
-          @ui.debug(message)
-        end
-      end
-    end
+  module UI
+    autoload :RGProxy, 'bundler/ui/rg_proxy'
+    autoload :Shell,   'bundler/ui/shell'
+    autoload :Silent,  'bundler/ui/silent'
   end
 end