josevalim-thor 0.10.20 → 0.10.21

data/lib/thor/actions.rb

@@ -305,8 +305,14 @@ class Thor
       end
 
       def _cleanup_options_and_set(options, key)
-        [:force, :skip, "force", "skip"].each { |i| options.delete(i) }
-        options.merge!(key => true)
+        case options
+          when Array
+            %w(--force -f --skip -s).each { |i| options.delete(i) }
+            options << "--#{key}"
+          when Hash
+            [:force, :skip, "force", "skip"].each { |i| options.delete(i) }
+            options.merge!(key => true)
+        end
       end
 
   end

data/lib/thor/base.rb

@@ -381,9 +381,10 @@ class Thor
 
             printer = lambda do |group_name, options|
               list = []
+              padding = options.collect{ |o| o.aliases.size  }.max.to_i * 4
 
               options.each do |option|
-                list << [ option.usage, option.description || "" ]
+                list << [ option.usage(padding), option.description || "" ]
                 list << [ "", "Default: #{option.default}" ] if option.show_default?
               end
 

data/lib/thor/invocation.rb

@@ -130,24 +130,30 @@ class Thor
           when Symbol, String
             name = name.to_s
 
-            begin
-              task = self.class.all_tasks[name]
-              object, task = Thor::Util.namespace_to_thor_class(name) unless task
-              task = task || sent_task
-            rescue Thor::Error
-              task = name
+            # If is not one of this class tasks, do a lookup.
+            unless task = self.class.all_tasks[name]
+              object, task = Thor::Util.namespace_to_thor_class(name, false)
+              task ||= sent_task
             end
           else
             object, task = name, sent_task
         end
 
-        object ||= self
+        # If the object was not set, use self and use the name as task.
+        object, task = self, name unless object
+        return object, _validate_klass_and_task(object, task)
+      end
+
+      # Check if the object given is a Thor class object and get a task object
+      # for it.
+      #
+      def _validate_klass_and_task(object, task)
         klass = object.is_a?(Class) ? object : object.class
         raise "Expected Thor class, got #{klass}" unless klass <= Thor::Base
 
         task ||= klass.default_task if klass <= Thor
         task = klass.all_tasks[task.to_s] || Task.dynamic(task) if task && !task.is_a?(Thor::Task)
-        return object, task
+        task
       end
 
   end

data/lib/thor/parser/option.rb

@@ -78,16 +78,20 @@ class Thor
       @human_name ||= dasherized? ? undasherize(name) : name
     end
 
-    def usage
+    def usage(padding=0)
       sample = if banner
         "#{switch_name}=#{banner}"
       else
         switch_name
       end
 
-      sample = "[#{sample}]"                      unless required?
-      sample = "#{aliases.join(', ')}, #{sample}" unless aliases.empty?
-      sample
+      sample = "[#{sample}]" unless required?
+
+      if aliases.empty?
+        (" " * padding) << sample
+      else
+        "#{aliases.join(', ')}, #{sample}"
+      end
     end
 
     protected

data/lib/thor/util.rb

@@ -35,8 +35,6 @@ class Thor
     # older versions of Thor. On current versions, if you need to get the
     # namespace from a class, just call namespace on it.
     #
-    # TODO Deprecate this method in the future.
-    #
     # ==== Parameters
     # constant<Object>:: The constant to be converted to the thor path.
     #
@@ -115,7 +113,7 @@ class Thor
     # Thor::Error:: raised if the namespace evals to a class which does not
     #               inherit from Thor or Thor::Group.
     #
-    def self.namespace_to_thor_class(namespace)
+    def self.namespace_to_thor_class(namespace, raise_if_nil=true)
       klass, task_name = Thor::Util.find_by_namespace(namespace), nil
 
       if klass.nil? && namespace.include?(?:)
@@ -124,7 +122,7 @@ class Thor
         klass     = Thor::Util.find_by_namespace(namespace.join(":"))
       end
 
-      raise Error, "could not find Thor class or task '#{namespace}'" unless klass
+      raise Error, "could not find Thor class or task '#{namespace}'" if raise_if_nil && klass.nil?
 
       return klass, task_name
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: josevalim-thor
 version: !ruby/object:Gem::Version 
-  version: 0.10.20
+  version: 0.10.21
 platform: ruby
 authors: 
 - Yehuda Katz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-29 00:00:00 -07:00
+date: 2009-06-30 00:00:00 -07:00
 default_executable: 
 dependencies: []