bundler 1.8.9 → 1.9.0.pre

data/lib/bundler/vendor/{thor → thor-0.19.1/lib/thor}/command.rb

@@ -1,4 +1,4 @@
-class Thor
+class Bundler::Thor
   class Command < Struct.new(:name, :description, :long_description, :usage, :options)
     FILE_REGEXP = /^#{Regexp.escape(File.dirname(__FILE__))}/
 
@@ -45,12 +45,12 @@ class Thor
       end
       formatted = "#{klass.namespace.split(':').last} " if subcommand
 
-      formatted ||= ''
+      formatted ||= ""
 
       # Add usage with required arguments
       formatted << if klass && !klass.arguments.empty?
                      usage.to_s.gsub(/^#{name}/) do |match|
-                       match << ' ' << klass.arguments.map { |a| a.usage }.compact.join(' ')
+                       match << " " << klass.arguments.map { |a| a.usage }.compact.join(" ")
                      end
                    else
                      usage.to_s
@@ -70,7 +70,7 @@ class Thor
     end
 
     def required_options
-      @required_options ||= options.map { |_, o| o.usage if o.required? }.compact.sort.join(' ')
+      @required_options ||= options.map { |_, o| o.usage if o.required? }.compact.sort.join(" ")
     end
 
     # Given a target, checks if this class name is a public method.
@@ -88,15 +88,15 @@ class Thor
     end
 
     def sans_backtrace(backtrace, caller) #:nodoc:
-      saned = backtrace.reject { |frame| frame =~ FILE_REGEXP || (frame =~ /\.java:/ && RUBY_PLATFORM =~ /java/) }
+      saned = backtrace.reject { |frame| frame =~ FILE_REGEXP || (frame =~ /\.java:/ && RUBY_PLATFORM =~ /java/) || (frame =~ /^kernel\// && RUBY_ENGINE =~ /rbx/) }
       saned - caller
     end
 
     def handle_argument_error?(instance, error, caller)
-      not_debugging?(instance) && error.message =~ /wrong number of arguments/ && begin
+      not_debugging?(instance) && (error.message =~ /wrong number of arguments/ || error.message =~ /given \d*, expected \d*/) && begin
         saned = sans_backtrace(error.backtrace, caller)
         # Ruby 1.9 always include the called method in the backtrace
-        saned.empty? || (saned.size == 1 && RUBY_VERSION >= '1.9')
+        saned.empty? || (saned.size == 1 && RUBY_VERSION >= "1.9")
       end
     end
 
@@ -118,7 +118,7 @@ class Thor
   # A dynamic command that handles method missing scenarios.
   class DynamicCommand < Command
     def initialize(name, options = nil)
-      super(name.to_s, 'A dynamically-generated command', name.to_s, name.to_s, options)
+      super(name.to_s, "A dynamically-generated command", name.to_s, name.to_s, options)
     end
 
     def run(instance, args = [])

data/lib/bundler/vendor/{thor → thor-0.19.1/lib/thor}/core_ext/hash_with_indifferent_access.rb

@@ -1,8 +1,8 @@
-class Thor
+class Bundler::Thor
   module CoreExt #:nodoc:
     # A hash with indifferent access and magic predicates.
     #
-    #   hash = Thor::CoreExt::HashWithIndifferentAccess.new 'foo' => 'bar', 'baz' => 'bee', 'force' => true
+    #   hash = Bundler::Thor::CoreExt::HashWithIndifferentAccess.new 'foo' => 'bar', 'baz' => 'bee', 'force' => true
     #
     #   hash[:foo]  #=> 'bar'
     #   hash['foo'] #=> 'bar'

data/lib/bundler/vendor/{thor → thor-0.19.1/lib/thor}/core_ext/io_binary_read.rb

@@ -2,7 +2,7 @@ class IO #:nodoc:
   class << self
     def binread(file, *args)
       fail ArgumentError, "wrong number of arguments (#{1 + args.size} for 1..3)" unless args.size < 3
-      File.open(file, 'rb') do |f|
+      File.open(file, "rb") do |f|
         f.read(*args)
       end
     end unless method_defined? :binread

data/lib/bundler/vendor/{thor → thor-0.19.1/lib/thor}/core_ext/ordered_hash.rb

@@ -1,6 +1,6 @@
-class Thor
+class Bundler::Thor
   module CoreExt #:nodoc:
-    if RUBY_VERSION >= '1.9'
+    if RUBY_VERSION >= "1.9"
       class OrderedHash < ::Hash
       end
     else

data/lib/bundler/vendor/{thor → thor-0.19.1/lib/thor}/error.rb

@@ -1,9 +1,9 @@
-class Thor
-  # Thor::Error is raised when it's caused by wrong usage of thor classes. Those
+class Bundler::Thor
+  # Bundler::Thor::Error is raised when it's caused by wrong usage of thor classes. Those
   # 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
+  # overwrites a thor keyword, it SHOULD NOT raise a Bundler::Thor::Error. This way, we
   # ensure that developer errors are shown with full backtrace.
   class Error < StandardError
   end

data/lib/bundler/vendor/{thor → thor-0.19.1/lib/thor}/group.rb

@@ -1,17 +1,17 @@
-require 'thor/base'
+require "thor/base"
 
-# Thor has a special class called Thor::Group. The main difference to Thor class
+# Bundler::Thor has a special class called Bundler::Thor::Group. The main difference to Bundler::Thor class
 # is that it invokes all commands at once. It also include some methods that allows
-# invocations to be done at the class method, which are not available to Thor
+# invocations to be done at the class method, which are not available to Bundler::Thor
 # commands.
-class Thor::Group # rubocop:disable ClassLength
+class Bundler::Thor::Group # rubocop:disable ClassLength
   class << self
-    # The description for this Thor::Group. If none is provided, but a source root
+    # The description for this Bundler::Thor::Group. If none is provided, but a source root
     # exists, tries to find the USAGE one folder above it, otherwise searches
     # in the superclass.
     #
     # ==== Parameters
-    # description<String>:: The description for this Thor::Group.
+    # description<String>:: The description for this Bundler::Thor::Group.
     #
     def desc(description = nil)
       if description
@@ -27,7 +27,7 @@ class Thor::Group # rubocop:disable ClassLength
     # short:: When true, shows only usage.
     #
     def help(shell)
-      shell.say 'Usage:'
+      shell.say "Usage:"
       shell.say "  #{banner}\n"
       shell.say
       class_options_help(shell)
@@ -62,7 +62,7 @@ class Thor::Group # rubocop:disable ClassLength
         invocation_blocks[name] = block if block_given?
 
         class_eval <<-METHOD, __FILE__, __LINE__
-          def _invoke_#{name.to_s.gsub(/\W/, '_')}
+          def _invoke_#{name.to_s.gsub(/\W/, "_")}
             klass, command = self.class.prepare_for_invocation(nil, #{name.inspect})
 
             if klass
@@ -83,7 +83,7 @@ class Thor::Group # rubocop:disable ClassLength
     #
     # ==== Examples
     #
-    #   class GemGenerator < Thor::Group
+    #   class GemGenerator < Bundler::Thor::Group
     #     class_option :test_framework, :type => :string
     #     invoke_from_option :test_framework
     #   end
@@ -114,18 +114,18 @@ class Thor::Group # rubocop:disable ClassLength
       names.each do |name|
         unless class_options.key?(name)
           fail ArgumentError, "You have to define the option #{name.inspect} " <<
-                               'before setting invoke_from_option.'
+                               "before setting invoke_from_option."
         end
 
         invocations[name] = true
         invocation_blocks[name] = block if block_given?
 
         class_eval <<-METHOD, __FILE__, __LINE__
-          def _invoke_from_option_#{name.to_s.gsub(/\W/, '_')}
+          def _invoke_from_option_#{name.to_s.gsub(/\W/, "_")}
             return unless options[#{name.inspect}]
 
             value = options[#{name.inspect}]
-            value = #{name.inspect} if value.is_a?(TrueClass)
+            value = #{name.inspect} if TrueClass === value
             klass, command = self.class.prepare_for_invocation(#{name.inspect}, value)
 
             if klass
@@ -172,11 +172,11 @@ class Thor::Group # rubocop:disable ClassLength
     def get_options_from_invocations(group_options, base_options) #:nodoc: # rubocop:disable MethodLength
       invocations.each do |name, from_option|
         value = if from_option
-                  option = class_options[name]
-                  option.type == :boolean ? name : option.default
-                else
-                  name
-                end
+          option = class_options[name]
+          option.type == :boolean ? name : option.default
+        else
+          name
+        end
         next unless value
 
         klass, _ = prepare_for_invocation(name, value)
@@ -199,15 +199,15 @@ class Thor::Group # rubocop:disable ClassLength
     def printable_commands(*)
       item = []
       item << banner
-      item << (desc ? "# #{desc.gsub(/\s+/m, ' ')}" : '')
+      item << (desc ? "# #{desc.gsub(/\s+/m, ' ')}" : "")
       [item]
     end
     alias_method :printable_tasks, :printable_commands
 
     def handle_argument_error(command, error, args, arity) #:nodoc:
       msg = "#{basename} #{command.name} takes #{arity} argument"
-      msg << 's' if arity > 1
-      msg << ', but it should not.'
+      msg << "s" if arity > 1
+      msg << ", but it should not."
       fail error, msg
     end
 
@@ -215,12 +215,12 @@ class Thor::Group # rubocop:disable ClassLength
 
     # The method responsible for dispatching given the args.
     def dispatch(command, given_args, given_opts, config) #:nodoc:
-      if Thor::HELP_MAPPINGS.include?(given_args.first)
+      if Bundler::Thor::HELP_MAPPINGS.include?(given_args.first)
         help(config[:shell])
         return
       end
 
-      args, opts = Thor::Options.split(given_args)
+      args, opts = Bundler::Thor::Options.split(given_args)
       opts = given_opts || opts
 
       instance = new(args, opts, config)
@@ -234,29 +234,29 @@ class Thor::Group # rubocop:disable ClassLength
     end
 
     # The banner for this class. You can customize it if you are invoking the
-    # thor class by another ways which is not the Thor::Runner.
+    # thor class by another ways which is not the Bundler::Thor::Runner.
     def banner
       "#{basename} #{self_command.formatted_usage(self, false)}"
     end
 
     # Represents the whole class as a command.
     def self_command #:nodoc:
-      Thor::DynamicCommand.new(namespace, class_options)
+      Bundler::Thor::DynamicCommand.new(namespace, class_options)
     end
     alias_method :self_task, :self_command
 
     def baseclass #:nodoc:
-      Thor::Group
+      Bundler::Thor::Group
     end
 
     def create_command(meth) #:nodoc:
-      commands[meth.to_s] = Thor::Command.new(meth, nil, nil, nil, nil)
+      commands[meth.to_s] = Bundler::Thor::Command.new(meth, nil, nil, nil, nil)
       true
     end
     alias_method :create_task, :create_command
   end
 
-  include Thor::Base
+  include Bundler::Thor::Base
 
 protected
 

data/lib/bundler/vendor/{thor → thor-0.19.1/lib/thor}/invocation.rb

@@ -1,4 +1,4 @@
-class Thor
+class Bundler::Thor
   module Invocation
     def self.included(base) #:nodoc:
       base.extend ClassMethods
@@ -7,11 +7,11 @@ class Thor
     module ClassMethods
       # This method is responsible for receiving a name and find the proper
       # class and command for it. The key is an optional parameter which is
-      # available only in class methods invocations (i.e. in Thor::Group).
+      # available only in class methods invocations (i.e. in Bundler::Thor::Group).
       def prepare_for_invocation(key, name) #:nodoc:
         case name
         when Symbol, String
-          Thor::Util.find_class_and_command_by_namespace(name.to_s, !key)
+          Bundler::Thor::Util.find_class_and_command_by_namespace(name.to_s, !key)
         else
           name
         end
@@ -25,8 +25,13 @@ class Thor
       super
     end
 
+    # Make the current command chain accessible with in a Bundler::Thor-(sub)command
+    def current_command_chain
+      @_invocations.values.flatten.map(&:to_sym)
+    end
+
     # Receives a name and invokes it. The name can be a string (either "command" or
-    # "namespace:command"), a Thor::Command, a Class or a Thor instance. If the
+    # "namespace:command"), a Bundler::Thor::Command, a Class or a Bundler::Thor instance. If the
     # command cannot be guessed by name, it can also be supplied as second argument.
     #
     # You can also supply the arguments, options and configuration values for
@@ -37,7 +42,7 @@ class Thor
     #
     # ==== Examples
     #
-    #   class A < Thor
+    #   class A < Bundler::Thor
     #     def foo
     #       invoke :bar
     #       invoke "b:hello", ["Erik"]
@@ -48,7 +53,7 @@ class Thor
     #     end
     #   end
     #
-    #   class B < Thor
+    #   class B < Bundler::Thor
     #     def hello(name)
     #       puts "hello #{name}"
     #     end
@@ -65,7 +70,7 @@ class Thor
     # supplied to B. This allows lazy parse of options. Let's suppose you have
     # some rspec commands:
     #
-    #   class Rspec < Thor::Group
+    #   class Rspec < Bundler::Thor::Group
     #     class_option :mock_framework, :type => :string, :default => :rr
     #
     #     def invoke_mock_framework
@@ -76,7 +81,7 @@ class Thor
     # As you noticed, it invokes the given mock framework, which might have its
     # own options:
     #
-    #   class Rspec::RR < Thor::Group
+    #   class Rspec::RR < Bundler::Thor::Group
     #     class_option :style, :type => :string, :default => :mock
     #   end
     #
@@ -95,7 +100,7 @@ class Thor
     #
     def invoke(name = nil, *args)
       if name.nil?
-        warn "[Thor] Calling invoke() without argument is deprecated. Please use invoke_all instead.\n#{caller.join("\n")}"
+        warn "[Bundler::Thor] Calling invoke() without argument is deprecated. Please use invoke_all instead.\n#{caller.join("\n")}"
         return invoke_all
       end
 
@@ -103,8 +108,8 @@ class Thor
       command, args, opts, config = args
 
       klass, command = _retrieve_class_and_command(name, command)
-      fail "Missing Thor class for invoke #{name}" unless klass
-      fail "Expected Thor class, got #{klass}" unless klass <= Thor::Base
+      fail "Missing Bundler::Thor class for invoke #{name}" unless klass
+      fail "Expected Bundler::Thor class, got #{klass}" unless klass <= Bundler::Thor::Base
 
       args, opts, config = _parse_initialization_options(args, opts, config)
       klass.send(:dispatch, command, args, opts, config) do |instance|

data/lib/bundler/vendor/thor-0.19.1/lib/thor/line_editor.rb

@@ -0,0 +1,17 @@
+require "thor/line_editor/basic"
+require "thor/line_editor/readline"
+
+class Bundler::Thor
+  module LineEditor
+    def self.readline(prompt, options = {})
+      best_available.new(prompt, options).readline
+    end
+
+    def self.best_available
+      [
+        Bundler::Thor::LineEditor::Readline,
+        Bundler::Thor::LineEditor::Basic
+      ].detect(&:available?)
+    end
+  end
+end

data/lib/bundler/vendor/{thor → thor-0.19.1/lib/thor}/line_editor/basic.rb

@@ -1,4 +1,4 @@
-class Thor
+class Bundler::Thor
   module LineEditor
     class Basic
       attr_reader :prompt, :options
@@ -17,7 +17,7 @@ class Thor
         get_input
       end
 
-      private
+    private
 
       def get_input
         if echo?

data/lib/bundler/vendor/{thor → thor-0.19.1/lib/thor}/line_editor/readline.rb

@@ -1,9 +1,9 @@
 begin
-  require 'readline'
+  require "readline"
 rescue LoadError
 end
 
-class Thor
+class Bundler::Thor
   module LineEditor
     class Readline < Basic
       def self.available?
@@ -23,7 +23,7 @@ class Thor
         end
       end
 
-      private
+    private
 
       def add_to_history?
         options.fetch(:add_to_history, true)
@@ -31,9 +31,9 @@ class Thor
 
       def completion_proc
         if use_path_completion?
-          Proc.new { |text| PathCompletion.new(text).matches }
+          proc { |text| PathCompletion.new(text).matches }
         elsif completion_options.any?
-          Proc.new do |text|
+          proc do |text|
             completion_options.select { |option| option.start_with?(text) }
           end
         end
@@ -59,10 +59,10 @@ class Thor
           relative_matches
         end
 
-        private
+      private
 
         def relative_matches
-          absolute_matches.map { |path| path.sub(base_path, '') }
+          absolute_matches.map { |path| path.sub(base_path, "") }
         end
 
         def absolute_matches

data/lib/bundler/vendor/thor-0.19.1/lib/thor/parser.rb

@@ -0,0 +1,4 @@
+require "thor/parser/argument"
+require "thor/parser/arguments"
+require "thor/parser/option"
+require "thor/parser/options"

data/lib/bundler/vendor/{thor → thor-0.19.1/lib/thor}/parser/argument.rb

@@ -1,4 +1,4 @@
-class Thor
+class Bundler::Thor
   class Argument #:nodoc:
     VALID_TYPES = [:numeric, :hash, :array, :string]
 
@@ -6,7 +6,7 @@ class Thor
     alias_method :human_name, :name
 
     def initialize(name, options = {})
-      class_name = self.class.name.split('::').last
+      class_name = self.class.name.split("::").last
 
       type = options[:type]
 
@@ -45,9 +45,9 @@ class Thor
 
     def validate!
       if required? && !default.nil?
-        fail ArgumentError, 'An argument cannot be required and have default value.'
+        fail ArgumentError, "An argument cannot be required and have default value."
       elsif @enum && !@enum.is_a?(Array)
-        fail ArgumentError, 'An argument cannot have an enum other than an array.'
+        fail ArgumentError, "An argument cannot have an enum other than an array."
       end
     end
 
@@ -62,11 +62,11 @@ class Thor
       when :string, :default
         human_name.upcase
       when :numeric
-        'N'
+        "N"
       when :hash
-        'key:value'
+        "key:value"
       when :array
-        'one two three'
+        "one two three"
       end
     end
   end