advance 0.1.13 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6b4874cc32a71d6f9508975d5be54f4bf14ed6b3
-  data.tar.gz: 105e62fdc6a1de857bd88b2d2d3d34766a96839a
+SHA256:
+  metadata.gz: 842391aeff4f6050e96a64caee6e31d599d9052639936baab5f50acefcac976c
+  data.tar.gz: 1034ef6eb9ce638ca3ca484064fcfec2e0cfc6cae47383e467fc37526a10badf
 SHA512:
-  metadata.gz: 82b976e4783a3fdaed9c0f1393f495f30c2e931208dc6e664783cc03eb4aab5dd437932a10b345ac4e17b868311db2d009f247b5261207a8f2735fed40d40ac5
-  data.tar.gz: 88bc243a5d86c794c544b0a7faceae599bfb1dc669c383655f5ab8b5093e1c08842a45302d2fbd80c220019d6b41ef441df484508bf69fa3fb6382112dd5d745
+  metadata.gz: 6fb5dbf6d11989a1b7496ede0801fd8c43138194cf425cbbe5b7c05a9443c16f042e327348b19199458a50e4503b0033f55aaac2da79872fd3f7c19fbf057197
+  data.tar.gz: f19a3493ae52d4971fa907d736bcccaa2fd364e52814d55bfdf99ed0b679cd4438ff142904aef7d815f2201ef6581c9844ac742409b24175c61c67a1fccce48e

data/Gemfile.lock

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

data/lib/advance/version.rb

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

data/lib/advance.rb

@@ -1,5 +1,6 @@
-require "advance/version"
+require_relative "./advance/version"
 require "find"
+require "fileutils"
 require "open3"
 require "team_effort"
 
@@ -18,6 +19,8 @@ module Advance
   WHITE="\e[1;37m"
   YELLOW="\e[33m"
 
+  puts "loading module"
+
   def advance(processing_mode, label, command)
     $redo_mode ||= :checking
     $step ||= 0
@@ -32,7 +35,7 @@ module Advance
 
     clean_previous_step_dirs(dir_prefix)
 
-    send(processing_mode, label, command, previous_dir_path, dir_prefix, dir_name)
+    send(processing_mode, command, previous_dir_path, dir_name)
   end
 
   def static(processing_mode, label, command)
@@ -46,7 +49,7 @@ module Advance
 
     FileUtils.rm_rf dir_name
 
-    send(processing_mode, label, command, previous_dir_path, dir_prefix, dir_name)
+    send(processing_mode, command, previous_dir_path, dir_name)
   end
 
   def get_previous_dir_path
@@ -79,7 +82,7 @@ module Advance
     dirs.find { |d| d =~ /^#{dir_prefix}/ }
   end
 
-  def single(label, command, previous_dir_path, dir_prefix, dir_name)
+  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))
@@ -94,7 +97,7 @@ module Advance
     end
   end
 
-  def multi(label, command, previous_dir_path, dir_prefix, dir_name)
+  def multi(command, previous_dir_path, dir_name)
     no_feedback = false
     work_in_sub_dir(dir_name) do
       file_paths = Find.find(previous_dir_path).reject { |path| FileTest.directory?(path) || File.basename(path) == "log" }
@@ -108,8 +111,8 @@ module Advance
       TeamEffort.work(file_paths, $cores, progress_proc: progress_proc) do |file_path|
         begin
           file = File.basename(file_path)
-          command.gsub!("{file_path}", file_path) unless $step == 1
-          command.gsub!("{file}", file) unless $step == 1
+          command.gsub!("{file_path}", file_path)
+          command.gsub!("{file}", file)
           puts "#{YELLOW}#{command}#{RESET}"
           work_in_sub_dir(file) do
             do_command command, no_feedback
@@ -123,13 +126,14 @@ module Advance
   end
 
   def work_in_sub_dir(dir_name)
-    if $redo_mode == :checking && Dir.exist?(dir_name)
+    stripped_dir_name = strip_extensions(dir_name)
+    if $redo_mode == :checking && Dir.exist?(stripped_dir_name)
       return
     end
 
     $redo_mode = :replacing
 
-    tmp_dir_name = "tmp_#{dir_name}"
+    tmp_dir_name = "tmp_#{stripped_dir_name}"
     FileUtils.rm_rf tmp_dir_name
     FileUtils.mkdir_p tmp_dir_name
     FileUtils.cd tmp_dir_name
@@ -137,7 +141,31 @@ module Advance
     yield
 
     FileUtils.cd ".."
-    FileUtils.mv tmp_dir_name, dir_name
+    FileUtils.mv tmp_dir_name, stripped_dir_name
+  end
+
+  def strip_extensions(dir_name)
+    extensions = %w(
+      csv
+      csv_nh
+      geo_json
+      geojson
+      gz
+      json
+      tar
+      tgz
+      zip
+    )
+
+    changed_dir_name = dir_name
+    last_dir_name = nil
+    until last_dir_name == changed_dir_name do
+      last_dir_name = changed_dir_name
+      extensions.each do |extension|
+        changed_dir_name = changed_dir_name.gsub(%r(\.#{extension}$), "")
+      end
+    end
+    changed_dir_name
   end
 
   def previous_file_path(previous_dir_path)
@@ -173,11 +201,6 @@ module Advance
     end
   end
 
-  # def find_step_dir
-  #   dirs = Dir.entries(".")
-  #   dirs.find { |d| d =~ /^#{step_dir_prefix($step)}/ }
-  # end
-  #
   def ensure_bin_on_path
     advance_path = File.dirname(__FILE__)
     add_dir_to_path(advance_path)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: advance
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.2.0
 platform: ruby
 authors:
 - janemacfarlane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-23 00:00:00.000000000 Z
+date: 2019-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: team_effort
@@ -124,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: A framework for building data transformation pipelines