mobilize-ssh 1.0.25 → 1.0.55

data/README.md

@@ -81,7 +81,7 @@ The Ssh configuration consists of:
 over to the nodes. They will be deleted afterwards, unless the job
 fails in mid-copy. By default this is tmp/file/.
 * nodes, identified by aliases, such as `test_node`. This alias is what you should
-pass into the "node_alias" param over in the ssh.run task.
+pass into the "node" param over in the ssh.run task.
 
 Each node has a host, and optionally has a gateway. If you don't need a
 gateway, remove that row from the configuration file.
@@ -125,10 +125,12 @@ Start
 ### Create Job
 
 * For mobilize-ssh, the following task is available:
-  * ssh.run `<node_alias>,<command>,*<gsheet_full_paths>`, which reads
+  * ssh.run `node: <node_alias>, cmd: <command>, su_user: su_user, sources:[*<gsheet_full_paths>]`, which reads
 all gsheets, copies them to a temporary folder on the selected node, and
 runs the command inside that folder. 
-  * The test uses `ssh.run "test_node", "ruby code.rb", "Runner_mobilize(test)/code.rb", "Runner_mobilize(test)/code.sh"`
+  * su_user and sources are optional; node and cmd are required. su_user
+will cause the command to be prefixed with sudo su <su_user> -c.
+  * The test uses `ssh.run node:"test_node", cmd:"ruby code.rb", su_user: "root", sources:["Runner_mobilize(test)/code.rb","Runner_mobilize(test)/code.sh"]`
 
 <a name='section_Start_Run_Test'></a>
 ### Run Test

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

@@ -141,13 +141,15 @@ module Mobilize
     def Ssh.run_by_task_path(task_path)
       t = Task.where(:path=>task_path).first
       params = t.params
-      node, command = [params[0],params[1]]
-      file_hash = if params[2]
-                    gsheet_paths = params[2..-1] if params[2]
+      node, command = [params['node'],params['cmd']]
+      file_hash = if params['sources']
                     gdrive_slot = Gdrive.slot_worker_by_path(task_path)
-                    Ssh.get_file_hash(gsheet_paths,gdrive_slot)
+                    result = Ssh.get_file_hash(params['sources'],gdrive_slot)
+                    Gdrive.unslot_worker_by_path(task_path)
+                    result
                   end
-      Ssh.run(node,command,file_hash)
+      su_user = t.params['su_user']
+      Ssh.run(node,command,file_hash,su_user)
     end
   end
 end

data/lib/mobilize-ssh/version.rb

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

data/mobilize-ssh.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
-  gem.add_runtime_dependency "mobilize-base","~>1.0.55"
+  gem.add_runtime_dependency "mobilize-base","1.0.75"
   gem.add_runtime_dependency "net-ssh"
   gem.add_runtime_dependency "net-scp"
   gem.add_runtime_dependency "net-ssh-gateway"

data/test/ssh_job_rows.yml

@@ -2,5 +2,5 @@
   active: true
   trigger: once
   status: ""
-  task1: 'ssh.run "test_node", "ruby code.rb", "Runner_mobilize(test)/code.rb", "Runner_mobilize(test)/code.sh"'
-  task2: 'gsheet.write "task1", "Runner_mobilize(test)/test_ssh.out"'
+  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"'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobilize-ssh
 version: !ruby/object:Gem::Version
-  version: 1.0.25
+  version: 1.0.55
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-13 00:00:00.000000000 Z
+date: 2012-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mobilize-base
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.55
+        version: 1.0.75
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.55
+        version: 1.0.75
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement