josevalim-thor 0.10.25 → 0.10.26

data/lib/thor/actions.rb

@@ -163,7 +163,7 @@ class Thor
     #
     def run(command, log_status=true)
       return unless behavior == :invoke
-      say_status :run, "#{command} from #{relative_to_absolute_root(root, false)}", log_status
+      say_status :run, "\"#{command}\" from #{relative_to_absolute_root(root, false)}", log_status
       `#{command}` unless options[:pretend]
     end
 

data/lib/thor/util.rb

@@ -162,26 +162,32 @@ class Thor
       yaml_changed
     end
 
+    def self.user_home
+      @@user_home ||= if ENV["HOME"]
+        ENV["HOME"]
+      elsif ENV["USERPROFILE"]
+        ENV["USERPROFILE"]
+      elsif ENV["HOMEDRIVE"] && ENV["HOMEPATH"]
+        File.join(ENV["HOMEDRIVE"], ENV["HOMEPATH"])
+      elsif ENV["APPDATA"]
+        ENV["APPDATA"]
+      else
+        begin
+          File.expand_path("~")
+        rescue
+          if File::ALT_SEPARATOR
+            "C:/"
+          else
+            "/"
+          end
+        end
+      end
+    end
+
     # Returns the root where thor files are located, dependending on the OS.
     #
     def self.thor_root
-      return File.join(ENV["HOME"], '.thor') if ENV["HOME"]
-
-      if ENV["HOMEDRIVE"] && ENV["HOMEPATH"]
-        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
-          "C:/"
-        else
-          "/"
-        end
-      end
+      File.join(user_home, ".thor")
     end
 
     # Returns the files in the thor root. On Windows thor_root will be something

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: josevalim-thor
 version: !ruby/object:Gem::Version 
-  version: 0.10.25
+  version: 0.10.26
 platform: ruby
 authors: 
 - Yehuda Katz