mobilize-ssh 1.0.65 → 1.0.71

data/Rakefile

@@ -1,7 +1,7 @@
 require "bundler/gem_tasks"
 
-require 'mobilize-base/rakes'
-require 'mobilize-ssh/rakes'
+require 'mobilize-base/tasks'
+require 'mobilize-ssh/tasks'
 
 #
 # Tests

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

@@ -126,18 +126,18 @@ module Mobilize
       return tmp_file_path
     end
 
-    def Ssh.file_hash_by_task_path(task_path)
+    def Ssh.file_hash_by_stage_path(stage_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
+      #from the Runner -- it's used by run_by_stage_path
+      s = Stage.where(:path=>stage_path).first
+      params = s.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)
+        gdrive_slot = Gdrive.slot_worker_by_path(stage_path)
         file_hash = {}
         gsheet_paths.map do |gpath|
           string = Gsheet.find_by_path(gpath,gdrive_slot).to_tsv
@@ -146,17 +146,17 @@ module Mobilize
         end.each do |f|
           file_hash = f.merge(file_hash)
         end
-        Gdrive.unslot_worker_by_path(task_path)
+        Gdrive.unslot_worker_by_path(stage_path)
         return file_hash
       end
     end
 
-    def Ssh.run_by_task_path(task_path)
-      t = Task.where(:path=>task_path).first
-      params = t.params
+    def Ssh.run_by_stage_path(stage_path)
+      s = Stage.where(:path=>stage_path).first
+      params = s.params
       node, command = [params['node'],params['cmd']]
-      file_hash = Ssh.file_hash_by_task_path(task_path)
-      su_user = t.params['su_user']
+      file_hash = Ssh.file_hash_by_stage_path(stage_path)
+      su_user = s.params['su_user']
       Ssh.run(node,command,file_hash,su_user)
     end
   end

data/lib/mobilize-ssh/version.rb

@@ -1,5 +1,5 @@
 module Mobilize
   module Ssh
-    VERSION = "1.0.65"
+    VERSION = "1.0.71"
   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.75"
+  gem.add_runtime_dependency "mobilize-base","1.0.81"
   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,17 +2,17 @@
   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_1.out"'
+  stage1: 'ssh.run node:"test_node", cmd:"ruby code.rb", su_user:"root", sources:["Runner_mobilize(test)/code.rb", "Runner_mobilize(test)/code.sh"]'
+  stage2: 'gsheet.write source:"stage1", 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"'
+  stage1: 'ssh.run node:"test_node", cmd:"sh code.sh", su_user:"root", source:"Runner_mobilize(test)/code.sh"'
+  stage2: 'gsheet.write source:"stage1", 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"'
+  stage1: 'ssh.run node:"test_node", cmd:"whoami"'
+  stage2: 'gsheet.write source:"stage1", 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.65
+  version: 1.0.71
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-15 00:00:00.000000000 Z
+date: 2012-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mobilize-base
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.75
+        version: 1.0.81
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.75
+        version: 1.0.81
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -93,7 +93,7 @@ files:
 - lib/mobilize-ssh/extensions/socket.rb
 - lib/mobilize-ssh/extensions/string.rb
 - lib/mobilize-ssh/handlers/ssh.rb
-- lib/mobilize-ssh/rakes.rb
+- lib/mobilize-ssh/tasks.rb
 - lib/mobilize-ssh/version.rb
 - lib/samples/ssh.yml
 - mobilize-ssh.gemspec