advance.rb in advance-0.1.12

- old
+ new
@@ -16,145 +16,169 @@
   MAGENTA="\e[35m"
   RED="\e[31m"
   WHITE="\e[1;37m"
   YELLOW="\e[33m"
 
-  def do_command(command, feedback = true)
-    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
-    end
-    if !status.success?
-      raise "step #{$step} failed with #{status}\n#{stderr}"
-    end
+  def advance(processing_mode, label, command)
+    $redo_mode ||= :checking
+    $step ||= 0
+    previous_dir_path = get_previous_dir_path
+
+    $step += 1
+    dir_prefix = step_dir_prefix($step)
+    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)
+
+    send(processing_mode, label, command, previous_dir_path, dir_prefix, dir_name)
   end
 
-  def previous_dir_path
+  def static(processing_mode, label, command)
+    $redo_mode ||= :checking
+    $step ||= 0
+    previous_dir_path = get_previous_dir_path
+    dir_prefix = static_dir_prefix($step)
+    dir_name = "#{dir_prefix}_#{label}"
+    puts "#{CYAN}static #{$step} #{label}#{WHITE}... #{RESET}"
+    return if $redo_mode == :checking && Dir.exist?(dir_name)
+
+    FileUtils.rm_rf dir_name
+
+    send(processing_mode, label, command, previous_dir_path, dir_prefix, dir_name)
+  end
+
+  def get_previous_dir_path
     relative_path = case $step
-                    when 1
-                      ".."
+                    when 0
+                      "."
                     else
-                      File.join("..", Dir.entries("..").find { |d| d =~ /^#{step_dir_prefix($step - 1)}/ })
+                      File.join(".", Dir.entries(".").find { |d| d =~ /^#{step_dir_prefix($step)}/ })
                     end
     File.expand_path(relative_path)
   end
 
-  def previous_file_path
-    Find.find(previous_dir_path).reject { |p| FileTest.directory?(p) || File.basename(p) == "log" }.first
+  def step_dir_prefix(step_no)
+    "step_%03d" % [step_no]
   end
 
-  def single(label, command)
-    step(label) do
+  def static_dir_prefix(step_no)
+    "static_%03d" % [step_no]
+  end
+
+  def clean_previous_step_dirs(dir_prefix)
+    while (step_dir = find_step_dir(dir_prefix))
+      puts "## removing #{step_dir}"
+      FileUtils.rm_rf step_dir
+    end
+  end
+
+  def find_step_dir(dir_prefix)
+    dirs = Dir.entries(".")
+    dirs.find { |d| d =~ /^#{dir_prefix}/ }
+  end
+
+  def single(label, command, previous_dir_path, dir_prefix, dir_name)
+    work_in_sub_dir(dir_name) do
       if command =~ /\{previous_file\}/
-        command.gsub!("{previous_file}", previous_file_path)
+        command.gsub!("{previous_file}", previous_file_path(previous_dir_path))
       end
       if command =~ /\{previous_dir\}/
         command.gsub!("{previous_dir}", previous_dir_path)
       end
       if command =~ /\{file\}/
-        command.gsub!("{file}", File.basename(previous_file_path))
+        command.gsub!("{file}", File.basename(previous_file_path(previous_dir_path)))
       end
       do_command command
     end
   end
 
-  def multi(label, command)
+  def multi(label, command, previous_dir_path, dir_prefix, dir_name)
     no_feedback = false
-    step(label) do
-      # previous_dir_path = File.expand_path(previous_dir_path)
-      files = Dir.entries(previous_dir_path).reject { |f| f =~ %r{^(\.\.?|log)$} }
-      file_path_template = file_path_template(previous_dir_path, files)
+    work_in_sub_dir(dir_name) do
+      file_paths = Find.find(previous_dir_path).reject { |path| FileTest.directory?(path) || path =~ %r{^(log)$} }
+
       last_progress = ""
       progress_proc = ->(index, max_index) do
         latest_progress = sprintf("%3i%", index.to_f / max_index * 100)
         puts latest_progress if last_progress != latest_progress
         last_progress = latest_progress
       end
-      TeamEffort.work(files, $cores, progress_proc: progress_proc) do |file|
+      TeamEffort.work(file_paths, $cores, progress_proc: progress_proc) do |file_path|
         begin
-          previous_file_path = file_path_template.gsub("{file}", file)
-          command.gsub!("{file_path}", previous_file_path) unless $step == 1
+          file = File.basename(file_path)
+          command.gsub!("{file_path}", file_path) unless $step == 1
           command.gsub!("{file}", file) unless $step == 1
           puts "#{YELLOW}#{command}#{RESET}"
-          dir_name = file
-          work_in_sub_dir(dir_name) do
+          work_in_sub_dir(file) do
             do_command command, no_feedback
           end
         rescue
-          puts "%%%% error while processing >>#{file}<<"
+          puts "%%%% error while processing >>#{file_path}<<"
           raise
         end
       end
     end
   end
 
-  def file_path_template(dir_path, files)
-    file = files.first
-    file_path = File.join(dir_path, file)
-    if File.directory?(file_path)
-      File.join(dir_path, "{file}", "{file}")
-    else
-      File.join(dir_path, "{file}")
-    end
-  end
-
-  def find_step_dir
-    dirs = Dir.entries(".")
-    dirs.find { |d| d =~ /^#{step_dir_prefix($step)}/ }
-  end
-
-  def clean_previous_step_dirs
-    while (step_dir = find_step_dir)
-      puts "## removing #{step_dir}"
-      FileUtils.rm_rf step_dir
-    end
-  end
-
-  def work_in_sub_dir(dir_name, existing_message = nil)
+  def work_in_sub_dir(dir_name)
     if $redo_mode == :checking && Dir.exist?(dir_name)
-      return :checking
+      return
     end
 
-    clean_previous_step_dirs
+    $redo_mode = :replacing
 
     tmp_dir_name = "tmp_#{dir_name}"
     FileUtils.rm_rf tmp_dir_name
     FileUtils.mkdir_p tmp_dir_name
     FileUtils.cd tmp_dir_name
 
     yield
 
     FileUtils.cd ".."
     FileUtils.mv tmp_dir_name, dir_name
-    :replacing
   end
 
-  def step_dir_prefix(step_no)
-    "step_%03d" % [step_no]
+  def previous_file_path(previous_dir_path)
+    Find.find(previous_dir_path).reject { |p| FileTest.directory?(p) || File.basename(p) == "log" }.first
   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}"
+  def file_path_template(dir_path, files)
+    file = files.first
+    file_path = File.join(dir_path, file)
+    if File.directory?(file_path)
+      File.join(dir_path, "{file}", "{file}")
+    else
+      File.join(dir_path, "{file}")
+    end
+  end
 
-    $redo_mode = work_in_sub_dir(dir_name, "#{GREEN}OK#{RESET}") do
-      yield
+  def do_command(command, feedback = true)
+    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
     end
+    if !status.success?
+      raise "step #{$step} failed with #{status}\n#{stderr}"
+    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)
 
     caller_path = File.dirname(caller[0].split(/:/).first)