scout-camp 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbf3734e6eac7bcc3df575024caee67996cf792548a667f8b086aba62f5af591
-  data.tar.gz: c0564fda160712dd5846a91ae6af52a03656efe2cdfb8a930f843f7d34f22b9d
+  metadata.gz: 95942fcee4143e58526623713e4d977d77903f49e179dd0f4171bf72e2bde29d
+  data.tar.gz: 263d45c4b8cf6bc08688dccb7db0b302b89ee3bf81bedfed5fc3fe609191e3ba
 SHA512:
-  metadata.gz: 00cf8db6a044aea2ef27dc15ea65cd394d2f92a6e40f2d56d924d82a59d27052202334f0cf7472f8adb7739b52e0fd005c848ce45c1240219292e9ba1b15b440
-  data.tar.gz: bca7c05eed1801cb873676cf1f640e1ec543c500bcd6990093640a5be5191075c2c788820cddb4432e92c3f4929ac5a36a98c10f09eefb7afcf4de88f1eb8cd0
+  metadata.gz: 4d784bac738560c14febe73a1a0d983c885d675e20a547ad4698002840a0c51aa39a93c9512ffee1298a3e50aeda6cbacc7c55fd6f436b4e7ed5fa7279002cf4
+  data.tar.gz: 1744d6a3054fa7f7c7647a766ac1858e6cd68d73051e6d38b96bb0b7d48e9613738ebd4d631b5a8fb108288ea20d0b1ceb798bd0fcd86a2da86c844a56bd4d56

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/scout/offsite/step.rb

@@ -13,6 +13,7 @@ module OffsiteStep
                               file = ".scout/tmp/step_inputs/#{workflow}/#{task_name}/#{name}"
                               TmpFile.with_path do |inputs_dir|
                                 save_inputs(inputs_dir)
+                                inputs_dir = inputs_dir + '/' unless inputs_dir.ends_with? '/'
                                 SSHLine.rsync(inputs_dir, file, target: server, directory: inputs_dir.directory?)
                               end
                               file
@@ -72,7 +73,7 @@ job = wf.job(:#{task_name}, "#{clean_name}");
   end
 
   def done?
-    status == :done
+    status == :done || Open.exists?(path)
   end
 
   def orchestrate_batch
@@ -86,22 +87,26 @@ job = wf.job(:#{task_name}, "#{clean_name}");
     SSHLine.sync(bundle_files, source: server)
   end
 
-  def exec(noload)
+  def exec(noload = false)
     bundle_files = offsite_job_ssh <<~EOF
     Workflow.produce(job)
     job.join
     job.bundle_files
     EOF
-    SSHLine.sync(bundle_files, source: server)
+    SSHLine.sync(bundle_files, source: server, rsync_args: '-vztHP --copy-unsafe-links --omit-dir-times ')
     noload ? self.path : self.load
   end
 
   def run(noload=false)
-    if batch
-      orchestrate_batch
-      noload ? self.path : self.load
-    else
-      exec(noload)
+    begin
+      if batch
+        orchestrate_batch
+        noload ? self.path : self.load
+      else
+        exec(noload)
+      end
+    ensure
+      @info = nil
     end
   end
 end

data/lib/scout/offsite/sync.rb

@@ -36,13 +36,14 @@ located = located.each{|path| path << "/" if path && path.directory? && ! path.e
     [located, identified]
   end
 
-  def self.rsync(source_path, target_path, directory: false, source: nil, target: nil, dry_run: false, hard_link: false)
-    rsync_args = "-avztHP --copy-unsafe-links --omit-dir-times "
+  def self.rsync(source_path, target_path, directory: false, source: nil, target: nil, dry_run: false, hard_link: false, rsync_args: nil)
+    rsync_args = "-avztHP --copy-unsafe-links --omit-dir-times " if rsync_args.nil?
 
     rsync_args << "--link-dest '#{source_path}' " if hard_link && ! source
 
     source_path = source_path + "/" if directory && ! source_path.end_with?("/")
     target_path = target_path + "/" if directory && ! target_path.end_with?("/")
+
     if target
       SSHLine.mkdir target, File.dirname(target_path)
     else
@@ -52,6 +53,9 @@ located = located.each{|path| path << "/" if path && path.directory? && ! path.e
     source_path = File.expand_path(source_path) unless source
     target_path = File.expand_path(target_path) unless target
 
+    source_path = source_path + "/" if directory && ! source_path.end_with?("/")
+    target_path = target_path + "/" if directory && ! target_path.end_with?("/")
+
     cmd = 'rsync '
     cmd << rsync_args
     cmd << '-nv ' if dry_run

data/scout-camp.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: scout-camp 0.2.0 ruby lib
+# stub: scout-camp 0.2.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "scout-camp".freeze
-  s.version = "0.2.0".freeze
+  s.version = "0.2.1".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout-camp
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Miguel Vazquez