bundler 1.2.0.pre.1 → 1.2.0.rc

data/lib/bundler/vendor/thor/shell/color.rb

@@ -50,10 +50,46 @@ class Thor
       # on Highline implementation and it automatically appends CLEAR to the end
       # of the returned String.
       #
-      def set_color(string, color, bold=false)
-        color = self.class.const_get(color.to_s.upcase) if color.is_a?(Symbol)
-        bold  = bold ? BOLD : ""
-        "#{bold}#{color}#{string}#{CLEAR}"
+      # Pass foreground, background and bold options to this method as
+      # symbols.
+      #
+      # Example:
+      #
+      #   set_color "Hi!", :red, :on_white, :bold
+      #
+      # The available colors are:
+      #
+      #   :bold
+      #   :black
+      #   :red
+      #   :green
+      #   :yellow
+      #   :blue
+      #   :magenta
+      #   :cyan
+      #   :white
+      #   :on_black
+      #   :on_red
+      #   :on_green
+      #   :on_yellow
+      #   :on_blue
+      #   :on_magenta
+      #   :on_cyan
+      #   :on_white
+      def set_color(string, *colors)
+        if colors.all? { |color| color.is_a?(Symbol) || color.is_a?(String) }
+          ansi_colors = colors.map { |color| lookup_color(color) }
+          "#{ansi_colors.join}#{string}#{CLEAR}"
+        else
+          # The old API was `set_color(color, bold=boolean)`. We
+          # continue to support the old API because you should never
+          # break old APIs unnecessarily :P
+          foreground, bold = colors
+          foreground = self.class.const_get(foreground.to_s.upcase) if foreground.is_a?(Symbol)
+
+          bold       = bold ? BOLD : ""
+          "#{bold}#{foreground}#{string}#{CLEAR}"
+        end
       end
 
       protected

data/lib/bundler/vendor/thor/shell/html.rb

@@ -7,56 +7,58 @@ class Thor
     #
     class HTML < Basic
       # The start of an HTML bold sequence.
-      BOLD       = "<strong>"
-      # The end of an HTML bold sequence.
-      END_BOLD   = "</strong>"
-
-      # Embed in a String to clear previous color selection.
-      CLEAR      = "</span>"
+      BOLD       = "font-weight: bold"
 
       # Set the terminal's foreground HTML color to black.
-      BLACK      = '<span style="color: black;">'
+      BLACK      = 'color: black'
       # Set the terminal's foreground HTML color to red.
-      RED        = '<span style="color: red;">'
+      RED        = 'color: red'
       # Set the terminal's foreground HTML color to green.
-      GREEN      = '<span style="color: green;">'
+      GREEN      = 'color: green'
       # Set the terminal's foreground HTML color to yellow.
-      YELLOW     = '<span style="color: yellow;">'
+      YELLOW     = 'color: yellow'
       # Set the terminal's foreground HTML color to blue.
-      BLUE       = '<span style="color: blue;">'
+      BLUE       = 'color: blue'
       # Set the terminal's foreground HTML color to magenta.
-      MAGENTA    = '<span style="color: magenta;">'
+      MAGENTA    = 'color: magenta'
       # Set the terminal's foreground HTML color to cyan.
-      CYAN       = '<span style="color: cyan;">'
+      CYAN       = 'color: cyan'
       # Set the terminal's foreground HTML color to white.
-      WHITE      = '<span style="color: white;">'
+      WHITE      = 'color: white'
 
       # Set the terminal's background HTML color to black.
-      ON_BLACK   = '<span style="background-color: black">'
+      ON_BLACK   = 'background-color: black'
       # Set the terminal's background HTML color to red.
-      ON_RED     = '<span style="background-color: red">'
+      ON_RED     = 'background-color: red'
       # Set the terminal's background HTML color to green.
-      ON_GREEN   = '<span style="background-color: green">'
+      ON_GREEN   = 'background-color: green'
       # Set the terminal's background HTML color to yellow.
-      ON_YELLOW  = '<span style="background-color: yellow">'
+      ON_YELLOW  = 'background-color: yellow'
       # Set the terminal's background HTML color to blue.
-      ON_BLUE    = '<span style="background-color: blue">'
+      ON_BLUE    = 'background-color: blue'
       # Set the terminal's background HTML color to magenta.
-      ON_MAGENTA = '<span style="background-color: magenta">'
+      ON_MAGENTA = 'background-color: magenta'
       # Set the terminal's background HTML color to cyan.
-      ON_CYAN    = '<span style="background-color: cyan">'
+      ON_CYAN    = 'background-color: cyan'
       # Set the terminal's background HTML color to white.
-      ON_WHITE   = '<span style="background-color: white">'
+      ON_WHITE   = 'background-color: white'
 
       # Set color by using a string or one of the defined constants. If a third
       # option is set to true, it also adds bold to the string. This is based
       # on Highline implementation and it automatically appends CLEAR to the end
       # of the returned String.
       #
-      def set_color(string, color, bold=false)
-        color = self.class.const_get(color.to_s.upcase) if color.is_a?(Symbol)
-        bold, end_bold = bold ? [BOLD, END_BOLD] : ['', '']
-        "#{bold}#{color}#{string}#{CLEAR}#{end_bold}"
+      def set_color(string, *colors)
+        if colors.all? { |color| color.is_a?(Symbol) || color.is_a?(String) }
+          html_colors = colors.map { |color| lookup_color(color) }
+          "<span style=\"#{html_colors.join("; ")};\">#{string}</span>"
+        else
+          color, bold = colors
+          html_color = self.class.const_get(color.to_s.upcase) if color.is_a?(Symbol)
+          styles = [html_color]
+          styles << BOLD if bold
+          "<span style=\"#{styles.join("; ")};\">#{string}</span>"
+        end
       end
 
       # Ask something to the user and receives a response.

data/lib/bundler/vendor/thor/task.rb

@@ -18,11 +18,21 @@ class Thor
     # By default, a task invokes a method in the thor class. You can change this
     # implementation to create custom tasks.
     def run(instance, args=[])
-      public_method?(instance) ?
-        instance.send(name, *args) : instance.class.handle_no_task_error(name)
+      arity = nil
+
+      if private_method?(instance)
+        instance.class.handle_no_task_error(name)
+      elsif public_method?(instance)
+        arity = instance.method(name).arity
+        instance.send(name, *args)
+      elsif local_method?(instance, :method_missing)
+        instance.send(:method_missing, name.to_sym, *args)
+      else
+        instance.class.handle_no_task_error(name)
+      end
     rescue ArgumentError => e
       handle_argument_error?(instance, e, caller) ?
-        instance.class.handle_argument_error(self, e) : (raise e)
+        instance.class.handle_argument_error(self, e, arity) : (raise e)
     rescue NoMethodError => e
       handle_no_method_error?(instance, e, caller) ?
         instance.class.handle_no_task_error(name) : (raise e)
@@ -34,8 +44,8 @@ class Thor
       if namespace
         namespace = klass.namespace
         formatted = "#{namespace.gsub(/^(default)/,'')}:"
-        formatted.sub!(/.$/, ' ') if subcommand
       end
+      formatted = "#{klass.namespace.split(':').last} " if subcommand
 
       formatted ||= ""
 
@@ -70,8 +80,17 @@ class Thor
       !(instance.public_methods & [name.to_s, name.to_sym]).empty?
     end
 
+    def private_method?(instance)
+      !(instance.private_methods & [name.to_s, name.to_sym]).empty?
+    end
+
+    def local_method?(instance, name)
+      methods = instance.public_methods(false) + instance.private_methods(false) + instance.protected_methods(false)
+      !(methods & [name.to_s, name.to_sym]).empty?
+    end
+
     def sans_backtrace(backtrace, caller) #:nodoc:
-      saned  = backtrace.reject { |frame| frame =~ FILE_REGEXP }
+      saned  = backtrace.reject { |frame| frame =~ FILE_REGEXP || (frame =~ /\.java:/ && RUBY_PLATFORM =~ /java/) }
       saned -= caller
     end
 

data/lib/bundler/vendor/thor/util.rb

@@ -153,11 +153,11 @@ class Thor
       begin
         Thor::Sandbox.class_eval(content, path)
       rescue Exception => e
-        $stderr.puts "WARNING: unable to load thorfile #{path.inspect}: #{e.message}"
+        $stderr.puts("WARNING: unable to load thorfile #{path.inspect}: #{e.message}")
         if debug
-          $stderr.puts *e.backtrace
+          $stderr.puts(*e.backtrace)
         else
-          $stderr.puts e.backtrace.first
+          $stderr.puts(e.backtrace.first)
         end
       end
     end
@@ -184,7 +184,7 @@ class Thor
       end
     end
 
-    # Returns the root where thor files are located, dependending on the OS.
+    # Returns the root where thor files are located, depending on the OS.
     #
     def self.thor_root
       File.join(user_home, ".thor").gsub(/\\/, '/')
@@ -198,7 +198,7 @@ class Thor
     # If we don't #gsub the \ character, Dir.glob will fail.
     #
     def self.thor_root_glob
-      files = Dir["#{thor_root}/*"]
+      files = Dir["#{escape_globs(thor_root)}/*"]
 
       files.map! do |file|
         File.directory?(file) ? File.join(file, "main.thor") : file
@@ -208,6 +208,7 @@ class Thor
     # Where to look for Thor files.
     #
     def self.globs_for(path)
+      path = escape_globs(path)
       ["#{path}/Thorfile", "#{path}/*.thor", "#{path}/tasks/*.thor", "#{path}/lib/tasks/*.thor"]
     end
 
@@ -216,14 +217,50 @@ class Thor
     #
     def self.ruby_command
       @ruby_command ||= begin
-        ruby = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'])
+        ruby_name = RbConfig::CONFIG['ruby_install_name']
+        ruby = File.join(RbConfig::CONFIG['bindir'], ruby_name)
         ruby << RbConfig::CONFIG['EXEEXT']
 
+        # avoid using different name than ruby (on platforms supporting links)
+        if ruby_name != 'ruby' && File.respond_to?(:readlink)
+          begin
+            alternate_ruby = File.join(RbConfig::CONFIG['bindir'], 'ruby')
+            alternate_ruby << RbConfig::CONFIG['EXEEXT']
+
+            # ruby is a symlink
+            if File.symlink? alternate_ruby
+              linked_ruby = File.readlink alternate_ruby
+
+              # symlink points to 'ruby_install_name'
+              ruby = alternate_ruby if linked_ruby == ruby_name || linked_ruby == ruby
+            end
+          rescue NotImplementedError
+            # just ignore on windows
+          end
+        end
+
         # escape string in case path to ruby executable contain spaces.
         ruby.sub!(/.*\s.*/m, '"\&"')
         ruby
       end
     end
 
+    # Returns a string that has had any glob characters escaped.
+    # The glob characters are `* ? { } [ ]`.
+    #
+    # ==== Examples
+    #
+    #   Thor::Util.escape_globs('[apps]')   # => '\[apps\]'
+    #
+    # ==== Parameters
+    # String
+    #
+    # ==== Returns
+    # String
+    #
+    def self.escape_globs(path)
+      path.to_s.gsub(/[*?{}\[\]]/, '\\\\\\&')
+    end
+
   end
 end

data/lib/bundler/vendor/thor/version.rb

@@ -1,3 +1,3 @@
 class Thor
-  VERSION = "0.14.6".freeze
+  VERSION = "0.15.2"
 end

data/lib/bundler/version.rb

@@ -2,5 +2,5 @@ module Bundler
   # We're doing this because we might write tests that deal
   # with other versions of bundler and we are unsure how to
   # handle this better.
-  VERSION = "1.2.0.pre.1" unless defined?(::Bundler::VERSION)
+  VERSION = "1.2.0.rc" unless defined?(::Bundler::VERSION)
 end

data/man/bundle-config.ronn

@@ -122,8 +122,8 @@ invalid references. Particularly, we force a developer to specify
 a branch in the `Gemfile` in order to use this feature. If the branch
 specified in the `Gemfile` and the current branch in the local git
 repository do not match, Bundler will abort. This ensures that
-a developer is always working against the correct branches, avoiding
-a reference to be accidentally updated.
+a developer is always working against the correct branches, and prevents
+accidental locking to a different branch.
 
 Finally, Bundler also ensures that the current revision in the
 `Gemfile.lock` exists in the local git repository. By doing this, Bundler

data/spec/bundler/definition_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+require 'bundler/definition'
+
+describe Bundler::Definition do
+  before do
+    Bundler.stub(:settings){ Bundler::Settings.new(".") }
+  end
+
+  describe "#lock" do
+    context "when it's not possible to write to the file" do
+      subject{ Bundler::Definition.new(nil, [], [], []) }
+
+      before do
+        File.should_receive(:open).with("Gemfile.lock", "wb").
+          and_raise(Errno::EACCES)
+      end
+
+      it "raises an InstallError with explanation" do
+        expect{ subject.lock("Gemfile.lock") }.
+          to raise_error(Bundler::InstallError)
+      end
+    end
+  end
+
+end

data/spec/cache/git_spec.rb

@@ -23,6 +23,25 @@ end
       G
 
       bundle "#{cmd} --all"
+      bundled_app("vendor/cache/foo-1.0-#{ref}").should exist
+      bundled_app("vendor/cache/foo-1.0-#{ref}/.git").should_not exist
+      bundled_app("vendor/cache/foo-1.0-#{ref}/.bundlecache").should be_file
+
+      FileUtils.rm_rf lib_path("foo-1.0")
+      should_be_installed "foo 1.0"
+    end
+
+    it "copies repository to vendor cache and uses it even when installed with bundle --path" do
+      git = build_git "foo"
+      ref = git.ref_for("master", 11)
+
+      install_gemfile <<-G
+        gem "foo", :git => '#{lib_path("foo-1.0")}'
+      G
+
+      bundle "install --path vendor/bundle"
+      bundle "#{cmd} --all"
+
       bundled_app("vendor/cache/foo-1.0-#{ref}").should exist
       bundled_app("vendor/cache/foo-1.0-#{ref}/.git").should_not exist
 
@@ -66,6 +85,7 @@ end
       bundle "#{cmd} --all"
 
       bundled_app("vendor/cache/foo-1.0-#{ref}").should exist
+      bundled_app("vendor/cache/foo-1.0-#{old_ref}").should_not exist
 
       FileUtils.rm_rf lib_path("foo-1.0")
       run "require 'foo'"
@@ -120,5 +140,32 @@ end
       bundled_app("vendor/cache/has_submodule-1.0-#{ref}/submodule-1.0").should exist
       should_be_installed "has_submodule 1.0"
     end
+
+    it "displays warning message when detecting git repo in Gemfile" do
+      git = build_git "foo"
+      ref = git.ref_for("master", 11)
+
+      install_gemfile <<-G
+        gem "foo", :git => '#{lib_path("foo-1.0")}'
+      G
+
+      bundle "#{cmd}"
+
+      out.should include("Your Gemfile contains path and git dependencies.")
+    end
+
+    it "does not display warning message if cache_all is set in bundle config" do
+      git = build_git "foo"
+      ref = git.ref_for("master", 11)
+
+      install_gemfile <<-G
+        gem "foo", :git => '#{lib_path("foo-1.0")}'
+      G
+
+      bundle "#{cmd} --all"
+      bundle "#{cmd}"
+
+      out.should_not include("Your Gemfile contains path and git dependencies.")
+    end
   end
 end

