xp5k 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e9599d9dce05481a24579d01cf6cdeea0c44ab7
-  data.tar.gz: ed2bd65379425b9d72eb35754d32385acae57d69
+  metadata.gz: 4af38fdece7ea8f615a9c32761543028f78867e9
+  data.tar.gz: 64bd6b858b83263d93ab18cbb2a30a016e5e582b
 SHA512:
-  metadata.gz: 6e5f99a8afee02410df2390febd5afe0044da4b236ad9bf7de3b706faf72ce162e909688d09333a4bfc89c2f98c382480c6fc2345e2b8d88ccfc6e1cc4764206
-  data.tar.gz: 9c2c171bf0f0986d7b4fefae4ee093a5b05928a8aa374b63b0bfe1f793cb0ad624bcfcf5a73624b68162e1442288555d8e79f06f8e975a499537f7b600123531
+  metadata.gz: 1eef9aa31c0937cb54ad9e199e356d5fe9a66f274169ea1ab559a3358372de3066e67710bb272ea0cfe679e7f494782cdfd871db71804cf8498805a71b33bd1c
+  data.tar.gz: 30b377ef199f06815dd5e5c8dca6ea3d4446b61ffb7e2070485fec138dcfd4fac4b04fe652b2bf11ad4bad720ebb880418d542a3365c159c06bbf98d6fb4d375

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    xp5k (0.0.14)
+    xp5k (0.0.15)
       json (~> 1.8)
       net-ssh-multi (~> 1.2)
+      rack (= 1.6.4)
       rest-client (~> 1.8)
       restfully (~> 1.1)
       term-ansicolor (~> 1.3)
@@ -11,26 +12,28 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.3.8)
-    backports (3.6.7)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    backports (3.8.0)
     bond (0.4.3)
-    domain_name (0.5.25)
+    domain_name (0.5.20170404)
       unf (>= 0.0.5, < 1.0.0)
-    http-cookie (1.0.2)
+    http-cookie (1.0.3)
       domain_name (~> 0.5)
-    json (1.8.3)
-    mime-types (2.6.2)
-    net-ssh (3.0.1)
-    net-ssh-gateway (1.2.0)
-      net-ssh (>= 2.6.5)
+    json (1.8.6)
+    mime-types (2.99.3)
+    net-ssh (4.2.0)
+    net-ssh-gateway (2.0.0)
+      net-ssh (>= 4.0.0)
     net-ssh-multi (1.2.1)
       net-ssh (>= 2.6.5)
       net-ssh-gateway (>= 1.2.0)
     netrc (0.11.0)
+    public_suffix (3.0.0)
     rack (1.6.4)
-    rack-cache (1.5.1)
+    rack-cache (1.7.1)
       rack (>= 0.4)
-    rb-readline (0.5.3)
+    rb-readline (0.5.5)
     rest-client (1.8.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
@@ -38,7 +41,7 @@ GEM
     rest-client-components (1.4.0)
       rack (>= 1.0.1)
       rest-client (>= 1.6.0)
-    restfully (1.1.1)
+    restfully (1.2.0)
       addressable
       backports
       json (~> 1.5)
@@ -61,12 +64,12 @@ GEM
       ripl (>= 0.3.0)
     ripl-short_errors (0.1.0)
       ripl (>= 0.2.8)
-    term-ansicolor (1.3.2)
+    term-ansicolor (1.6.0)
       tins (~> 1.0)
-    tins (1.6.0)
+    tins (1.15.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.1)
+    unf_ext (0.0.7.4)
 
 PLATFORMS
   ruby
@@ -76,4 +79,4 @@ DEPENDENCIES
   xp5k!
 
 BUNDLED WITH
-   1.10.6
+   1.15.4

data/lib/xp5k/version.rb

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

data/lib/xp5k/xp.rb

@@ -78,20 +78,22 @@ module XP5K
 
     def define_job(job_hash)
       self.jobs2submit << job_hash
-
-      if File.exists?(".xp_cache")
-        datas = JSON.parse(File.read(".xp_cache"))
-        uid = datas["jobs"].select { |x| x["name"] == job_hash[:name] }.first["uid"]
+      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"]
+        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]
           if (not job.nil? or job["state"] == "running")
             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"]
+        self.deployed_nodes = datas["deployed_nodes"] if datas
       end
 
     end

data/xp5k.gemspec

@@ -15,6 +15,7 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = '>= 1.3.6'
 
+  s.add_dependency 'rack', '1.6.4'
   s.add_dependency 'rest-client', '~> 1.8' # SSL problems with newer version
   s.add_dependency 'restfully', '~>1.1'
   s.add_dependency 'term-ansicolor', '~> 1.3'

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: xp5k
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - Pascal Morillon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-08 00:00:00.000000000 Z
+date: 2017-09-13 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.4
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement