bundler 1.2.0.pre.1 → 1.2.0.rc

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

@@ -1,6 +1,6 @@
 class Thor
   # Thor::Error is raised when it's caused by wrong usage of thor classes. Those
-  # errors have their backtrace supressed and are nicely shown to the user.
+  # errors have their backtrace suppressed and are nicely shown to the user.
   #
   # Errors that are caused by the developer, like declaring a method which
   # overwrites a thor keyword, it SHOULD NOT raise a Thor::Error. This way, we
@@ -27,4 +27,9 @@ class Thor
 
   class MalformattedArgumentError < InvocationError
   end
+
+  # Raised when a user tries to call a private method encoded in templated filename.
+  #
+  class PrivateMethodEncodedError < Error
+  end
 end

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

@@ -104,7 +104,7 @@ class Thor::Group
     #
     # ==== Custom invocations
     #
-    # You can also supply a block to customize how the option is giong to be
+    # You can also supply a block to customize how the option is going to be
     # invoked. The block receives two parameters, an instance of the current
     # class and the klass to be invoked.
     #
@@ -180,16 +180,16 @@ class Thor::Group
         end
         next unless value
 
-        klass, task = prepare_for_invocation(name, value)
+        klass, _ = prepare_for_invocation(name, value)
         next unless klass && klass.respond_to?(:class_options)
 
         value = value.to_s
         human_name = value.respond_to?(:classify) ? value.classify : value
 
         group_options[human_name] ||= []
-        group_options[human_name] += klass.class_options.values.select do |option|
-          base_options[option.name.to_sym].nil? && option.group.nil? &&
-          !group_options.values.flatten.any? { |i| i.name == option.name }
+        group_options[human_name] += klass.class_options.values.select do |class_option|
+          base_options[class_option.name.to_sym].nil? && class_option.group.nil? &&
+          !group_options.values.flatten.any? { |i| i.name == class_option.name }
         end
 
         yield klass if block_given?
@@ -204,8 +204,16 @@ class Thor::Group
       [item]
     end
 
-    def handle_argument_error(task, error) #:nodoc:
-      raise error, "#{task.name.inspect} was called incorrectly. Are you sure it has arity equals to 0?"
+    def handle_argument_error(task, error, arity=nil) #:nodoc:
+      if arity > 0
+        msg = "#{basename} #{task.name} takes #{arity} argument"
+        msg << "s" if arity > 1
+        msg << ", but it should not."
+      else
+        msg = "You should not pass arguments to #{basename} #{task.name}."
+      end
+
+      raise error, msg
     end
 
     protected
@@ -220,10 +228,14 @@ class Thor::Group
         args, opts = Thor::Options.split(given_args)
         opts = given_opts || opts
 
+        instance = new(args, opts, config)
+        yield instance if block_given?
+        args = instance.args
+
         if task
-          new(args, opts, config).invoke_task(all_tasks[task])
+          instance.invoke_task(all_tasks[task])
         else
-          new(args, opts, config).invoke_all
+          instance.invoke_all
         end
       end
 

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

@@ -85,7 +85,7 @@ class Thor
     # that it's going to use.
     #
     # If you want Rspec::RR to be initialized with its own set of options, you
-    # have to do that explicitely:
+    # have to do that explicitly:
     #
     #   invoke "rspec:rr", [], :style => :foo
     #
@@ -106,7 +106,9 @@ class Thor
       raise "Expected Thor class, got #{klass}" unless klass <= Thor::Base
 
       args, opts, config = _parse_initialization_options(args, opts, config)
-      klass.send(:dispatch, task, args, opts, config)
+      klass.send(:dispatch, task, args, opts, config) do |instance|
+        instance.parent_options = options
+      end
     end
 
     # Invoke the given task if the given args.

data/lib/bundler/vendor/thor/parser/arguments.rb

@@ -49,6 +49,10 @@ class Thor
       @assigns
     end
 
+    def remaining
+      @pile
+    end
+
     private
 
       def no_or_skip?(arg)

data/lib/bundler/vendor/thor/parser/option.rb

@@ -1,14 +1,15 @@
 class Thor
   class Option < Argument #:nodoc:
-    attr_reader :aliases, :group, :lazy_default
+    attr_reader :aliases, :group, :lazy_default, :hide
 
     VALID_TYPES = [:boolean, :numeric, :hash, :array, :string]
 
-    def initialize(name, description=nil, required=nil, type=nil, default=nil, banner=nil, lazy_default=nil, group=nil, aliases=nil)
+    def initialize(name, description=nil, required=nil, type=nil, default=nil, banner=nil, lazy_default=nil, group=nil, aliases=nil, hide=nil)
       super(name, description, required, type, default, banner)
       @lazy_default = lazy_default
       @group        = group.to_s.capitalize if group
       @aliases      = [*aliases].compact
+      @hide         = hide
     end
 
     # This parse quick options given as method_options. It makes several

data/lib/bundler/vendor/thor/parser/options.rb

@@ -35,7 +35,7 @@ class Thor
         @non_assigned_required.delete(hash_options[key])
       end
 
-      @shorts, @switches, @unknown = {}, {}, []
+      @shorts, @switches, @extra = {}, {}, []
 
       options.each do |option|
         @switches[option.switch_name] = option
@@ -46,14 +46,19 @@ class Thor
       end
     end
 
+    def remaining
+      @extra
+    end
+
     def parse(args)
       @pile = args.dup
 
       while peek
         match, is_switch = current_is_switch?
+        shifted = shift
 
         if is_switch
-          case shift
+          case shifted
             when SHORT_SQ_RE
               unshift($1.split('').map { |f| "-#{f}" })
               next
@@ -68,9 +73,10 @@ class Thor
           option = switch_option(switch)
           @assigns[option.human_name] = parse_peek(switch, option)
         elsif match
-          @unknown << shift
+          @extra << shifted
+          @extra << shift while peek && peek !~ /^-/
         else
-          shift
+          @extra << shifted
         end
       end
 
@@ -82,9 +88,9 @@ class Thor
     end
 
     def check_unknown!
-      unless ARGV.include?("exec") || ARGV.include?("config")
-        raise UnknownArgumentError, "Unknown switches '#{@unknown.join(', ')}'" unless @unknown.empty?
-      end
+      # an unknown option starts with - or -- and has no more --'s afterward.
+      unknown = @extra.select { |str| str =~ /^--?(?:(?!--).)*$/ }
+      raise UnknownArgumentError, "Unknown switches '#{unknown.join(', ')}'" unless unknown.empty?
     end
 
     protected

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

@@ -1,4 +1,5 @@
 require 'rake'
+require 'rake/dsl_definition'
 
 class Thor
   # Adds a compatibility layer to your Thor classes which allows you to use
@@ -16,6 +17,8 @@ class Thor
   #   end
   #
   module RakeCompat
+    include Rake::DSL if defined?(Rake::DSL)
+
     def self.rake_classes
       @rake_classes ||= []
     end
@@ -29,12 +32,12 @@ class Thor
   end
 end
 
-class Object #:nodoc:
-  alias :rake_task :task
-  alias :rake_namespace :namespace
+# override task on (main), for compatibility with Rake 0.9
+self.instance_eval do
+  alias rake_namespace namespace
 
-  def task(*args, &block)
-    task = rake_task(*args, &block)
+  def task(*)
+    task = super
 
     if klass = Thor::RakeCompat.rake_classes.last
       non_namespaced_name = task.name.split(':').last
@@ -43,7 +46,8 @@ class Object #:nodoc:
       description << task.arg_names.map{ |n| n.to_s.upcase }.join(' ')
       description.strip!
 
-      klass.desc description, task.comment || non_namespaced_name
+      klass.desc description, Rake.application.last_description || non_namespaced_name
+      Rake.application.last_description = nil
       klass.send :define_method, non_namespaced_name do |*args|
         Rake::Task[task.name.to_sym].invoke(*args)
       end
