advance 0.4.4 → 0.4.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d6824d2bd08741ba6ed16ab23cb41a7dca837d92db6717042818487966a8b5b
-  data.tar.gz: fc5f112f2ff89a59d9652d5f6b9550065f97248024c27a1a958389189ef58471
+  metadata.gz: 0b0306aaac120b4fe21e3152a03d020cecf5857b2087e73518a994ff7906b2f7
+  data.tar.gz: 890c13a999ab88173e3931cdcd759215b072b47fbad12fac42511a96af5a3239
 SHA512:
-  metadata.gz: 3d85241eb22e3fa4ef1806e13a4fead076cb199855127788fad7e243e113dd9785618850010d08a22a319de1322e63befb2ad19337779f8e0630566958794a95
-  data.tar.gz: a57345fb3b0b3d3f5835731efeb0fdaf49f42434dd2223782fce6a2c8c4be31037fecb7ecc23f974fc1ca6266c0c4b559f6d936b39082bba7a45d6d2ddd25ec3
+  metadata.gz: 2c22b737e9a0104ebd6bbbae1bab4f02f5e3d2ae8d05f67e64fc60c933ee4f1e2270a6d742432170554b8c9c35e2959b723835b5a854155e53c477d4e2ca1bb9
+  data.tar.gz: 438c8dba215246ec3bb2e706dad88a079d031560db25c51ed16838a7110ce503540f6ae3e7a2494456070b0c1c1fc6f42358dad319991370c51a89d1e96fca51

data/.gitignore

@@ -9,3 +9,4 @@
 .idea
 .ruby-gemset
 .ruby-version
+.DS_Store

data/Gemfile.lock

@@ -1,15 +1,15 @@
 PATH
   remote: .
   specs:
-    advance (0.4.4)
+    advance (0.4.10)
       team_effort
 
 GEM
   remote: https://rubygems.org/
   specs:
     minitest (5.10.1)
-    rake (10.4.2)
-    team_effort (1.0.1)
+    rake (13.0.1)
+    team_effort (1.1.1)
 
 PLATFORMS
   ruby
@@ -18,7 +18,7 @@ DEPENDENCIES
   advance!
   bundler (~> 1.16)
   minitest (~> 5.0)
-  rake (~> 10.0)
+  rake (~> 13.0)
 
 BUNDLED WITH
    1.17.3

data/advance.gemspec

@@ -30,6 +30,6 @@ step become the input to the next step.
 
   spec.add_runtime_dependency "team_effort"
   spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "minitest", "~> 5.0"
 end

data/lib/advance.rb

@@ -21,6 +21,18 @@ module Advance
   WHITE="\e[1;37m"
   YELLOW="\e[33m"
 
+  def env_is?(env_var_name, default)
+    case ENV[env_var_name]
+    when "true"; true
+    when "false"; false
+    when nil; default
+    else
+      puts "env variable #{env_var_name} should be 'true', 'false', or not present (defaults to '#{default}')"
+      puts "currently set to >#{ENV[env_var_name]}<"
+      false
+    end
+  end
+
   def self.included(pipeline_module)
     $pipeline = caller_locations.first.path
     meta =
@@ -33,17 +45,6 @@ module Advance
     $run_number = last_run_number + 1
     $cores=`nproc`.to_i
     puts "Multi steps will use #{$cores} cores"
-
-    $verbose_logging = case ENV["ADVANCE_VERBOSE_LOGGING"]
-                       when "true"; true
-                       when "false"; false
-                       when nil
-                         puts "For detailed logging of multi steps, rerun after 'export ADVANCE_VERBOSE_LOGGING=true'"
-                         false
-                       else
-                         puts "env variable ADVANCE_VERBOSE_LOGGING should be 'true', 'false', or not present (defaults to 'false')"
-                         puts "currently set to >#{ENV["ADVANCE_VERBOSE_LOGGING"]}<"
-                       end
   end
 
   def update_meta(step_number, processing_mode, label, command, start_time, duration, file_count)
@@ -132,7 +133,7 @@ module Advance
     end
     previous_dir_path = previous_dir_path.gsub(/\.tgz$/, "")
     if File.basename(previous_dir_path) =~ /^step_/
-      if !File.exist?("#{previous_dir_path}.tgz")
+      if env_is?("ADVANCE_SAVE_HISTORY", true) && !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}"
@@ -235,10 +236,11 @@ module Advance
           command.gsub!("{input_file}", file_path)
           command.gsub!("{file_name}", basename)
           command.gsub!("{file_name_without_extension}", root_file_name)
-          puts "#{YELLOW}#{command}#{RESET}  " if $verbose_logging
+          puts "#{YELLOW}#{command}#{RESET}  " if env_is?("ADVANCE_VERBOSE_LOGGING", false)
           work_in_sub_dir(new_dir_name) do
-            do_command command, $verbose_logging
+            do_command command, env_is?("ADVANCE_VERBOSE_LOGGING", false)
           end
+          do_command_wo_log("rm #{file_path}", false) if !env_is?("ADVANCE_SAVE_HISTORY", true)
         rescue
           puts "%%%% error while processing >>#{file_path}<<"
           raise
@@ -308,19 +310,23 @@ module Advance
   end
 
   def do_command(command, feedback = true)
-    puts "#{YELLOW}#{command}#{RESET}  " #if feedback
+    puts "#{YELLOW}#{command}#{RESET}  " if feedback
     start_time = Time.now
     stdout, stderr, status = Open3.capture3(command)
-    elapsed_time = Time.now - start_time
-    File.open("log", "w") do |f|
-      f.puts "%%% command: >#{command}<"
-      f.puts "%%% returned status: >#{status}<"
-      f.puts "%%% elapsed time: #{elapsed_time} seconds"
-      f.puts "%%% stdout:"
-      f.puts stdout
-      f.puts "%%% stderr:"
-      f.puts stderr
+
+    if env_is?("ADVANCE_LOG_FILES", true)
+      elapsed_time = Time.now - start_time
+      File.open("log", "w") do |f|
+        f.puts "%%% command: >#{command}<"
+        f.puts "%%% returned status: >#{status}<"
+        f.puts "%%% elapsed time: #{elapsed_time} seconds"
+        f.puts "%%% stdout:"
+        f.puts stdout
+        f.puts "%%% stderr:"
+        f.puts stderr
+      end
     end
+
     if !status.success?
       raise "step #{$step} failed with #{status}\n#{stderr}"
     end

data/lib/advance/version.rb

@@ -1,3 +1,3 @@
 module Advance
-  VERSION = "0.4.4"
+  VERSION = "0.4.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: advance
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.10
 platform: ruby
 authors:
 - janemacfarlane
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-23 00:00:00.000000000 Z
+date: 2020-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: team_effort
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ homepage: https://github.com/doctorjane/advance
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -122,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: A framework for building data transformation pipelines
 test_files: []