xp5k 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4af38fdece7ea8f615a9c32761543028f78867e9
-  data.tar.gz: 64bd6b858b83263d93ab18cbb2a30a016e5e582b
+  metadata.gz: 72e46598f1022b3d7583ebd9eb2f56daaefd26ec
+  data.tar.gz: 13cd313c3f4ec4152c1ae9e5184b2622907678ac
 SHA512:
-  metadata.gz: 1eef9aa31c0937cb54ad9e199e356d5fe9a66f274169ea1ab559a3358372de3066e67710bb272ea0cfe679e7f494782cdfd871db71804cf8498805a71b33bd1c
-  data.tar.gz: 30b377ef199f06815dd5e5c8dca6ea3d4446b61ffb7e2070485fec138dcfd4fac4b04fe652b2bf11ad4bad720ebb880418d542a3365c159c06bbf98d6fb4d375
+  metadata.gz: 0b74f1a0855cc0bd9f75828dc84fcd2a2c3372a1393caa1738eb37ae8d7c77309a79fc76892db9525fcc5e5003c9b23d43c5588275b8b7db071c7a3d59bc97b9
+  data.tar.gz: 7041f61aee8d3b29f02261c9fd7e9bc559e1cab0acc1fb5a14089e79856dd02759ee44e99a22de40b7db3f2b4b04a0f01a4409546b96720f82f7c2bac16c746d

data/lib/xp5k/version.rb

@@ -1,3 +1,3 @@
 module XP5K
-  VERSION='0.0.16'
+  VERSION='0.0.17'
 end

data/lib/xp5k/xp.rb

@@ -81,7 +81,9 @@ module XP5K
       if File.exists?(".xp_cache") or job_hash[:jobid]
         uid = job_hash[:jobid] || begin
           datas = JSON.parse(File.read(".xp_cache"))
-          datas["jobs"].select { |x| x["name"] == job_hash[:name] }.first["uid"]
+          job = datas["jobs"].select { |x| x["name"] == job_hash[:name] }.first
+          job ? job["uid"] : nil
+          #datas["jobs"].select { |x| x["name"] == job_hash[:name] }.first["uid"]
         end
         unless uid.nil?
           job = @connection.root.sites[job_hash[:site].to_sym].jobs(:query => { :user => @connection.config.options[:username] || ENV['USER'] })["#{uid}".to_sym]
@@ -89,12 +91,12 @@ module XP5K
             j = job.reload
             self.jobs << j
             self.roles += Role.create_roles(j, job_hash) unless job_hash[:roles].nil?
-            update_cache()
           end
         end
         # reload last deployed nodes
         self.deployed_nodes = datas["deployed_nodes"] if datas
       end
+      #update_cache()
 
     end
 
@@ -102,10 +104,15 @@ module XP5K
       self.jobs2submit.each do |job2submit|
         job = self.job_with_name(job2submit[:name])
         if job.nil?
-          job = @connection.root.sites[job2submit[:site].to_sym].jobs.submit(job2submit)
-          update_cache
-          logger.info "Job \"#{job['name']}\" submitted with id #{job['uid']}@#{job2submit[:site]}"
-          self.jobs << job
+          begin
+            job = @connection.root.sites[job2submit[:site].to_sym].jobs.submit(job2submit)
+            logger.info "Job \"#{job['name']}\" submitted with id #{job['uid']}@#{job2submit[:site]}"
+            self.jobs << job
+            update_cache
+          rescue Exception => e
+            puts "Error with job #{job2submit}"
+            puts e.message
+          end
         else
           logger.info "Job \"#{job["name"]}\" already submitted #{job["uid"]}@#{job2submit[:site]}"
         end
@@ -169,6 +176,7 @@ module XP5K
         log += " (until #{Time.at(job['started_at'].to_i + job['walltime'].to_i).to_datetime})" if job['state'] == 'running'
         logger.info log
       end
+      update_cache
     end
 
     def clean

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xp5k
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - Pascal Morillon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-13 00:00:00.000000000 Z
+date: 2017-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack