bundler 1.2.5 → 1.3.0.pre

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

@@ -114,12 +114,12 @@ class Thor
     # the script started).
     #
     def relative_to_original_destination_root(path, remove_dot=true)
-      if path =~ /^#{@destination_stack[0]}/
-        path = path.gsub(@destination_stack[0], '.')
-        path = remove_dot ? (path[2..-1] || '') : path
+      path = path.dup
+      if path.gsub!(@destination_stack[0], '.')
+        remove_dot ? (path[2..-1] || '') : path
+      else
+        path
       end
-
-      path
     end
 
     # Holds source paths in instance so they can be manipulated.

data/lib/bundler/vendor/thor/actions/directory.rb

@@ -38,6 +38,7 @@ class Thor
     # destination<String>:: the relative path to the destination root.
     # config<Hash>:: give :verbose => false to not log the status.
     #                If :recursive => false, does not look for paths recursively.
+    #                If :mode => :preserve, preserve the file mode from the source.
     #
     # ==== Examples
     #

data/lib/bundler/vendor/thor/actions/file_manipulation.rb

@@ -10,7 +10,9 @@ class Thor
     # ==== Parameters
     # source<String>:: the relative path to the source root.
     # destination<String>:: the relative path to the destination root.
-    # config<Hash>:: give :verbose => false to not log the status.
+    # config<Hash>:: give :verbose => false to not log the status, and
+    #                :mode => :preserve, to preserve the file mode from the source.
+
     #
     # ==== Examples
     #
@@ -28,6 +30,10 @@ class Thor
         content = block.call(content) if block
         content
       end
+      if config[:mode] == :preserve
+        mode = File.stat(source).mode
+        chmod(destination, mode, config)
+      end
     end
 
     # Links the file from the relative source to the relative destination. If

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

@@ -10,6 +10,7 @@ require 'thor/util'
 class Thor
   autoload :Actions,    'thor/actions'
   autoload :RakeCompat, 'thor/rake_compat'
+  autoload :Group,      'thor/group'
 
   # Shortcuts for help.
   HELP_MAPPINGS       = %w(-h -? --help -D)
@@ -58,7 +59,8 @@ class Thor
       # Let Thor::Options parse the options first, so it can remove
       # declared options from the array. This will leave us with
       # a list of arguments that weren't declared.
-      opts = Thor::Options.new(parse_options, hash_options)
+      stop_on_unknown = self.class.stop_on_unknown_option? config[:current_task]
+      opts = Thor::Options.new(parse_options, hash_options, stop_on_unknown)
       self.options = opts.parse(array_options)
 
       # If unknown options are disallowed, make sure that none of the
@@ -70,11 +72,12 @@ class Thor
       # arguments declared using #argument (this is primarily used
       # by Thor::Group). Tis will leave us with the remaining
       # positional arguments.
-      thor_args = Thor::Arguments.new(self.class.arguments)
-      thor_args.parse(args + opts.remaining).each { |k,v| send("#{k}=", v) }
-      args = thor_args.remaining
+      to_parse  = args
+      to_parse += opts.remaining unless self.class.strict_args_position?(config)
 
-      @args = args
+      thor_args = Thor::Arguments.new(self.class.arguments)
+      thor_args.parse(to_parse).each { |k,v| __send__("#{k}=", v) }
+      @args = thor_args.remaining
     end
 
     class << self
@@ -141,6 +144,28 @@ class Thor
         !!check_unknown_options
       end
 
+      # If true, option parsing is suspended as soon as an unknown option or a
+      # regular argument is encountered.  All remaining arguments are passed to
+      # the task as regular arguments.
+      def stop_on_unknown_option?(task_name) #:nodoc:
+        false
+      end
+
+      # If you want only strict string args (useful when cascading thor classes),
+      # call strict_args_position! This is disabled by default to allow dynamic
+      # invocations.
+      def strict_args_position!
+        @strict_args_position = true
+      end
+
+      def strict_args_position #:nodoc:
+        @strict_args_position ||= from_superclass(:strict_args_position, false)
+      end
+
+      def strict_args_position?(config) #:nodoc:
+        !!strict_args_position
+      end
+
       # Adds an argument to the class and creates an attr_accessor for it.
       #
       # Arguments are different from options in several aspects. The first one