@@ -52,7 +56,7 @@ class Object #:nodoc:
     task
   end
 
-  def namespace(name, &block)
+  def namespace(name)
     if klass = Thor::RakeCompat.rake_classes.last
       const_name = Thor::Util.camel_case(name.to_s).to_sym
       klass.const_set(const_name, Class.new(Thor))
@@ -60,7 +64,8 @@ class Object #:nodoc:
       Thor::RakeCompat.rake_classes << new_klass
     end
 
-    rake_namespace(name, &block)
+    super
     Thor::RakeCompat.rake_classes.pop
   end
 end
+

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

@@ -17,6 +17,7 @@ class Thor::Runner < Thor #:nodoc:
     if meth && !self.respond_to?(meth)
       initialize_thorfiles(meth)
       klass, task = Thor::Util.find_class_and_task_by_namespace(meth)
+      self.class.handle_no_task_error(task, false) if klass.nil?
       klass.start(["-h", task].compact, :shell => self.shell)
     else
       super
@@ -30,6 +31,7 @@ class Thor::Runner < Thor #:nodoc:
     meth = meth.to_s
     initialize_thorfiles(meth)
     klass, task = Thor::Util.find_class_and_task_by_namespace(meth)
+    self.class.handle_no_task_error(task, false) if klass.nil?
     args.unshift(task) if task
     klass.start(args, :shell => self.shell)
   end
@@ -124,7 +126,17 @@ class Thor::Runner < Thor #:nodoc:
 
     old_filename = thor_yaml[name][:filename]
     self.options = self.options.merge("as" => name)
-    filename     = install(thor_yaml[name][:location])
+
+    if File.directory? File.expand_path(name)
+      FileUtils.rm_rf(File.join(thor_root, old_filename))
+
+      thor_yaml.delete(old_filename)
+      save_yaml(thor_yaml)
+
+      filename = install(name)
+    else
+      filename = install(thor_yaml[name][:location])
+    end
 
     unless filename == old_filename
       File.delete(File.join(thor_root, old_filename))
@@ -190,7 +202,7 @@ class Thor::Runner < Thor #:nodoc:
       true
     end
 
-    # Load the thorfiles. If relevant_to is supplied, looks for specific files
+    # Load the Thorfiles. If relevant_to is supplied, looks for specific files
     # in the thor_root instead of loading them all.
     #
     # By default, it also traverses the current path until find Thor files, as
@@ -244,7 +256,7 @@ class Thor::Runner < Thor #:nodoc:
       end
     end
 
-    # Load thorfiles relevant to the given method. If you provide "foo:bar" it
+    # Load Thorfiles relevant to the given method. If you provide "foo:bar" it
     # will load all thor files in the thor.yaml that has "foo" e "foo:bar"
     # namespaces registered.
     #

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

@@ -8,7 +8,7 @@ class Thor
     def self.shell
       @shell ||= if ENV['THOR_SHELL'] && ENV['THOR_SHELL'].size > 0
         Thor::Shell.const_get(ENV['THOR_SHELL'])
-      elsif RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
+      elsif ((RbConfig::CONFIG['host_os'] =~ /mswin|mingw/) && !(ENV['ANSICON']))
         Thor::Shell::Basic
       else
         Thor::Shell::Color
@@ -23,7 +23,7 @@ class Thor
   end
 
   module Shell
-    SHELL_DELEGATED_METHODS = [:ask, :yes?, :no?, :say, :say_status, :print_table]
+    SHELL_DELEGATED_METHODS = [:ask, :error, :set_color, :yes?, :no?, :say, :say_status, :print_in_columns, :print_table, :print_wrapped, :file_collision, :terminal_width]
 
     autoload :Basic, 'thor/shell/basic'
     autoload :Color, 'thor/shell/color'
@@ -62,8 +62,8 @@ class Thor
     # Common methods that are delegated to the shell.
     SHELL_DELEGATED_METHODS.each do |method|
       module_eval <<-METHOD, __FILE__, __LINE__
