@@ -127,7 +127,7 @@ class Thor @usage, @desc, @method_options = nil end - def register_klass_file(klass, file = caller[1].split(":")[0]) + def register_klass_file(klass, file = caller[1].match(/(.*):\d+/)[1]) unless self == Thor superclass.register_klass_file(klass, file) return lib/thor.rb @@ -9,23 +9,13 @@ require "pathname" class Thor::Runner < Thor def self.globs_for(path) - [ - "#{path}/Thorfile", - "#{path}/*.thor", - "#{path}/tasks/*.thor", - "#{path}/lib/tasks/*.thor" - ] + ["#{path}/Thorfile", "#{path}/*.thor", "#{path}/tasks/*.thor", "#{path}/lib/tasks/*.thor"] end - # Mappings for default tasks - map "-T" => :list, - "-i" => :install, - "-u" => :update + map "-T" => :list, "-i" => :install, "-u" => :update - desc "install NAME", - "install a Thor file into your system tasks, optionally named for future updates" - method_options :as => :optional, - :relative => :boolean + desc "install NAME", "install a Thor file into your system tasks, optionally named for future updates" + method_options :as => :optional, :relative => :boolean def install(name) initialize_thorfiles @@ -90,8 +80,7 @@ class Thor::Runner < Thor thor_yaml[as][:filename] # Indicate sucess end - desc "uninstall NAME", - "uninstall a named Thor module" + desc "uninstall NAME", "uninstall a named Thor module" def uninstall(name) raise Error, "Can't find module `#{name}'" unless thor_yaml[name] @@ -105,8 +94,7 @@ class Thor::Runner < Thor puts "Done." end - desc "update NAME", - "update a Thor file from its original location" + desc "update NAME", "update a Thor file from its original location" def update(name) raise Error, "Can't find module `#{name}'" if !thor_yaml[name] || !thor_yaml[name][:location] @@ -119,8 +107,7 @@ class Thor::Runner < Thor end end - desc "installed", - "list the installed Thor modules and tasks (--internal means list the built-in tasks as well)" + desc "installed", "list the installed Thor modules and tasks (--internal means list the built-in tasks as well)" method_options :internal => :boolean def installed thor_root_glob.each do |f| @@ -167,7 +154,23 @@ class Thor::Runner < Thor end def self.thor_root - File.join(ENV["HOME"] || ENV["APPDATA"], ".thor") + return File.join(ENV["HOME"], '.thor') if ENV["HOME"] + + if ENV["HOMEDRIVE"] && ENV["HOMEPATH"] then + return File.join(ENV["HOMEDRIVE"], ENV["HOMEPATH"], '.thor') + end + + return File.join(ENV["APPDATA"], '.thor') if ENV["APPDATA"] + + begin + File.expand_path("~") + rescue + if File::ALT_SEPARATOR then + "C:/" + else + "/" + end + end end def self.thor_root_glob lib/thor/runner.rb @@ -14,8 +14,8 @@ class Thor def self.install_task(spec) package_task spec - null, sudo, gem = RUBY_PLATFORM =~ /w(in)?32$/ ? ['NUL', '', 'gem.bat'] : - ['/dev/null', 'sudo', 'gem'] + null, sudo, gem = RUBY_PLATFORM =~ /mswin|mingw/ ? ['NUL', '', 'gem.bat'] : + ['/dev/null', 'sudo', 'gem'] desc "install", "install the gem" define_method :install do @@ -43,11 +43,12 @@ class Thor desc(name, "spec task") define_method(name) do - cmd = "ruby " + require 'rbconfig' + cmd = RbConfig::CONFIG['ruby_install_name'] << " " if rcov - cmd << "-S rcov -o #{rcov_dir} #{rcov_opts} " + cmd << "-S #{where('rcov')} -o #{rcov_dir} #{rcov_opts} " end - cmd << `which spec`.chomp + cmd << where('spec') cmd << " -- " if rcov cmd << " " cmd << file_list @@ -73,5 +74,13 @@ class Thor "--#{key} #{value.inspect}" end end.join(" ") - end + end + + def where(file) + ENV['PATH'].split(File::PATH_SEPARATOR).each do |path| + file_with_path = File.join(path, file) + next unless File.exist?(file_with_path) && File.executable?(file_with_path) + return File.expand_path(file_with_path) + end + end end lib/thor/tasks.rb 40f66fb76c9a440ea20457bad5d31ce2770bfcc9 d95def274d2e5c94d1d97f0338dc08a9feb3bb4e James Herdman james.herdman@gmail.com http://github.com/wycats/thor/commit/867e912ad9da417e273615e69b1c97b66e210748 867e912ad9da417e273615e69b1c97b66e210748 2009-02-04T17:14:39-08:00 2009-02-04T17:14:39-08:00 Bring Thor inline with Wycats a71ac73188e9d3af3c012a7d43a10cc59c2c0402 James Herdman james.herdman@gmail.com