advance 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b166e2a0085ffed66ce977b7132e7bfbe889b626
-  data.tar.gz: 6edbd6f384d97b5343ae02e9973eed99d43c5e7b
+  metadata.gz: d7b1b12dbeb531d66a40b83bfffeaa3397575901
+  data.tar.gz: ea187e16e67de40ecdb17568e13a31e4da72b281
 SHA512:
-  metadata.gz: b8c2c740c5b7bd7e71bb63e8de4038489373ce85b134d0721e986628b333ce4d68d444ebf59732b65227baf72f1b3e983885b5d2a0847fd65689d60e8c0f90f5
-  data.tar.gz: 4d6228006af6bb753e8dc6dccbfc697c3df444ef405b8d694189e4f3428d9fc0aa142bb1f3f840220791106a9ba9f146b6722993c281055c5028559faa2ed973
+  metadata.gz: a6af8adf8ea0c2ffae6c73d0ad1e36761f1877ea1916a7dff7b994d2ae8b5ec6eac4f4f5c04ed66a56658a71a74643375e232f93465011d134dd92f2f2416ea8
+  data.tar.gz: 4ce3b33cc80446665a4e823d5feca4a2b3f8f6e20038da63d945f9bc41b124141517467517f2bf0d9f5260e96c6d53879edc42350a78a129b3a86317a7e5a88f

data/Gemfile.lock

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

data/README.md

@@ -139,15 +139,6 @@ When running your pipeline, it is helpful to have a directory with the single, i
 1. Move to your data directory with your single initial file.
 2. invoke your script from there.
 
-## Questions / Answers
-
- * Q: **My script fails with `undefined local variable or method 'label' for main:Object`**  
-
-   A: This indicates a ruby script is running that does not have access to a ruby gem.
-      First, make sure your script is using the expected ruby by adding to the beginning of your
-      script `puts RUBY_VERSION`. Make sure the gem is installed by listing installed gems with 
-      `$ gem list`. Finally, check that the script requires the library with `require 'my-library'` 
-   
 ## Contributing
 
 We ♥️ contributions!

data/lib/advance/version.rb

@@ -1,3 +1,3 @@
 module Advance
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

data/lib/advance.rb

@@ -107,7 +107,14 @@ module Advance
   end
 
   def work_in_sub_dir(dir_name, existing_message = nil)
-    return if Dir.exist? dir_name
+    if $redo_mode == :checking && Dir.exist?(dir_name)
+      return :checking
+    end
+
+    if Dir.exist? dir_name
+      puts "reprocessing #{dir_name}"
+      FileUtils.rm_rf dir_name
+    end
 
     tmp_dir_name = "tmp_#{dir_name}"
     FileUtils.rm_rf tmp_dir_name
@@ -118,6 +125,7 @@ module Advance
 
     FileUtils.cd ".."
     FileUtils.mv tmp_dir_name, dir_name
+    :replacing
   end
 
   def step_dir_prefix(step_no)
@@ -125,13 +133,14 @@ module Advance
   end
 
   def step(label)
+    $redo_mode ||= :checking
     $step ||= 0
     $step += 1
     dir_name = "#{step_dir_prefix($step)}_#{label}"
     $previous_dir = File.join(FileUtils.pwd, dir_name)
     puts "#{CYAN}step #{$step} #{label}#{WHITE}... #{RESET}"
 
-    work_in_sub_dir(dir_name, "#{GREEN}OK#{RESET}") do
+    $redo_mode = work_in_sub_dir(dir_name, "#{GREEN}OK#{RESET}") do
       yield
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: advance
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - janemacfarlane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-19 00:00:00.000000000 Z
+date: 2019-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: team_effort