-        def #{method}(*args)
-          shell.#{method}(*args)
+        def #{method}(*args,&block)
+          shell.#{method}(*args,&block)
         end
       METHOD
     end

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

@@ -3,12 +3,13 @@ require 'tempfile'
 class Thor
   module Shell
     class Basic
-      attr_accessor :base, :padding
+      attr_accessor :base
+      attr_reader   :padding
 
-      # Initialize base and padding to nil.
+      # Initialize base, mute and padding to nil.
       #
       def initialize #:nodoc:
-        @base, @padding = nil, 0
+        @base, @mute, @padding = nil, false, 0
       end
 
       # Mute everything that's inside given block
@@ -32,14 +33,22 @@ class Thor
         @padding = [0, value].max
       end
 
-      # Ask something to the user and receives a response.
+      # Asks something to the user and receives a response.
+      #
+      # If asked to limit the correct responses, you can pass in an
+      # array of acceptable answers.  If one of those is not supplied,
+      # they will be shown a message stating that one of those answers
+      # must be given and re-asked the question.
       #
       # ==== Example
       # ask("What is your name?")
       #
-      def ask(statement, color=nil)
-        say("#{statement} ", color)
-        stdin.gets.strip
+      # ask("What is your favorite Neopolitan flavor?", :limited_to => ["strawberry", "chocolate", "vanilla"])
+      #
+      def ask(statement, *args)
+        options = args.last.is_a?(Hash) ? args.pop : {}
+
+        options[:limited_to] ? ask_filtered(statement, options[:limited_to], *args) : ask_simply(statement, *args)
       end
 
       # Say (print) something to the user. If the sentence ends with a whitespace
@@ -51,7 +60,8 @@ class Thor
       #
       def say(message="", color=nil, force_new_line=(message.to_s !~ /( |\t)$/))
         message = message.to_s
-        message = set_color(message, color) if color
+
+        message = set_color(message, *color) if color
 
         spaces = "  " * padding
 
@@ -94,37 +104,77 @@ class Thor
         !yes?(statement, color)
       end
 
+      # Prints values in columns
+      #
+      # ==== Parameters
+      # Array[String, String, ...]
+      #
+      def print_in_columns(array)
+        return if array.empty?
+        colwidth = (array.map{|el| el.to_s.size}.max || 0) + 2
+        array.each_with_index do |value, index|
+          # Don't output trailing spaces when printing the last column
+          if ((((index + 1) % (terminal_width / colwidth))).zero? && !index.zero?) || index + 1 == array.length
+            stdout.puts value
+          else
+            stdout.printf("%-#{colwidth}s", value)
+          end
+        end
+      end
+
       # Prints a table.
       #
       # ==== Parameters
       # Array[Array[String, String, ...]]
       #
       # ==== Options
-      # ident<Integer>:: Indent the first column by ident value.
+      # indent<Integer>:: Indent the first column by indent value.
       # colwidth<Integer>:: Force the first column to colwidth spaces wide.
       #
-      def print_table(table, options={})
-        return if table.empty?
+      def print_table(array, options={})
+        return if array.empty?
 
-        formats, ident, colwidth = [], options[:ident].to_i, options[:colwidth]
+        formats, indent, colwidth = [], options[:indent].to_i, options[:colwidth]
         options[:truncate] = terminal_width if options[:truncate] == true
 
         formats << "%-#{colwidth + 2}s" if colwidth
         start = colwidth ? 1 : 0
 
-        start.upto(table.first.length - 2) do |i|
-          maxima ||= table.max{|a,b| a[i].size <=> b[i].size }[i].size
-          formats << "%-#{maxima + 2}s"
+        colcount = array.max{|a,b| a.size <=> b.size }.size
+
+        maximas = []
+
+        start.upto(colcount - 1) do |index|
+          maxima = array.map {|row| row[index] ? row[index].to_s.size : 0 }.max
+          maximas << maxima
+          if index == colcount - 1
+            # Don't output 2 trailing spaces when printing the last column
+            formats << "%-s"
+          else
+            formats << "%-#{maxima + 2}s"
+          end
         end
 
-        formats[0] = formats[0].insert(0, " " * ident)
+        formats[0] = formats[0].insert(0, " " * indent)
         formats << "%s"
 
-        table.each do |row|
+        array.each do |row|
           sentence = ""
 
-          row.each_with_index do |column, i|
-            sentence << formats[i] % column.to_s
+          row.each_with_index do |column, index|
+            maxima = maximas[index]
+
+            if column.is_a?(Numeric)
+              if index == row.size - 1
+                # Don't output 2 trailing spaces when printing the last column
+                f = "%#{maxima}s"
+              else
+                f = "%#{maxima}s  "
+              end
+            else
+              f = formats[index]
+            end
+            sentence << f % column.to_s
           end
 
           sentence = truncate(sentence, options[:truncate]) if options[:truncate]
@@ -139,11 +189,11 @@ class Thor
       # String
       #
       # ==== Options
-      # ident<Integer>:: Indent each line of the printed paragraph by ident value.
+      # indent<Integer>:: Indent each line of the printed paragraph by indent value.
       #
       def print_wrapped(message, options={})
-        ident = options[:ident] || 0
-        width = terminal_width - ident
+        indent = options[:indent] || 0
+        width = terminal_width - indent
         paras = message.split("\n\n")
 
         paras.map! do |unwrapped|
@@ -154,14 +204,14 @@ class Thor
 
         paras.each do |para|
           para.split("\n").each do |line|
-            stdout.puts line.insert(0, " " * ident)
+            stdout.puts line.insert(0, " " * indent)
           end
           stdout.puts unless para == paras.last
         end
       end
 
       # Deals with file collision and returns true if the file should be
-      # overwriten and false otherwise. If a block is given, it uses the block
+      # overwritten and false otherwise. If a block is given, it uses the block
       # response as the content for the diff.
       #
       # ==== Parameters
@@ -194,6 +244,19 @@ class Thor
         end
       end
 
+      # This code was copied from Rake, available under MIT-LICENSE
+      # Copyright (c) 2003, 2004 Jim Weirich
+      def terminal_width
+        if ENV['THOR_COLUMNS']
+          result = ENV['THOR_COLUMNS'].to_i
+        else
+          result = unix? ? dynamic_width : 80
+        end
+        (result < 10) ? 80 : result
+      rescue
+        80
+      end
+
       # Called if something goes wrong during the execution. This is used by Thor
       # internally and should not be used inside your scripts. If something went
       # wrong, you can always raise an exception. If you raise a Thor::Error, it
@@ -206,35 +269,40 @@ class Thor
       # Apply color to the given string with optional bold. Disabled in the
       # Thor::Shell::Basic class.
       #
-      def set_color(string, color, bold=false) #:nodoc:
+      def set_color(string, *args) #:nodoc:
         string
       end
 
-      protected
+    protected
 
-        def stdout
-          $stdout
-        end
+      def lookup_color(color)
+        return color unless color.is_a?(Symbol)
+        self.class.const_get(color.to_s.upcase)
+      end
 
-        def stdin
-          $stdin
-        end
+      def stdout
+        $stdout
+      end
 
-        def stderr
-          $stderr
-        end
+      def stdin
+        $stdin
+      end
+
+      def stderr
+        $stderr
+      end
 
-        def is?(value) #:nodoc:
-          value = value.to_s
+      def is?(value) #:nodoc:
+        value = value.to_s
 
