advance 0.3.4 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f48f7f4d8486419b770c7b1e76f3f6b8186bd31d3f21503f8e8c65b29ec748ee
-  data.tar.gz: b5d0d902388a22d2813d6f261f31f0596d2c09e96d9536241c868e04b8e84c59
+  metadata.gz: 9c5496bca9b51cb9542bd848c072639c02d74c1221e67d4d9470a57741b9f32c
+  data.tar.gz: 36e0ad35fcdfe2b3df7fbac361d3b27593a3d507a8d93e797e37cc86bec7663c
 SHA512:
-  metadata.gz: 99f79946945bb30f660125c5d615a060fbd9cb32e2d994c5912076fc7f0e5bb01ee3df0cb3a9d874d0dd4f6980db527df2666fe07d4b547e4d5421841cf0d37e
-  data.tar.gz: 955ce588e7a118f4709783898faab44789a7d37355e82bf793fc812dcb8f711d6c3ea463d384ce7fc118ed9d1af4e39cf7fc85043f088d11b826a27bb0e30e43
+  metadata.gz: 0ddc9590d16dc210f52d07b4959abaf2a8000449354fbdfbb02bff010ae5fa4c557902bc4b73dd95774215256c305106d9487fd87afb7055d550463933024c30
+  data.tar.gz: 1a2b1a5a73f069d71cf75f265a96f7f0c763d269bab41c3dbe04975ca2224e137ed2845be7da9837185d2c0e05e2b71c5bcdc61b77d34059d483317cd0547f26

data/Gemfile.lock

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

data/bin/csv_split_on_change_nh.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 require "csv"
-require_relative "../lib/path_for_new_file"
+require_relative "../lib/file_path_generator"
 
 def columns_changed?(previous_row, row, change_columns)
   changed = false

data/lib/advance.rb

@@ -30,6 +30,8 @@ module Advance
       end
     last_run_number = meta["last_run_number"] ||= -1
     $run_number = last_run_number + 1
+    $cores=`sysctl -n hw.ncpu`.to_i
+    puts "Multi steps will use #{$cores} cores"
   end
 
   def update_meta(step_number, processing_mode, label, command, start_time, duration, file_count)
@@ -153,7 +155,6 @@ module Advance
       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)
@@ -200,14 +201,14 @@ module Advance
 
   def work_in_sub_dir(dir_name)
     starting_dir = FileUtils.pwd
-    stripped_dir_name = strip_extensions(dir_name)
+    stripped_dir_name = File.join(*(strip_extensions(dir_name).split("/").uniq))
     if $redo_mode == :checking && Dir.exist?(stripped_dir_name)
       return
     end
 
     $redo_mode = :replacing
 
-    dirs = File.split(stripped_dir_name)
+    dirs = stripped_dir_name.split("/")
     dirs[-1] = "tmp_#{dirs[-1]}"
     tmp_dir = File.join(dirs)
     FileUtils.rm_rf tmp_dir

data/lib/advance/version.rb

@@ -1,3 +1,3 @@
 module Advance
-  VERSION = "0.3.4"
+  VERSION = "0.3.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: advance
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.7
 platform: ruby
 authors:
 - janemacfarlane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-03 00:00:00.000000000 Z
+date: 2019-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: team_effort
@@ -104,7 +104,7 @@ files:
 - bin/split_csv.rb
 - lib/advance.rb
 - lib/advance/version.rb
-- lib/path_for_new_file.rb
+- lib/file_path_generator.rb
 homepage: https://github.com/doctorjane/advance
 licenses:
 - MIT