advance 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d598fdb8c38b12f9946058d06f4904f8c4e279c5973d7173061869ebeb8e4db8
-  data.tar.gz: b37c176948435b13ee2a494e5e0973fd14d5660e3bbe1da3c419b5a7328286b5
+  metadata.gz: f48f7f4d8486419b770c7b1e76f3f6b8186bd31d3f21503f8e8c65b29ec748ee
+  data.tar.gz: b5d0d902388a22d2813d6f261f31f0596d2c09e96d9536241c868e04b8e84c59
 SHA512:
-  metadata.gz: 991cbfc6556e45618971ab059c8bb8a23a106abf73d86f3f1409d47ce03920b7b5ab67287bbb43a920f6443bafe0e18e71c3890b381e89e8da9c2bd828f0cbb0
-  data.tar.gz: 3054fb61cf64fe18e12e203fd97ebc49cc54d846e2ad28a46269128041c9e4e4785cac92d5560acdc102a0450460df8dd2b5b944b3756a7ab3b0fc315371a758
+  metadata.gz: 99f79946945bb30f660125c5d615a060fbd9cb32e2d994c5912076fc7f0e5bb01ee3df0cb3a9d874d0dd4f6980db527df2666fe07d4b547e4d5421841cf0d37e
+  data.tar.gz: 955ce588e7a118f4709783898faab44789a7d37355e82bf793fc812dcb8f711d6c3ea463d384ce7fc118ed9d1af4e39cf7fc85043f088d11b826a27bb0e30e43

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    advance (0.3.3)
+    advance (0.3.4)
       team_effort
 
 GEM

data/lib/advance/version.rb

@@ -1,3 +1,3 @@
 module Advance
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/lib/advance.rb

@@ -176,14 +176,18 @@ module Advance
       end
       TeamEffort.work(file_paths, $cores, progress_proc: progress_proc) do |file_path|
         begin
+          path_relative_to_step_dir = File.dirname(file_path.gsub(%r(^#{previous_dir_path}/?), ""))
+          path_relative_to_step_dir = path_relative_to_step_dir == "." ? "" : path_relative_to_step_dir
           basename = File.basename(file_path)
+          new_dir_name = path_relative_to_step_dir == "" ? basename : File.join(path_relative_to_step_dir, basename)
           root_file_name = basename.gsub(%r(\.[^.]+$), '')
 
+          command.gsub!("{input_dir}", File.dirname(file_path))
           command.gsub!("{input_file}", file_path)
           command.gsub!("{file_name}", basename)
           command.gsub!("{file_name_without_extension}", root_file_name)
           puts "#{YELLOW}#{command}#{RESET}"
-          work_in_sub_dir(basename) do
+          work_in_sub_dir(new_dir_name) do
             do_command command, no_feedback
           end
         rescue
@@ -195,6 +199,7 @@ module Advance
   end
 
   def work_in_sub_dir(dir_name)
+    starting_dir = FileUtils.pwd
     stripped_dir_name = strip_extensions(dir_name)
     if $redo_mode == :checking && Dir.exist?(stripped_dir_name)
       return
@@ -202,15 +207,17 @@ module Advance
 
     $redo_mode = :replacing
 
-    tmp_dir_name = "tmp_#{stripped_dir_name}"
-    FileUtils.rm_rf tmp_dir_name
-    FileUtils.mkdir_p tmp_dir_name
-    FileUtils.cd tmp_dir_name
+    dirs = File.split(stripped_dir_name)
+    dirs[-1] = "tmp_#{dirs[-1]}"
+    tmp_dir = File.join(dirs)
+    FileUtils.rm_rf tmp_dir
+    FileUtils.mkdir_p tmp_dir
+    FileUtils.cd tmp_dir
 
     yield
 
-    FileUtils.cd ".."
-    FileUtils.mv tmp_dir_name, stripped_dir_name
+    FileUtils.cd starting_dir
+    FileUtils.mv tmp_dir, stripped_dir_name
   end
 
   def strip_extensions(dir_name)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: advance
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - janemacfarlane