thor 0.9.5 → 0.9.9

data/CHANGELOG.rdoc

@@ -5,6 +5,23 @@
 * Improve help output to list shorthand switches, too
 * Investigate and fix deep namespacing ("foo:bar:baz") issues
 
+== 0.9.8, released 2008-10-20
+
+* Fixed some tiny issues that were introduced lately.
+
+== 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/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

@@ -18,8 +18,17 @@ class Thor::Runner < Thor
   method_options :as => :optional, :relative => :boolean
   def install(name)
     initialize_thorfiles
+
+    base = name
+    package = :file
+
     begin
-      contents = open(name).read
+      if File.directory?(File.expand_path(name))
+        base, package = File.join(name, "main.thor"), :directory
+        contents = open(base).read
+      else
+        contents = open(name).read
+      end
     rescue OpenURI::HTTPError
       raise Error, "Error opening URI `#{name}'"
     rescue Errno::ENOENT
@@ -35,9 +44,7 @@ class Thor::Runner < Thor
     
     return false unless response =~ /^\s*y/i
     
-    constants = Thor::Util.constants_in_contents(contents)
-    
-    # name = name =~ /\.thor$/ || is_uri ? name : "#{name}.thor"
+    constants = Thor::Util.constants_in_contents(contents, base)
     
     as = options["as"] || begin
       first_line = contents.split("\n")[0]
@@ -63,8 +70,12 @@ class Thor::Runner < Thor
     
     puts "Storing thor file in your system repository"
     
-    File.open(File.join(thor_root, yaml[as][:filename]), "w") do |file|
-      file.puts contents
+    destination = File.join(thor_root, yaml[as][:filename])
+    
+    if package == :file
+      File.open(destination, "w") {|f| f.puts contents }
+    else
+      FileUtils.cp_r(name, destination)
     end
     
     yaml[as][:filename] # Indicate sucess
@@ -78,7 +89,7 @@ class Thor::Runner < Thor
     puts "Uninstalling #{name}."
     
     file = File.join(thor_root, "#{yaml[name][:filename]}")
-    File.delete(file)
+    FileUtils.rm_rf(file)
     yaml.delete(name)
     save_yaml(yaml)
     
@@ -92,7 +103,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 +124,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
-    
-    display_klasses(false, Thor.subclasses.select {|k| 
-      Thor::Util.constant_to_thor_path(k.name) =~ search})
+    group  = options[:group] || 'standard'
+
+    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
@@ -148,7 +165,10 @@ class Thor::Runner < Thor
     #   C:\Documents and Settings\james\.thor
     #
     # If we don't #gsub the \ character, Dir.glob will fail.
-    Dir["#{thor_root.gsub(/\\/, '/')}/**/*"]
+    files = Dir["#{thor_root.gsub(/\\/, '/')}/*"]
+    files.map! do |file|
+      File.directory?(file) ? File.join(file, "main.thor") : file
+    end
   end
   
   private
@@ -176,7 +196,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
@@ -194,9 +214,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 +225,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
 
@@ -226,8 +266,9 @@ class Thor::Runner < Thor
   end
   
   def load_thorfile(path)
+    txt = File.read(path)
     begin
-      load path
+      Thor::Tasks.class_eval txt, path
     rescue Object => e
       $stderr.puts "WARNING: unable to load thorfile #{path.inspect}: #{e.message}"
     end
@@ -246,8 +287,12 @@ class Thor::Runner < Thor
 
     # We want to load system-wide Thorfiles first
     # so the local Thorfiles will override them.
-    (relevant_to ? thorfiles_relevant_to(relevant_to) :
+    files = (relevant_to ? thorfiles_relevant_to(relevant_to) :
      thor_root_glob) + thorfiles - ["#{thor_root}/thor.yml"]
+     
+    files.map! do |file|
+      File.directory?(file) ? File.join(file, "main.thor") : file
+    end
   end
 
   def thorfiles_relevant_to(meth)

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,9 +55,13 @@ 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 formatted_usage(namespace = false)
       (namespace ? self.namespace + ':' : '') + usage +
         (opts ? " " + opts.formatted_usage : "")
@@ -59,9 +70,9 @@ class Thor
     protected
 
     def parse_args(args)
-      return [args, {}] unless opts
-      hash = opts.parse(args)
-      list = opts.non_opts
+      return [[], {}] if args.nil?
+      hash = full_opts.parse(args)
+      list = full_opts.non_opts
       [list, hash]
     end
   end

data/lib/thor/tasks.rb

@@ -22,7 +22,7 @@ class Thor
       old_stderr, $stderr = $stderr.dup, File.open(null, "w")
       package
       $stderr = old_stderr
-      system %{#{sudo} #{gem} install pkg/#{spec.name}-#{spec.version} --no-rdoc --no-ri --no-update-sources}
+      system %{#{sudo} #{Gem.ruby} -S #{gem} install pkg/#{spec.name}-#{spec.version} --no-rdoc --no-ri --no-update-sources}
     end
   end
   

data/lib/thor/util.rb

@@ -1,10 +1,38 @@
 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 Tasks; end
+  
   module Util
     
+    def self.full_const_get(obj, name)
+      list = name.split("::")
+      list.shift if list.first.empty?
+      list.each do |x| 
+        # This is required because const_get tries to look for constants in the 
+        # ancestor chain, but we only want constants that are HERE
+        obj = obj.const_defined?(x) ? obj.const_get(x) : obj.const_missing(x)
+      end
+      obj
+    end
+    
     def self.constant_to_thor_path(str, remove_default = true)
-      str = snake_case(str.to_s).squeeze(":")
+      str = str.to_s.gsub(/^Thor::Tasks::/, "")
+      str = snake_case(str).squeeze(":")
       str.gsub!(/^default/, '') if remove_default
       str
     end
@@ -21,16 +49,20 @@ class Thor
       str.gsub(/:(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
     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
+    def self.constants_in_contents(str, file = __FILE__)
+      klasses = ObjectSpace.classes.dup
+      Module.new.class_eval(str, file)
+      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)
-      list = str.split("::").inject(Object) {|obj, x| obj.const_get(x)}
+    def self.make_constant(str, base = [Thor::Tasks, Object])
+      which = base.find do |obj|
+        full_const_get(obj, str) rescue nil
+      end
+      return full_const_get(which, str) if which
+      raise NameError, "uninitialized constant #{str}"
     end
     
     def self.snake_case(str)

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thor
 version: !ruby/object:Gem::Version 
-  version: 0.9.5
+  version: 0.9.9
 platform: ruby
 authors: 
 - Yehuda Katz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-27 00:00:00 +02:00
+date: 2008-12-15 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -22,8 +22,8 @@ extensions: []
 
 extra_rdoc_files: 
 - README.markdown
-- CHANGELOG.rdoc
 - LICENSE
+- CHANGELOG.rdoc
 files: 
 - README.markdown
 - LICENSE
@@ -65,7 +65,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: thor
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: A gem that maps options to a class