advance 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7f5948d846efa632c923c68ea86b89b1b785f6ffd58fda4f52fc0cac30579d1
-  data.tar.gz: c29928e7ed6662adb03144adf1029b2b5e834cfe3e2f90ee76babc007425646a
+  metadata.gz: 961d5cc4a945b3b3bf404f27ad1e16119d437fec4abce4d21413374087c80e5e
+  data.tar.gz: aa4259e85e69a968a0564529433751f6a244ce1257206f7b9b048d182d85944e
 SHA512:
-  metadata.gz: 35da400978126d81ce5babf678b0ae68eb2c698fae75e39d28da4d4bdabd68dfc3294b3e7f44d045d5b612f614928e5c8027c1506a8bb2bae5eab72b4b9b3d26
-  data.tar.gz: 64d1afb3685a4bd9f2a70d7c07cdc1e0ff3f93c553ef3f82d6165ef92e8486622b0577a78f067ece3cdceeb39513ad73c85499396f732f81ddc87f0a433ce257
+  metadata.gz: 3eb44f9dbd87f94c865760d6f0ae981647d151f074600bb9fe8a844d63efd0ab819a2de2c44f165408735914528408cf2ec550dd0f0a4f6a53d5daf9b94cdf50
+  data.tar.gz: 196d465c18c089a7a3841cc55d4991f736c59366f38a6a1d3d4d933e93bcf1ca8ed292d094601b940c825807a495198f99500f7f89c1881309bf303215b19c46

data/Gemfile.lock

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

data/lib/advance/version.rb

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

data/lib/advance.rb

@@ -31,11 +31,23 @@ module Advance
     dir_name = "#{dir_prefix}_#{label}"
 
     puts "#{CYAN}advance #{$step} #{label}#{WHITE}... #{RESET}"
-    return if $redo_mode == :checking && Dir.exist?(dir_name)
 
-    clean_previous_step_dirs(dir_prefix)
+    if $redo_mode != :checking || !(File.exist?(dir_name) || File.exist?(dir_name + '.tgz'))
+      clean_previous_step_dirs(dir_prefix)
 
-    send(processing_mode, command, previous_dir_path, dir_name)
+      if previous_dir_path =~ /\.tgz$/
+        do_command_wo_log "tar xzf #{previous_dir_path}"
+      end
+      previous_dir_path = previous_dir_path.gsub(/\.tgz$/, "")
+      send(processing_mode, command, previous_dir_path, dir_name)
+    end
+    previous_dir_path = previous_dir_path.gsub(/\.tgz$/, "")
+    if File.basename(previous_dir_path) =~ /^step_/
+      if !File.exist?("#{previous_dir_path}.tgz")
+        do_command_wo_log "tar czf #{previous_dir_path}.tgz #{File.basename(previous_dir_path)}"
+      end
+      do_command_wo_log "rm -rf #{previous_dir_path}"
+    end
   end
 
   def static(processing_mode, label, command)
@@ -172,7 +184,7 @@ module Advance
   end
 
   def previous_file_path(previous_dir_path)
-    Find.find(previous_dir_path).reject { |p| FileTest.directory?(p) || File.basename(p) == "log" }.first
+    Find.find(previous_dir_path).reject {|p| File.basename(p) =~ %r(^\.) || FileTest.directory?(p) || File.basename(p) == "log"}.first
   end
 
   def file_path_template(dir_path, files)
@@ -204,6 +216,24 @@ module Advance
     end
   end
 
+  def do_command_wo_log(command, feedback = true)
+    puts "#{YELLOW}#{command}#{RESET}  " if feedback
+    stdout, stderr, status = Open3.capture3(command)
+    if !status.success?
+      error_msg = [
+        "step #{$step} failed",
+        "%%% command: >#{command}<",
+        "%%% returned status: >#{status}<",
+        "%%% stdout:",
+        stdout,
+        "%%% stderr:",
+        stderr
+      ].join("\n")
+
+      raise error_msg
+    end
+  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.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - janemacfarlane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-10 00:00:00.000000000 Z
+date: 2019-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: team_effort