-          if value.size == 1
-            /\A#{value}\z/i
-          else
-            /\A(#{value}|#{value[0,1]})\z/i
-          end
+        if value.size == 1
+          /\A#{value}\z/i
+        else
+          /\A(#{value}|#{value[0,1]})\z/i
         end
+      end
 
-        def file_collision_help #:nodoc:
+      def file_collision_help #:nodoc:
 <<HELP
 Y - yes, overwrite
 n - no, do not overwrite
@@ -243,59 +311,78 @@ q - quit, abort
 d - diff, show the differences between the old and the new
 h - help, show this help
 HELP
-        end
+      end
 
-        def show_diff(destination, content) #:nodoc:
-          diff_cmd = ENV['THOR_DIFF'] || ENV['RAILS_DIFF'] || 'diff -u'
+      def show_diff(destination, content) #:nodoc:
+        diff_cmd = ENV['THOR_DIFF'] || ENV['RAILS_DIFF'] || 'diff -u'
 
-          Tempfile.open(File.basename(destination), File.dirname(destination)) do |temp|
-            temp.write content
-            temp.rewind
-            system %(#{diff_cmd} "#{destination}" "#{temp.path}")
-          end
+        Tempfile.open(File.basename(destination), File.dirname(destination)) do |temp|
+          temp.write content
+          temp.rewind
+          system %(#{diff_cmd} "#{destination}" "#{temp.path}")
         end
+      end
 
-        def quiet? #:nodoc:
-          mute? || (base && base.options[:quiet])
-        end
+      def quiet? #:nodoc:
+        mute? || (base && base.options[:quiet])
+      end
+
+      # Calculate the dynamic width of the terminal
+      def dynamic_width
+        @dynamic_width ||= (dynamic_width_stty.nonzero? || dynamic_width_tput)
+      end
+
+      def dynamic_width_stty
+        %x{stty size 2>/dev/null}.split[1].to_i
+      end
 
-        # This code was copied from Rake, available under MIT-LICENSE
-        # Copyright (c) 2003, 2004 Jim Weirich
-        def terminal_width
-          if ENV['THOR_COLUMNS']
-            result = ENV['THOR_COLUMNS'].to_i
+      def dynamic_width_tput
+        %x{tput cols 2>/dev/null}.to_i
+      end
+
+      def unix?
+        RUBY_PLATFORM =~ /(aix|darwin|linux|(net|free|open)bsd|cygwin|solaris|irix|hpux)/i
+      end
+
+      def truncate(string, width)
+        as_unicode do
+          chars = string.chars.to_a
+          if chars.length <= width
+            chars.join
           else
-            result = unix? ? dynamic_width : 80
+            ( chars[0, width-3].join ) + "..."
           end
-          (result < 10) ? 80 : result
-        rescue
-          80
-        end
-
-        # Calculate the dynamic width of the terminal
-        def dynamic_width
-          @dynamic_width ||= (dynamic_width_stty.nonzero? || dynamic_width_tput)
         end
+      end
 
-        def dynamic_width_stty
-          %x{stty size 2>/dev/null}.split[1].to_i
+      if "".respond_to?(:encode)
+        def as_unicode
+          yield
         end
-
-        def dynamic_width_tput
-          %x{tput cols 2>/dev/null}.to_i
+      else
+        def as_unicode
+          old, $KCODE = $KCODE, "U"
+          yield
+        ensure
+          $KCODE = old
         end
+      end
 
-        def unix?
-          RUBY_PLATFORM =~ /(aix|darwin|linux|(net|free|open)bsd|cygwin|solaris|irix|hpux)/i
-        end
+      def ask_simply(statement, color=nil)
+        say("#{statement} ", color)
+        stdin.gets.strip
+      end
 
-        def truncate(string, width)
-          if string.length <= width
-            string
-          else
-            ( string[0, width-3] || "" ) + "..."
-          end
+      def ask_filtered(statement, answer_set, *args)
+        correct_answer = nil
+        until correct_answer
+          answer = ask_simply("#{statement} #{answer_set.inspect}", *args)
+          correct_answer = answer_set.include?(answer) ? answer : nil
+          answers = answer_set.map(&:inspect).join(", ")
+          say("Your response must be one of: [#{answers}]. Please try again.") unless correct_answer
         end
+        correct_answer
+      end
 
     end
   end