@@ -196,8 +221,9 @@ class Thor
                                "the non-required argument #{argument.human_name.inspect}."
         end if required
 
-        arguments << Thor::Argument.new(name, options[:desc], required, options[:type],
-                                              options[:default], options[:banner])
+        options[:required] = required
+
+        arguments << Thor::Argument.new(name, options)
       end
 
       # Returns this class arguments, looking up in the ancestors chain.
@@ -491,6 +517,7 @@ class Thor
 
               list << item
               list << [ "", "# Default: #{option.default}" ] if option.show_default?
+              list << [ "", "# Possible values: #{option.enum.join(', ')}" ] if option.enum
             end
           end
 
@@ -510,10 +537,9 @@ class Thor
         # ==== Parameters
         # name<Symbol>:: The name of the argument.
         # options<Hash>:: Described in both class_option and method_option.
+        # scope<Hash>:: Options hash that is being built up
         def build_option(name, options, scope) #:nodoc:
-          scope[name] = Thor::Option.new(name, options[:desc], options[:required],
-                                               options[:type], options[:default], options[:banner],
-                                               options[:lazy_default], options[:group], options[:aliases], options[:hide])
+          scope[name] = Thor::Option.new(name, options)
         end
 
         # Receives a hash of options, parse them and add to the scope. This is a
@@ -576,7 +602,14 @@ class Thor
             default
           else
             value = superclass.send(method)
-            value.dup if value
+
+            if value
+              if value.is_a?(TrueClass) || value.is_a?(Symbol)
+                value
+              else
+                value.dup
+              end
+            end
           end
         end
 

data/lib/bundler/vendor/thor/core_ext/hash_with_indifferent_access.rb

@@ -45,6 +45,11 @@ class Thor
         self
       end
 
+      # Convert to a Hash with String keys.
+      def to_hash
+        Hash.new(default).merge!(self)
+      end
+
       protected
 
         def convert_key(key)

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

@@ -2,21 +2,24 @@ class Thor
   class Argument #:nodoc:
     VALID_TYPES = [ :numeric, :hash, :array, :string ]
 
-    attr_reader :name, :description, :required, :type, :default, :banner
+    attr_reader :name, :description, :enum, :required, :type, :default, :banner
     alias :human_name :name
 
-    def initialize(name, description=nil, required=true, type=:string, default=nil, banner=nil)
+    def initialize(name, options={})
       class_name = self.class.name.split("::").last
 
+      type = options[:type]
+
       raise ArgumentError, "#{class_name} name can't be nil."                         if name.nil?
       raise ArgumentError, "Type :#{type} is not valid for #{class_name.downcase}s."  if type && !valid_type?(type)
 
       @name        = name.to_s
-      @description = description
-      @required    = required || false
+      @description = options[:desc]
+      @required    = options.key?(:required) ? options[:required] : true
       @type        = (type || :string).to_sym
-      @default     = default
-      @banner      = banner || default_banner
+      @default     = options[:default]
+      @banner      = options[:banner] || default_banner
+      @enum        = options[:enum]
 
       validate! # Trigger specific validations
     end
@@ -41,7 +44,11 @@ class Thor
     protected
 
       def validate!
-        raise ArgumentError, "An argument cannot be required and have default value." if required? && !default.nil?
+        if required? && !default.nil?
+          raise ArgumentError, "An argument cannot be required and have default value."
+        elsif @enum && !@enum.is_a?(Array)
+          raise ArgumentError, "An argument cannot have an enum other than an array."
+        end
       end
 
       def valid_type?(type)

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

