mobilize-ssh 1.0.55 → 1.0.65

data/lib/mobilize-ssh/handlers/ssh.rb

@@ -126,28 +126,36 @@ module Mobilize
       return tmp_file_path
     end
 
-    def Ssh.get_file_hash(gsheet_paths,gdrive_slot)
-      file_hash = {}
-      gsheet_paths.map do |gpath|
-        string = Gsheet.find_by_path(gpath,gdrive_slot).to_tsv
-        fname = gpath.split("/").last
-        {fname => string}
-      end.each do |f|
-        file_hash = f.merge(file_hash)
+    def Ssh.file_hash_by_task_path(task_path)
+      #this is not meant to be called directly
+      #from the Runner -- it's used by run_by_task_path
+      t = Task.where(:path=>task_path).first
+      params = t.params
+      gsheet_paths = if params['sources']
+                       params['sources']
+                     elsif params['source']
+                       [params['source']]
+                     end
+      if gsheet_paths and gsheet_paths.length>0
+        gdrive_slot = Gdrive.slot_worker_by_path(task_path)
+        file_hash = {}
+        gsheet_paths.map do |gpath|
+          string = Gsheet.find_by_path(gpath,gdrive_slot).to_tsv
+          fname = gpath.split("/").last
+          {fname => string}
+        end.each do |f|
+          file_hash = f.merge(file_hash)
+        end
+        Gdrive.unslot_worker_by_path(task_path)
+        return file_hash
       end
-      file_hash
     end
 
     def Ssh.run_by_task_path(task_path)
       t = Task.where(:path=>task_path).first
       params = t.params
       node, command = [params['node'],params['cmd']]
-      file_hash = if params['sources']
-                    gdrive_slot = Gdrive.slot_worker_by_path(task_path)
-                    result = Ssh.get_file_hash(params['sources'],gdrive_slot)
-                    Gdrive.unslot_worker_by_path(task_path)
-                    result
-                  end
+      file_hash = Ssh.file_hash_by_task_path(task_path)
       su_user = t.params['su_user']
       Ssh.run(node,command,file_hash,su_user)
     end

data/lib/mobilize-ssh/version.rb

@@ -1,5 +1,5 @@
 module Mobilize
   module Ssh
-    VERSION = "1.0.55"
+    VERSION = "1.0.65"
   end
 end

data/test/mobilize-ssh_test.rb

@@ -18,6 +18,10 @@ describe "Mobilize" do
     u = Mobilize::User.where(:name=>user_name).first
     r = u.runner
 
+    rb_code_sheet = Mobilize::Gsheet.find_by_path("#{r.path.split("/")[0..-2].join("/")}/code.rb",gdrive_slot)
+    sh_code_sheet = Mobilize::Gsheet.find_by_path("#{r.path.split("/")[0..-2].join("/")}/code.sh",gdrive_slot)
+    [rb_code_sheet,sh_code_sheet].each {|s| s.delete if s}
+
     puts "add test code"
     rb_code_sheet = Mobilize::Gsheet.find_or_create_by_path("#{r.path.split("/")[0..-2].join("/")}/code.rb",gdrive_slot)
     rb_code_tsv = File.open("#{Mobilize::Base.root}/test/code.rb").read
@@ -29,20 +33,32 @@ describe "Mobilize" do
 
     jobs_sheet = r.gsheet(gdrive_slot)
 
+    #delete target sheets if they exist
+    ssh_target_sheet_1 = Mobilize::Gsheet.find_by_path("#{r.path.split("/")[0..-2].join("/")}/test_ssh_1.out",gdrive_slot)
+    ssh_target_sheet_2 = Mobilize::Gsheet.find_by_path("#{r.path.split("/")[0..-2].join("/")}/test_ssh_2.out",gdrive_slot)
+    ssh_target_sheet_3 = Mobilize::Gsheet.find_by_path("#{r.path.split("/")[0..-2].join("/")}/test_ssh_3.out",gdrive_slot)
+    [ssh_target_sheet_1,ssh_target_sheet_2,ssh_target_sheet_3].each {|s| s.delete if s}
+
     ssh_job_rows = ::YAML.load_file("#{Mobilize::Base.root}/test/ssh_job_rows.yml")
+    ssh_job_rows.map{|j| r.jobs(j['name'])}.each{|j| j.delete if j}
     jobs_sheet.add_or_update_rows(ssh_job_rows)
 
-    puts "job row added, force enqueued runner, wait 90s"
+    puts "job row added, force enqueued runner, wait 120s"
     r.enqueue!
-    sleep 90
+    sleep 120
 
     puts "update job status and activity"
     r.update_gsheet(gdrive_slot)
 
     puts "jobtracker posted data to test sheet"
-    ssh_target_sheet = Mobilize::Gsheet.find_by_path("#{r.path.split("/")[0..-2].join("/")}/test_ssh.out",gdrive_slot)
+    ssh_target_sheet_1 = Mobilize::Gsheet.find_by_path("#{r.path.split("/")[0..-2].join("/")}/test_ssh_1.out",gdrive_slot)
+    ssh_target_sheet_2 = Mobilize::Gsheet.find_by_path("#{r.path.split("/")[0..-2].join("/")}/test_ssh_2.out",gdrive_slot)
+    ssh_target_sheet_3 = Mobilize::Gsheet.find_by_path("#{r.path.split("/")[0..-2].join("/")}/test_ssh_3.out",gdrive_slot)
+
+    assert ssh_target_sheet_1.to_tsv.length > 100
+    assert ssh_target_sheet_2.to_tsv.length > 100
+    assert ssh_target_sheet_3.to_tsv.length > 3
 
-    assert ssh_target_sheet.to_tsv.length > 100
   end
 
 end

data/test/ssh_job_rows.yml

@@ -1,6 +1,18 @@
-- name: test_ssh
+- name: test_ssh_1
   active: true
   trigger: once
   status: ""
   task1: 'ssh.run node:"test_node", cmd:"ruby code.rb", su_user:"root", sources:["Runner_mobilize(test)/code.rb", "Runner_mobilize(test)/code.sh"]'
-  task2: 'gsheet.write source:"task1", target:"Runner_mobilize(test)/test_ssh.out"'
+  task2: 'gsheet.write source:"task1", target:"Runner_mobilize(test)/test_ssh_1.out"'
+- name: test_ssh_2
+  active: true
+  trigger: once
+  status: ""
+  task1: 'ssh.run node:"test_node", cmd:"sh code.sh", su_user:"root", source:"Runner_mobilize(test)/code.sh"'
+  task2: 'gsheet.write source:"task1", target:"Runner_mobilize(test)/test_ssh_2.out"'
+- name: test_ssh_3
+  active: true
+  trigger: once
+  status: ""
+  task1: 'ssh.run node:"test_node", cmd:"whoami"'
+  task2: 'gsheet.write source:"task1", target:"Runner_mobilize(test)/test_ssh_3.out"'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobilize-ssh
 version: !ruby/object:Gem::Version
-  version: 1.0.55
+  version: 1.0.65
   prerelease: 
 platform: ruby
 authors: