thor 0.9.8 → 0.9.9

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)
     
@@ -121,8 +132,8 @@ class Thor::Runner < Thor
     search = ".*#{search}" if options["substring"]
     search = /^#{search}.*/i
     group  = options[:group] || 'standard'
-    
-    classes = Thor.subclasses.select do |k| 
+
+    classes = Thor.subclasses.select do |k|
       (options[:all] || k.group_name == group) && 
       Thor::Util.constant_to_thor_path(k.name) =~ search
     end
@@ -154,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
@@ -252,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
@@ -272,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

@@ -62,10 +62,6 @@ class Thor
       @_full_opts ||= Options.new((klass.opts || {}).merge(@options))
     end
     
-    def options?
-      @options.kind_of?(Hash) && !@options.empty?
-    end
-
     def formatted_usage(namespace = false)
       (namespace ? self.namespace + ':' : '') + usage +
         (opts ? " " + opts.formatted_usage : "")
@@ -75,7 +71,6 @@ class Thor
 
     def parse_args(args)
       return [[], {}] if args.nil?
-      return [args, {}] unless options?
       hash = full_opts.parse(args)
       list = full_opts.non_opts
       [list, hash]

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

@@ -15,10 +15,24 @@ module ObjectSpace
 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
@@ -35,16 +49,20 @@ class Thor
       str.gsub(/:(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
     end
 
-    def self.constants_in_contents(str)
+    def self.constants_in_contents(str, file = __FILE__)
       klasses = ObjectSpace.classes.dup
-      Module.new.class_eval(str)
+      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)

metadata

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