@@ -144,7 +144,13 @@ class Thor
         if no_or_skip?(name)
           nil
         else
-          shift
+          value = shift
+          if @switches.is_a?(Hash) && switch = @switches[name]
+            if switch.enum && !switch.enum.include?(value)
+              raise MalformattedArgumentError, "Expected '#{name}' to be one of #{switch.enum.join(', ')}; got #{value}"
+            end
+          end
+          value
         end
       end
 

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

@@ -4,12 +4,13 @@ class Thor
 
     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, 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
+    def initialize(name, options={})
+      options[:required] = false unless options.key?(:required)
+      super
+      @lazy_default = options[:lazy_default]
+      @group        = options[:group].to_s.capitalize if options[:group]
+      @aliases      = Array(options[:aliases])
+      @hide         = options[:hide]
     end
 
     # This parse quick options given as method_options. It makes several
@@ -64,8 +65,7 @@ class Thor
       when Hash, Array, String
         value.class.name.downcase.to_sym
       end
-
-      self.new(name.to_s, nil, required, type, default, nil, nil, nil, aliases)
+      self.new(name.to_s, :required => required, :type => type, :default => default, :aliases => aliases)
     end
 
     def switch_name

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

@@ -5,6 +5,7 @@ class Thor
     EQ_RE       = /^(--\w+(?:-\w+)*|-[a-z])=(.*)$/i
     SHORT_SQ_RE = /^-([a-z]{2,})$/i # Allow either -x -v or -xv style for single char args
     SHORT_NUM   = /^(-[a-z])#{NUMERIC}$/i
+    OPTS_END    = '--'.freeze
 
     # Receives a hash and makes it switches.
     def self.to_switches(options)
@@ -25,7 +26,11 @@ class Thor
     end
 
     # Takes a hash of Thor::Option and a hash with defaults.
-    def initialize(hash_options={}, defaults={})
+    #
+    # If +stop_on_unknown+ is true, #parse will stop as soon as it encounters
+    # an unknown option or a regular argument.
+    def initialize(hash_options={}, defaults={}, stop_on_unknown=false)
+      @stop_on_unknown = stop_on_unknown
       options = hash_options.values
       super(options)
 
@@ -50,33 +55,55 @@ class Thor
       @extra
     end
 
+    def peek
+      return super unless @parsing_options
+
+      result = super
+      if result == OPTS_END
+        shift
+        @parsing_options = false
+        super
+      else
+        result
+      end
+    end
+
     def parse(args)
       @pile = args.dup
+      @parsing_options = true
 
       while peek
-        match, is_switch = current_is_switch?
-        shifted = shift
-
-        if is_switch
-          case shifted
-            when SHORT_SQ_RE
-              unshift($1.split('').map { |f| "-#{f}" })
-              next
-            when EQ_RE, SHORT_NUM
-              unshift($2)
-              switch = $1
-            when LONG_RE, SHORT_RE
-              switch = $1
+        if parsing_options?
+          match, is_switch = current_is_switch?
+          shifted = shift
+
+          if is_switch
+            case shifted
+              when SHORT_SQ_RE
+                unshift($1.split('').map { |f| "-#{f}" })
+                next
+              when EQ_RE, SHORT_NUM
+                unshift($2)
+                switch = $1
+              when LONG_RE, SHORT_RE
+                switch = $1
+            end
+
+            switch = normalize_switch(switch)
+            option = switch_option(switch)
+            @assigns[option.human_name] = parse_peek(switch, option)
+          elsif @stop_on_unknown
+            @extra << shifted
+            @extra << shift while peek
+            break
+          elsif match
+            @extra << shifted
+            @extra << shift while peek && peek !~ /^-/
+          else
+            @extra << shifted
           end
-
-          switch = normalize_switch(switch)
-          option = switch_option(switch)
-          @assigns[option.human_name] = parse_peek(switch, option)
-        elsif match
-          @extra << shifted
-          @extra << shift while peek && peek !~ /^-/
         else
-          @extra << shifted
+          @extra << shift
         end
       end
 
@@ -95,8 +122,10 @@ class Thor
 
     protected
 
-      # Returns true if the current value in peek is a registered switch.
+      # Check if the current value in peek is a registered switch.
       #
+      # Two booleans are returned.  The first is true if the current value
+      # starts with a hyphen; the second is true if it is a registered switch.
       def current_is_switch?
         case peek
         when LONG_RE, SHORT_RE, EQ_RE, SHORT_NUM
@@ -117,6 +146,10 @@ class Thor
         end
       end
 
+      def current_is_value?
+        peek && (!parsing_options? || super)
+      end
+
       def switch?(arg)
         switch_option(normalize_switch(arg))
       end
@@ -135,6 +168,11 @@ class Thor
         (@shorts[arg] || arg).tr('_', '-')
       end
 
+      def parsing_options?
+        peek
+        @parsing_options
+      end
+
       # Parse boolean values which can be given as --foo=true, --foo or --no-foo.
       #
       def parse_boolean(switch)
@@ -156,7 +194,7 @@ class Thor
       # Parse the value at the peek analyzing if it requires an input or not.
       #
       def parse_peek(switch, option)
-        if current_is_switch_formatted? || last?
+        if parsing_options? && (current_is_switch_formatted? || last?)
           if option.boolean?
             # No problem for boolean types
           elsif no_or_skip?(switch)

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

@@ -25,7 +25,7 @@ class Thor::Runner < Thor #:nodoc:
   end
 
   # If a task is not found on Thor::Runner, method missing is invoked and
-  # Thor::Runner is then responsable for finding the task in all classes.
+  # Thor::Runner is then responsible for finding the task in all classes.
   #
   def method_missing(meth, *args)
     meth = meth.to_s

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

@@ -58,7 +58,7 @@ class Thor
       # ==== Example
       # say("I know you knew that.")
       #
-      def say(message="", color=nil, force_new_line=(message.to_s !~ /( |\t)$/))
+      def say(message="", color=nil, force_new_line=(message.to_s !~ /( |\t)\Z/))
         message = message.to_s
 
         message = set_color(message, *color) if color
@@ -370,7 +370,7 @@ HELP
 
       def ask_simply(statement, color=nil)
         say("#{statement} ", color)
-        stdin.gets.strip
+        stdin.gets.tap{|text| text.strip! if text}
       end
 
       def ask_filtered(statement, answer_set, *args)

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

@@ -24,9 +24,9 @@ class Thor
         instance.class.handle_no_task_error(name)
       elsif public_method?(instance)
         arity = instance.method(name).arity
-        instance.send(name, *args)
+        instance.__send__(name, *args)
       elsif local_method?(instance, :method_missing)
-        instance.send(:method_missing, name.to_sym, *args)
+        instance.__send__(:method_missing, name.to_sym, *args)
       else
         instance.class.handle_no_task_error(name)
       end

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

@@ -1,3 +1,3 @@
 class Thor
-  VERSION = "0.15.2"
+  VERSION = "0.16.0"
 end

data/lib/bundler/vendored_persistent.rb

@@ -1,15 +1,3 @@
-begin
-  require 'openssl'
-  OpenSSL # ensure OpenSSL is loaded
-
-  vendor = File.expand_path('../vendor', __FILE__)
-  $:.unshift(vendor) unless $:.include?(vendor)
-  require 'net/http/persistent'
-
-  USE_PERSISTENT = true
-
-rescue LoadError, NameError => e
-  require 'net/http'
-  USE_PERSISTENT = false
-
-end
+vendor = File.expand_path('../vendor', __FILE__)
+$:.unshift(vendor) unless $:.include?(vendor)
+require 'net/http/persistent'