josevalim-thor 0.10.3 → 0.10.4

data/lib/thor/actions/directory.rb

@@ -46,13 +46,11 @@ class Thor
 
       def invoke!
         Dir[File.join(source, '**', '*')].each do |file_source|
-          file_destination = File.join(relative_destination, file_source.gsub(source, ''))
+          file_destination = File.join(given_destination, file_source.gsub(source, '.'))
 
           if File.directory?(file_source)
             base.empty_directory(file_destination, @log_status)
           elsif file_source !~ /\.empty_directory$/
-            file_source.gsub!(base.source_root, '.')
-
             if file_source =~ /\.tt$/
               base.template(file_source, file_destination[0..-4], @log_status)
             else

data/lib/thor/actions/templater.rb

@@ -8,7 +8,7 @@ class Thor
     # by Jonas Nicklas and Michael S. Klishin under MIT LICENSE.
     #
     class Templater #:nodoc:
-      attr_reader :base, :source, :destination, :relative_destination
+      attr_reader :base, :source, :destination, :given_destination, :relative_destination
 
       # Initializes given the source and destination.
       #
@@ -86,20 +86,45 @@ class Thor
           !respond_to?(:render)
         end
 
-        # Sets the source value from a relative source value.
+        # Sets the absolute source value from a relative source value. Notice
+        # that we need to take into consideration both the source_root as the
+        # relative_root.
+        #
+        # Let's suppose that we are on the directory "dest", with source root set
+        # to "source" and with the following scenario:
+        #
+        #   inside "bar" do
+        #     copy_file "baz.rb"
+        #   end
+        #
+        # In this case, the user wants to copy the file at "source/bar/baz.rb"
+        # to "dest/bar/baz.rb". If we don't take into account the relative_root
+        # (in this case, "bar"), it would copy the contents at "source/baz.rb".
         #
         def source=(source)
           if source
-            @source = ::File.expand_path(source.to_s, base.source_root)
+            @source = ::File.expand_path(source.to_s, File.join(base.source_root, base.relative_root))
           end
         end
 
-        # Sets the destination value from a relative destination value. The
-        # relative destination is kept to be used in output messages.
+        # Sets the absolute destination value from a relative destination value.
+        # It also stores the given and relative destination. Let's suppose our
+        # script is being executed on "dest", it sets the destination root to
+        # "dest". The destination, given_destination and relative_destination
+        # are related in the following way:
+        #
+        #   inside "bar" do
+        #     empty_directory "baz"
+        #   end
+        #
+        #   destination          #=> dest/bar/baz
+        #   relative_destination #=> bar/baz
+        #   given_destination    #=> baz
         #
         def destination=(destination)
           if destination
-            @destination = ::File.expand_path(convert_encoded_instructions(destination.to_s), base.destination_root)
+            @given_destination = convert_encoded_instructions(destination.to_s)
+            @destination = ::File.expand_path(@given_destination, base.destination_root)
             @relative_destination = base.relative_to_absolute_root(@destination)
           end
         end

data/lib/thor/actions.rb

@@ -82,12 +82,22 @@ class Thor
       @root_stack[0] = File.expand_path(root || '')
     end
 
+    # Gets the current root relative to the absolute root.
+    #
+    #   inside "foo" do
+    #     relative_root #=> "foo"
+    #   end
+    #
+    def relative_root(remove_dot=true)
+      relative_to_absolute_root(root, remove_dot)
+    end
+
     # Returns the given path relative to the absolute root (ie, root where
     # the script started).
     #
     def relative_to_absolute_root(path, remove_dot=true)
       path = path.gsub(@root_stack[0], '.')
-      remove_dot ? path[2..-1] : path
+      remove_dot ? (path[2..-1] || '') : path
     end
 
     # Get the source root in the class. Raises an error if a source root is

metadata

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