mobilize-ssh 1.25 → 1.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1f2dbd00b4dfaff4e8d7f0739eab57f1a42ccac
-  data.tar.gz: a5c9fc8990b99ac4f8b594f26d135d126f9055eb
+  metadata.gz: 3f432114cc102b1402819a0d6641ca707d59c53c
+  data.tar.gz: 460bed02d0df8df2d0a45924dd3cd923c0faf80a
 SHA512:
-  metadata.gz: e7f781258b0a3725eab4833236190b9c8684879026bba762daedfe0160966dfc42a1595c2db507876ecebd5997bc0b6929915fa3e7d2edeb96df1e10a72083e6
-  data.tar.gz: d454d374a23fe9023d72fcd85803f54a231e731411b9052e19ed542bf0e0f5838d67fde742f15f8c35604a69203c042905b6a249aba4f50288ff25cde1f6133a
+  metadata.gz: 3666be3da31f2ce839cc8edefd9f2d76cd463211163530ba68fcab289219e09df63e18487c0f5a813e877cec7e38c016ad15f7484ad9d1aaa158c5fef6382ab0
+  data.tar.gz: 97374d509caf04c70bfe9ae003b3741856dd43dd1c6d356612ce9177279dd0f584d0a9f46027e2a05cd009225552ede5bc8fb0dcf6ceeffcab66b9b03f3b5000

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

@@ -58,7 +58,7 @@ module Mobilize
     end
 
     # converts a source path or target path to a dst in the context of handler and stage
-    def Ssh.path_to_dst(path,stage_path)
+    def Ssh.path_to_dst(path,stage_path,gdrive_slot)
       has_handler = true if path.index("://")
       red_path = path.split("://").last
       #is user has a handler, their first path node is a node name,
@@ -69,7 +69,7 @@ module Mobilize
         return Dataset.find_or_create_by_url(ssh_url)
       end
       #otherwise, use Gsheet
-      return Gsheet.path_to_dst(red_path,stage_path)
+      return Gsheet.path_to_dst(red_path,stage_path,gdrive_slot)
     end
 
     def Ssh.url_by_path(path,user_name)
@@ -218,12 +218,12 @@ module Mobilize
       return user_name
     end
 
-    def Ssh.file_hash_by_stage_path(stage_path)
+    def Ssh.file_hash_by_stage_path(stage_path,gdrive_slot)
       file_hash = {}
       s = Stage.where(:path=>stage_path).first
       u = s.job.runner.user
       user_name = Ssh.user_name_by_stage_path(stage_path)
-      s.sources.each do |sdst|
+      s.sources(gdrive_slot).each do |sdst|
                        split_path = sdst.path.split("/")
                        #if path is to stage output, name with stage name
                        file_name = if split_path.last == "out" and
@@ -234,7 +234,8 @@ module Mobilize
                                    end
                        if ["gsheet","gfile"].include?(sdst.handler)
                          #google drive sources are always read as the user
-                         file_hash[file_name] = sdst.read(u.name)
+                         #with the apportioned slot
+                         file_hash[file_name] = sdst.read(u.name,gdrive_slot)
                        else
                          #other sources should be read by su-user
                          file_hash[file_name] = sdst.read(user_name)
@@ -244,12 +245,16 @@ module Mobilize
     end
 
     def Ssh.run_by_stage_path(stage_path)
+      gdrive_slot = Gdrive.slot_worker_by_path(stage_path)
+      #return blank response if there are no slots available
+      return nil unless gdrive_slot
       s = Stage.where(:path=>stage_path).first
       params = s.params
       node, command = [params['node'],params['cmd']]
       node ||= Ssh.default_node
       user_name = Ssh.user_name_by_stage_path(stage_path)
-      file_hash = Ssh.file_hash_by_stage_path(stage_path)
+      file_hash = Ssh.file_hash_by_stage_path(stage_path,gdrive_slot)
+      Gdrive.unslot_worker_by_path(stage_path)
       result = Ssh.run(node,command,user_name,file_hash)
       #use Gridfs to cache result
       response = {}

data/lib/mobilize-ssh/version.rb

@@ -1,5 +1,5 @@
 module Mobilize
   module Ssh
-    VERSION = "1.25"
+    VERSION = "1.26"
   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.25"
+  gem.add_runtime_dependency "mobilize-base","1.26"
   gem.add_runtime_dependency "net-ssh"
   gem.add_runtime_dependency "net-scp"
   gem.add_runtime_dependency "net-ssh-gateway"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mobilize-ssh
 version: !ruby/object:Gem::Version
-  version: '1.25'
+  version: '1.26'
 platform: ruby
 authors:
 - Cassio Paes-Leme
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-24 00:00:00.000000000 Z
+date: 2013-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mobilize-base
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '1.25'
+        version: '1.26'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '1.25'
+        version: '1.26'
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement