advance 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 842391aeff4f6050e96a64caee6e31d599d9052639936baab5f50acefcac976c
-  data.tar.gz: 1034ef6eb9ce638ca3ca484064fcfec2e0cfc6cae47383e467fc37526a10badf
+  metadata.gz: d7f5948d846efa632c923c68ea86b89b1b785f6ffd58fda4f52fc0cac30579d1
+  data.tar.gz: c29928e7ed6662adb03144adf1029b2b5e834cfe3e2f90ee76babc007425646a
 SHA512:
-  metadata.gz: 6fb5dbf6d11989a1b7496ede0801fd8c43138194cf425cbbe5b7c05a9443c16f042e327348b19199458a50e4503b0033f55aaac2da79872fd3f7c19fbf057197
-  data.tar.gz: f19a3493ae52d4971fa907d736bcccaa2fd364e52814d55bfdf99ed0b679cd4438ff142904aef7d815f2201ef6581c9844ac742409b24175c61c67a1fccce48e
+  metadata.gz: 35da400978126d81ce5babf678b0ae68eb2c698fae75e39d28da4d4bdabd68dfc3294b3e7f44d045d5b612f614928e5c8027c1506a8bb2bae5eab72b4b9b3d26
+  data.tar.gz: 64d1afb3685a4bd9f2a70d7c07cdc1e0ff3f93c553ef3f82d6165ef92e8486622b0577a78f067ece3cdceeb39513ad73c85499396f732f81ddc87f0a433ce257

data/Gemfile.lock

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

data/README.md

@@ -102,18 +102,17 @@ Since your command is transforming data, you need a way to specify the input
 file or directory and the output file name. Advance provides a few tokens 
 that can be inserted in the command string for this purpose:
 
- * **`{previous_file}`** indicates the output file from the previous step when
-   the output of the previous step was a single output file. It is also used
+ * **`{input_file}`** indicates the output file from the previous. It is also used
    to indicate the first file to be used and it finds that file in the current 
    working dir.
- * **`{file_path}`** indicates an output file from the previous step when the
-   previous step generated multiple output files and the current step is a 
-   `multi` step.
- * **`{file}`** indicates an output file name, which is the basename from 
-   `{file_path}`. Commands often process multiple files from previous steps, 
+ * **`{file_name}`** indicates an output file name, which is the basename from 
+   `{input_file}`. Commands often process multiple files from previous steps, 
    generating multiple output files. Those output files are placed in the
    step directory.
- * **`{previous_dir}`** indicates the directory of the previous step.
+ * **`{file_name_without_extension}`** is, well, {file_name} with the 
+   extension removed. This is useful when you are transforming a file from
+   one type (with an extension) to another type, with a new extension.
+ * **`{input_dir}`** indicates the directory of the previous step.
  
 **Example Script**
 

data/lib/advance/version.rb

@@ -1,3 +1,3 @@
 module Advance
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/advance.rb

@@ -84,15 +84,15 @@ module Advance
 
   def single(command, previous_dir_path, dir_name)
     work_in_sub_dir(dir_name) do
-      if command =~ /\{previous_file\}/
-        command.gsub!("{previous_file}", previous_file_path(previous_dir_path))
-      end
-      if command =~ /\{previous_dir\}/
-        command.gsub!("{previous_dir}", previous_dir_path)
-      end
-      if command =~ /\{file\}/
-        command.gsub!("{file}", File.basename(previous_file_path(previous_dir_path)))
-      end
+      input_file_path = previous_file_path(previous_dir_path)
+      basename = File.basename(input_file_path)
+      root_file_name = basename.gsub(%r(\.[^.]+$), '')
+
+      command.gsub!("{input_dir}", previous_dir_path)
+      command.gsub!("{input_file}", input_file_path)
+      command.gsub!("{file_name}", basename)
+      command.gsub!("{file_name_without_extension}", root_file_name)
+
       do_command command
     end
   end
@@ -110,11 +110,14 @@ module Advance
       end
       TeamEffort.work(file_paths, $cores, progress_proc: progress_proc) do |file_path|
         begin
-          file = File.basename(file_path)
-          command.gsub!("{file_path}", file_path)
-          command.gsub!("{file}", file)
+          basename = File.basename(file_path)
+          root_file_name = basename.gsub(%r(\.[^.]+$), '')
+
+          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(file) do
+          work_in_sub_dir(basename) do
             do_command command, no_feedback
           end
         rescue

metadata

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