wycats-thor 0.9.5 → 0.9.6

data/lib/thor.rb

@@ -22,6 +22,14 @@ class Thor
     @usage, @desc = usage, description
   end
   
+  def self.group(name)
+    @group_name = name.to_s
+  end
+  
+  def self.group_name
+    @group_name || 'standard'
+  end
+  
   def self.method_options(opts)
     @method_options = opts
   end
@@ -80,7 +88,7 @@ class Thor
 
     def method_added(meth)
       meth = meth.to_s
-
+      
       if meth == "initialize"
         @opts = @method_options
         @method_options = nil
@@ -90,7 +98,12 @@ class Thor
       return if !public_instance_methods.include?(meth) || !@usage
       register_klass_file self
 
-      tasks[meth] = Task.new(meth, @desc, @usage, @method_options)
+      if !self.opts.empty? || @method_options
+        task_options = self.opts.merge(@method_options || {})
+      else
+        task_options = nil
+      end
+      tasks[meth] = Task.new(meth, @desc, @usage, task_options)
 
       @usage, @desc, @method_options = nil
     end

data/lib/thor/options.rb

@@ -167,7 +167,7 @@ class Thor
         else
           sample = @defaults[undasherize(opt)]
           sample ||= case type
-            when :optional then opt.gsub(/\-/, "").upcase
+            when :optional then undasherize(opt).gsub(/\-/, "_").upcase
             when :numeric  then "N"
             end
           "[" + opt + "=" + sample.to_s + "]"

data/lib/thor/runner.rb

@@ -113,14 +113,20 @@ class Thor::Runner < Thor
   end
   
   desc "list [SEARCH]", "list the available thor tasks (--substring means SEARCH can be anywhere in the module)"
-  method_options :substring => :boolean
+  method_options :substring => :boolean,
+                 :group => :optional,
+                 :all => :boolean
   def list(search = "")
     initialize_thorfiles
     search = ".*#{search}" if options["substring"]
     search = /^#{search}.*/i
+    group  = options[:group] || 'standard'
     
-    display_klasses(false, Thor.subclasses.select {|k| 
-      Thor::Util.constant_to_thor_path(k.name) =~ search})
+    classes = Thor.subclasses.select do |k| 
+      (options[:all] || k.group_name == group) && 
+      Thor::Util.constant_to_thor_path(k.name) =~ search
+    end
+    display_klasses(false, classes)
   end
 
   # Override Thor#help so we can give info about not-yet-loaded tasks
@@ -176,7 +182,7 @@ class Thor::Runner < Thor
     raise Error, "No Thor tasks available" if klasses.empty?
     
     if with_modules && !(yaml = thor_yaml).empty?
-      max_name = yaml.max {|(xk,xv),(yk,yv)| xk.size <=> yk.size }.first.size
+      max_name = yaml.max {|(xk,xv),(yk,yv)| xk.to_s.size <=> yk.to_s.size }.first.size
       modules_label = "Modules"
       namespaces_label = "Namespaces"
       column_width = [max_name + 4, modules_label.size + 1].max

data/lib/thor/util.rb

@@ -1,5 +1,19 @@
 require 'thor/error'
 
+module ObjectSpace
+  
+  class << self
+
+    # @return <Array[Class]> All the classes in the object space.
+    def classes
+      klasses = []
+      ObjectSpace.each_object(Class) {|o| klasses << o}
+      klasses
+    end
+  end
+  
+end
+
 class Thor
   module Util
     
@@ -22,11 +36,11 @@ class Thor
     end
 
     def self.constants_in_contents(str)
-      klasses = self.constants.dup
-      eval(str)
-      ret = self.constants - klasses
-      ret.each {|k| self.send(:remove_const, k)}
-      ret
+      klasses = ObjectSpace.classes.dup
+      Module.new.class_eval(str)
+      klasses = ObjectSpace.classes - klasses
+      klasses = klasses.select {|k| k < Thor }
+      klasses.map! {|k| k.to_s.gsub(/#<Module:\w+>::/, '')}
     end
 
     def self.make_constant(str)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: wycats-thor
 version: !ruby/object:Gem::Version 
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors: 
 - Yehuda Katz