josevalim-thor 0.10.11 → 0.10.12

data/lib/thor.rb

@@ -104,6 +104,8 @@ class Thor
     # :aliases  - Aliases for this option.
     # :type     - The type of the argument, can be :string, :hash, :array, :numeric, :boolean or :default.
     #             Default accepts arguments as booleans (--switch) or as strings (--switch=VALUE).
+    # :group    - The group for this options. Use by class options to output options in different levels.
+    # :banner   - String to show on usage notes.
     #
     def method_option(name, options)
       scope = if options[:for]

data/lib/thor/actions.rb

@@ -56,12 +56,6 @@ class Thor
       super
 
       self.root = config[:root]
-
-      # For last, invoke source root to allow the result to be cached. This is
-      # needed because source root depends on the file location (__FILE__) which
-      # returns the wrong value if invoked after FileUtils#cd.
-      #
-      self.source_root if self.class.respond_to?(:source_root)
     end
 
     # Wraps an action object and call it accordingly to the thor class behavior.

data/lib/thor/base.rb

@@ -9,10 +9,7 @@ require 'thor/util'
 
 class Thor
   HELP_MAPPINGS       = %w(-h -? --help -D)
-  THOR_RESERVED_WORDS = %w(all invoke shell options behavior root destination_root relative_root source_root)
-
-  class Maxima < Struct.new(:usage, :options, :class_options)
-  end
+  THOR_RESERVED_WORDS = %w(invoke shell options behavior root destination_root relative_root source_root)
 
   module Base
     attr_accessor :options
@@ -109,6 +106,7 @@ class Thor
       # :optional - If the argument is optional or not.
       # :type     - The type of the argument, can be :string, :hash, :array, :numeric.
       # :default  - Default value for this argument. It cannot be required and have default values.
+      # :banner   - String to show on usage notes.
       #
       # ==== Errors
       # ArgumentError:: Raised if you supply a required argument after a non required one.
@@ -131,8 +129,8 @@ class Thor
                                "the non-required argument #{option.human_name.inspect}."
         end if required
 
-        class_options[name] = Thor::Argument.new(name, options[:desc], required,
-                                                 options[:type], options[:default])
+        class_options[name] = Thor::Argument.new(name, options[:desc], required, options[:type],
+                                                       options[:default], options[:banner])
       end
 
       # Returns this class arguments, looking up in the ancestors chain.
@@ -173,6 +171,7 @@ class Thor
       # :aliases  - Aliases for this option.
       # :type     - The type of the argument, can be :string, :hash, :array, :numeric, :boolean or :default.
       #             Default accepts arguments as booleans (--switch) or as strings (--switch=VALUE).
+      # :banner   - String to show on usage notes.
       #
       def class_option(name, options)
         build_option(name, options, class_options)
@@ -358,16 +357,15 @@ class Thor
             groups = self.class_options.group_values_by { |o| o.group }
 
             printer = lambda do |group_name, options|
-              unless options.empty?
-                list = []
-
-                options.each do |option|
-                  next if option.argument?
+              list = []
 
-                  list << [ option.usage(false), option.description || "" ]
-                  list << [ "", "Default: #{option.default}" ] if option.description && option.default
-                end
+              options.each do |option|
+                next if option.argument?
+                list << [ option.usage, option.description || "" ]
+                list << [ "", "Default: #{option.default}" ] if option.description && option.default
+              end
 
+              unless list.empty?
                 if group_name
                   shell.say "#{group_name} options:"
                 else
@@ -380,7 +378,7 @@ class Thor
             end
 
             # Deal with default group
-            global_options = groups.delete(nil)
+            global_options = groups.delete(nil) || []
             printer.call(ungrouped_name, global_options) if global_options
 
             # Print all others
@@ -392,7 +390,7 @@ class Thor
         #
         def is_thor_reserved_word?(word, type)
           return false unless THOR_RESERVED_WORDS.include?(word.to_s)
-          raise ScriptError, "'#{word}' is a Thor reserved word and cannot be defined as #{type}"
+          raise "'#{word}' is a Thor reserved word and cannot be defined as #{type}"
         end
 
         # Build an option and adds it to the given scope.
@@ -402,8 +400,9 @@ class Thor
         # options<Hash>:: Described in both class_option and method_option.
         #
         def build_option(name, options, scope)
-          scope[name] = Thor::Option.new(name, options[:desc], options[:required], options[:type],
-                                               options[:default], options[:aliases], options[:group])
+          scope[name] = Thor::Option.new(name, options[:desc], options[:required],
+                                               options[:type], options[:default], options[:banner],
+                                               options[:group], options[:aliases])
         end
 
         # Receives a hash of options, parse them and add to the scope. This is a
@@ -435,10 +434,13 @@ class Thor
         end
 
         # Everytime someone inherits from a Thor class, register the klass
-        # and file into baseclass.
+        # and file into baseclass. Also invoke the source_root if the klass
+        # respond to it. This is needed to ensure that the source_root does 
+        # not change after FileUtils#cd is called.
         #
         def inherited(klass)
           Thor::Base.register_klass_file(klass)
+          klass.source_root if klass.respond_to?(:source_root)
         end
 
         # Fire this callback whenever a method is added. Added methods are

data/lib/thor/group.rb

@@ -29,8 +29,8 @@ class Thor::Group
       opts = Thor::Options.new(class_options)
       opts.parse(args)
 
-      instance = new(opts.arguments, opts.options, config) do |klass, invoke|
-        klass.prepare(invoke, args, config)
+      instance = new(opts.arguments, opts.options, config) do |klass, invoke, overrides|
+        klass.prepare(invoke, args, config.merge(overrides))
       end
 
       return instance, nil

data/lib/thor/invocation.rb

@@ -80,29 +80,31 @@ class Thor
     #
     def invoke(name, task=nil, method_args=nil)
       task, method_args = nil, task if task.is_a?(Array)
-
       object, task = _setup_for_invoke(name, task)
-      klass = object.is_a?(Class) ? object : object.class
-
-      current = @_invocations[klass]
-      return if current.include?("all")
 
       if object.is_a?(Class)
+        klass = object
         instance, trailing = @_initializer.call(klass, task, _overrides_config)
         method_args ||= trailing
       else
-        instance = object
+        klass, instance = object.class, object
       end
 
       method_args ||= []
+      current = @_invocations[klass]
+
+      iterator = lambda do |_, task|
+        unless current.include?(task.name)
+          current << task.name
+          task.run(instance, method_args)
+        end
+      end
 
       if task
-        return if current.include?(task.name)
-        current << task.name
-        task.run(instance, method_args)
+        iterator.call(nil, task)
       else
-        current << "all"
-        klass.all_tasks.collect { |_, task| task.run(instance) }
+        method_args = []
+        klass.all_tasks.map(&iterator)
       end
     end
 

data/lib/thor/option.rb

@@ -1,10 +1,10 @@
 class Thor
   class Option
-    attr_reader :name, :description, :required, :type, :default, :aliases, :group
+    attr_reader :name, :description, :required, :type, :default, :aliases, :group, :banner
 
     VALID_TYPES = [:boolean, :numeric, :hash, :array, :string, :default]
 
-    def initialize(name, description=nil, required=nil, type=nil, default=nil, aliases=nil, group=nil)
+    def initialize(name, description=nil, required=nil, type=nil, default=nil, banner=nil, group=nil, aliases=nil)
       raise ArgumentError, "Option name can't be nil."                          if name.nil?
       raise ArgumentError, "Option cannot be required and have default values." if required && !default.nil?
       raise ArgumentError, "Type :#{type} is not valid for options."            if type && !VALID_TYPES.include?(type.to_sym)
@@ -15,6 +15,7 @@ class Thor
       @type        = (type || :default).to_sym
       @default     = default
       @aliases     = [*aliases].compact
+      @banner      = banner || formatted_value
       @group       = group.to_s.capitalize if group
     end
 
@@ -75,7 +76,7 @@ class Thor
           value.class.name.downcase.to_sym
       end
 
-      self.new(name.to_s, nil, required, type, default, aliases)
+      self.new(name.to_s, nil, required, type, default, nil, nil, aliases)
     end
 
     def argument?
@@ -121,15 +122,9 @@ class Thor
       (str.length > 1 ? "--" : "-") + str.gsub('_', '-')
     end
 
-    def usage(use_default=true)
-      sample = if use_default
-        formatted_default || formatted_value
-      else
-        formatted_value
-      end
-
-      sample = if sample
-        "#{switch_name}=#{sample}"
+    def usage
+      sample = if banner
+        "#{switch_name}=#{banner}"
       else
         switch_name
       end
@@ -151,30 +146,6 @@ class Thor
         end
       end
 
-      def formatted_default
-        return unless default
-
-        case type
-          when :boolean
-            nil
-          when :numeric
-            default.to_s
-          when :string, :default
-            default.to_s.empty? ? formatted_value : default.to_s
-          when :hash
-            if default.empty?
-              formatted_value
-            else
-              default.inject([]) do |mem, (key, value)|
-                mem << "#{key}:#{value}".gsub(/\s/, '_')
-                mem
-              end.join(' ')
-            end
-          when :array
-            default.empty? ? formatted_value : default.join(" ")
-        end
-      end
-
       def formatted_value
         case type
           when :boolean
@@ -197,19 +168,19 @@ class Thor
   class Argument < Option
     VALID_TYPES = [:numeric, :hash, :array, :string]
 
-    def initialize(name, description=nil, required=true, type=:string, default=nil)
+    def initialize(name, description=nil, required=true, type=:string, default=nil, banner=nil)
       raise ArgumentError, "Argument name can't be nil."               if name.nil?
       raise ArgumentError, "Type :#{type} is not valid for arguments." if type && !VALID_TYPES.include?(type.to_sym)
 
-      super(name, description, required, type || :string, default)
+      super(name, description, required, type || :string, default, banner)
     end
 
     def argument?
       true
     end
 
-    def usage(use_default=true)
-      required? ? formatted_value : "[#{formatted_value}]"
+    def usage
+      required? ? banner : "[#{banner}]"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: josevalim-thor
 version: !ruby/object:Gem::Version 
-  version: 0.10.11
+  version: 0.10.12
 platform: ruby
 authors: 
 - Yehuda Katz