thor 0.9.6 → 0.9.7

data/CHANGELOG.rdoc

@@ -5,6 +5,19 @@
 * Improve help output to list shorthand switches, too
 * Investigate and fix deep namespacing ("foo:bar:baz") issues
 
+== 0.9.7, released 2008-10-13
+
+* Setting global method options on the initialize method works as expected:
+  All other tasks will accept these global options in addition to their own.
+* Added 'group' notion to Thor task sets (class Thor); by default all tasks
+  are in the 'standard' group. Running 'thor -T' will only show the standard
+  tasks - adding --all will show all tasks. You can also filter on a specific
+  group using the --group option: thor -T --group advanced
+  
+== 0.9.6, released 2008-09-13
+
+* Generic improvements
+
 == 0.9.5, released 2008-08-27
 
 * Improve Windows compatibility

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

data/lib/thor/options.rb

@@ -65,6 +65,8 @@ class Thor
     def initialize(switches)
       @defaults = {}
       @shorts = {}
+      
+      @leading_non_opts, @trailing_non_opts = [], []
 
       @switches = switches.inject({}) do |mem, (name, type)|
         if name.is_a?(Array)
@@ -167,13 +169,15 @@ 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 + "]"
         end
       end.join(" ")
     end
+    
+    alias :to_s :formatted_usage
 
     private
     

data/lib/thor/runner.rb

@@ -92,7 +92,7 @@ class Thor::Runner < Thor
 
     puts "Updating `#{name}' from #{yaml[name][:location]}"
     old_filename = yaml[name][:filename]
-    options["as"] = name
+    self.options = self.options.merge("as" => name)
     filename = install(yaml[name][:location])
     unless filename == old_filename
       File.delete(File.join(thor_root, old_filename))
@@ -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
@@ -194,9 +200,6 @@ class Thor::Runner < Thor
       puts
     end
     
-    puts "Tasks"
-    puts "-----"
-    
     # Calculate the largest base class name
     max_base = klasses.max do |x,y| 
       Thor::Util.constant_to_thor_path(x.name).size <=> Thor::Util.constant_to_thor_path(y.name).size
@@ -208,16 +211,39 @@ class Thor::Runner < Thor
     end
     
     max_left = max_left_item.maxima.usage + max_left_item.maxima.opt
-        
-    klasses.each {|k| display_tasks(k, max_base, max_left)}
+    
+    unless klasses.empty?
+      puts # add some spacing
+      klasses.each { |k| display_tasks(k, max_base, max_left); }
+    else
+      puts "\033[1;34mNo Thor tasks available\033[0m"
+    end
   end  
   
   def display_tasks(klass, max_base, max_left)
-    base = Thor::Util.constant_to_thor_path(klass.name)
-    klass.tasks.each true do |name, task|
-      format_string = "%-#{max_left + max_base + 5}s"
-      print format_string % task.formatted_usage(true)
-      puts task.description
+    if klass.tasks.values.length > 1
+      
+      base = Thor::Util.constant_to_thor_path(klass.name)
+      
+      if base.to_a.empty?
+        base = 'default' 
+        puts "\033[1;35m#{base}\033[0m"
+      else
+        puts "\033[1;34m#{base}\033[0m"
+      end
+      puts "-" * base.length
+      
+      klass.tasks.each true do |name, task|
+        format_string = "%-#{max_left + max_base + 5}s"
+        print format_string % task.formatted_usage(true)
+        puts task.description
+      end
+      
+      unless klass.opts.empty?
+        puts "\nglobal options: #{Options.new(klass.opts)}"
+      end
+      
+      puts # add some spacing
     end
   end
 

data/lib/thor/task.rb

@@ -3,9 +3,16 @@ require 'thor/util'
 
 class Thor
   class Task < Struct.new(:meth, :description, :usage, :opts, :klass)
+    
     def self.dynamic(meth, klass)
       new(meth, "A dynamically-generated task", meth.to_s, nil, klass)
     end
+    
+    def initialize(*args)
+      # keep the original opts - we need them later on
+      @options = args[3] || {}
+      super
+    end
 
     def parse(obj, args)
       list, hash = parse_args(args)
@@ -48,7 +55,15 @@ class Thor
     
     def opts
       return super unless super.kind_of? Hash
-      self.opts = Options.new(super)
+      @_opts ||= Options.new(super)
+    end
+        
+    def full_opts
+      @_full_opts ||= Options.new((klass.opts || {}).merge(@options))
+    end
+    
+    def options?
+      @options.kind_of?(Hash)
     end
 
     def formatted_usage(namespace = false)
@@ -59,9 +74,9 @@ class Thor
     protected
 
     def parse_args(args)
-      return [args, {}] unless opts
-      hash = opts.parse(args)
-      list = opts.non_opts
+      return [args, {}] unless options?
+      hash = full_opts.parse(args)
+      list = full_opts.non_opts
       [list, hash]
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thor
 version: !ruby/object:Gem::Version 
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors: 
 - Yehuda Katz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-12 00:00:00 -07:00
+date: 2008-10-13 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -65,7 +65,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: thor
-rubygems_version: 1.2.0
+rubygems_version: 1.3.0
 signing_key: 
 specification_version: 2
 summary: A gem that maps options to a class