data/spec/cache/path_spec.rb

@@ -23,6 +23,7 @@ require "spec_helper"
 
       bundle "#{cmd} --all"
       bundled_app("vendor/cache/foo-1.0").should exist
+      bundled_app("vendor/cache/foo-1.0/.bundlecache").should be_file
 
       FileUtils.rm_rf lib_path("foo-1.0")
       should_be_installed "foo 1.0"
@@ -50,6 +51,23 @@ require "spec_helper"
       out.should == "CACHE"
     end
 
+    it "removes stale entries cache" do
+      build_lib "foo"
+
+      install_gemfile <<-G
+        gem "foo", :path => '#{lib_path("foo-1.0")}'
+      G
+
+      bundle "#{cmd} --all"
+
+      install_gemfile <<-G
+        gem "bar", :path => '#{lib_path("bar-1.0")}'
+      G
+
+      bundle "#{cmd} --all"
+      bundled_app("vendor/cache/bar-1.0").should_not exist
+    end
+
     it "raises a warning without --all" do
       build_lib "foo"
 

data/spec/install/git_spec.rb

@@ -156,7 +156,7 @@ describe "bundle install with git sources" do
     end
   end
 
-  describe "when specifying local" do
+  describe "when specifying local override" do
     it "uses the local repository instead of checking a new one out" do
       # We don't generate it because we actually don't need it
       # build_git "rack", "0.8"
@@ -241,7 +241,7 @@ describe "bundle install with git sources" do
       lockfile1.should_not == lockfile0
     end
 
-    it "explodes if given path does not exist" do
+    it "explodes if given path does not exist on install" do
       build_git "rack", "0.8"
 
       install_gemfile <<-G
@@ -254,7 +254,7 @@ describe "bundle install with git sources" do
       out.should =~ /Cannot use local override for rack-0.8 because #{Regexp.escape(lib_path('local-rack').to_s)} does not exist/
     end
 
-    it "explodes if branch is not given" do
+    it "explodes if branch is not given on install" do
       build_git "rack", "0.8"
       FileUtils.cp_r("#{lib_path('rack-0.8')}/.", lib_path('local-rack'))
 
@@ -265,10 +265,25 @@ describe "bundle install with git sources" do
 
       bundle %|config local.rack #{lib_path('local-rack')}|
       bundle :install
-      out.should =~ /because :branch is not specified in Gemfile/
+      out.should =~ /cannot use local override/i
     end
 
-    it "explodes on different branches" do
+    it "does not explode if disable_local_branch_check is given" do
+      build_git "rack", "0.8"
+      FileUtils.cp_r("#{lib_path('rack-0.8')}/.", lib_path('local-rack'))
+
+      install_gemfile <<-G
+        source "file://#{gem_repo1}"
+        gem "rack", :git => "#{lib_path('rack-0.8')}"
+      G
+
+      bundle %|config local.rack #{lib_path('local-rack')}|
+      bundle %|config disable_local_branch_check true|
+      bundle :install
+      out.should =~ /Your bundle is complete!/
+    end
+
+    it "explodes on different branches on install" do
       build_git "rack", "0.8"
 
       FileUtils.cp_r("#{lib_path('rack-0.8')}/.", lib_path('local-rack'))
@@ -287,7 +302,7 @@ describe "bundle install with git sources" do
       out.should =~ /is using branch another but Gemfile specifies master/
     end
 
-    it "explodes on invalid revision" do
+    it "explodes on invalid revision on install" do
       build_git "rack", "0.8"
 
       build_git "rack", "0.8", :path => lib_path('local-rack') do |s|