xp5k 0.0.15 → 0.0.16
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +20 -17
- data/lib/xp5k/version.rb +1 -1
- data/lib/xp5k/xp.rb +7 -5
- data/xp5k.gemspec +1 -0
- metadata +16 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 4af38fdece7ea8f615a9c32761543028f78867e9
|
4
|
+
data.tar.gz: 64bd6b858b83263d93ab18cbb2a30a016e5e582b
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 1eef9aa31c0937cb54ad9e199e356d5fe9a66f274169ea1ab559a3358372de3066e67710bb272ea0cfe679e7f494782cdfd871db71804cf8498805a71b33bd1c
|
7
|
+
data.tar.gz: 30b377ef199f06815dd5e5c8dca6ea3d4446b61ffb7e2070485fec138dcfd4fac4b04fe652b2bf11ad4bad720ebb880418d542a3365c159c06bbf98d6fb4d375
|
data/Gemfile.lock
CHANGED
@@ -1,9 +1,10 @@
|
|
1
1
|
PATH
|
2
2
|
remote: .
|
3
3
|
specs:
|
4
|
-
xp5k (0.0.
|
4
|
+
xp5k (0.0.15)
|
5
5
|
json (~> 1.8)
|
6
6
|
net-ssh-multi (~> 1.2)
|
7
|
+
rack (= 1.6.4)
|
7
8
|
rest-client (~> 1.8)
|
8
9
|
restfully (~> 1.1)
|
9
10
|
term-ansicolor (~> 1.3)
|
@@ -11,26 +12,28 @@ PATH
|
|
11
12
|
GEM
|
12
13
|
remote: http://rubygems.org/
|
13
14
|
specs:
|
14
|
-
addressable (2.
|
15
|
-
|
15
|
+
addressable (2.5.2)
|
16
|
+
public_suffix (>= 2.0.2, < 4.0)
|
17
|
+
backports (3.8.0)
|
16
18
|
bond (0.4.3)
|
17
|
-
domain_name (0.5.
|
19
|
+
domain_name (0.5.20170404)
|
18
20
|
unf (>= 0.0.5, < 1.0.0)
|
19
|
-
http-cookie (1.0.
|
21
|
+
http-cookie (1.0.3)
|
20
22
|
domain_name (~> 0.5)
|
21
|
-
json (1.8.
|
22
|
-
mime-types (2.
|
23
|
-
net-ssh (
|
24
|
-
net-ssh-gateway (
|
25
|
-
net-ssh (>=
|
23
|
+
json (1.8.6)
|
24
|
+
mime-types (2.99.3)
|
25
|
+
net-ssh (4.2.0)
|
26
|
+
net-ssh-gateway (2.0.0)
|
27
|
+
net-ssh (>= 4.0.0)
|
26
28
|
net-ssh-multi (1.2.1)
|
27
29
|
net-ssh (>= 2.6.5)
|
28
30
|
net-ssh-gateway (>= 1.2.0)
|
29
31
|
netrc (0.11.0)
|
32
|
+
public_suffix (3.0.0)
|
30
33
|
rack (1.6.4)
|
31
|
-
rack-cache (1.
|
34
|
+
rack-cache (1.7.1)
|
32
35
|
rack (>= 0.4)
|
33
|
-
rb-readline (0.5.
|
36
|
+
rb-readline (0.5.5)
|
34
37
|
rest-client (1.8.0)
|
35
38
|
http-cookie (>= 1.0.2, < 2.0)
|
36
39
|
mime-types (>= 1.16, < 3.0)
|
@@ -38,7 +41,7 @@ GEM
|
|
38
41
|
rest-client-components (1.4.0)
|
39
42
|
rack (>= 1.0.1)
|
40
43
|
rest-client (>= 1.6.0)
|
41
|
-
restfully (1.
|
44
|
+
restfully (1.2.0)
|
42
45
|
addressable
|
43
46
|
backports
|
44
47
|
json (~> 1.5)
|
@@ -61,12 +64,12 @@ GEM
|
|
61
64
|
ripl (>= 0.3.0)
|
62
65
|
ripl-short_errors (0.1.0)
|
63
66
|
ripl (>= 0.2.8)
|
64
|
-
term-ansicolor (1.
|
67
|
+
term-ansicolor (1.6.0)
|
65
68
|
tins (~> 1.0)
|
66
|
-
tins (1.
|
69
|
+
tins (1.15.0)
|
67
70
|
unf (0.1.4)
|
68
71
|
unf_ext
|
69
|
-
unf_ext (0.0.7.
|
72
|
+
unf_ext (0.0.7.4)
|
70
73
|
|
71
74
|
PLATFORMS
|
72
75
|
ruby
|
@@ -76,4 +79,4 @@ DEPENDENCIES
|
|
76
79
|
xp5k!
|
77
80
|
|
78
81
|
BUNDLED WITH
|
79
|
-
1.
|
82
|
+
1.15.4
|
data/lib/xp5k/version.rb
CHANGED
data/lib/xp5k/xp.rb
CHANGED
@@ -78,20 +78,22 @@ module XP5K
|
|
78
78
|
|
79
79
|
def define_job(job_hash)
|
80
80
|
self.jobs2submit << job_hash
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
|
81
|
+
if File.exists?(".xp_cache") or job_hash[:jobid]
|
82
|
+
uid = job_hash[:jobid] || begin
|
83
|
+
datas = JSON.parse(File.read(".xp_cache"))
|
84
|
+
datas["jobs"].select { |x| x["name"] == job_hash[:name] }.first["uid"]
|
85
|
+
end
|
85
86
|
unless uid.nil?
|
86
87
|
job = @connection.root.sites[job_hash[:site].to_sym].jobs(:query => { :user => @connection.config.options[:username] || ENV['USER'] })["#{uid}".to_sym]
|
87
88
|
if (not job.nil? or job["state"] == "running")
|
88
89
|
j = job.reload
|
89
90
|
self.jobs << j
|
90
91
|
self.roles += Role.create_roles(j, job_hash) unless job_hash[:roles].nil?
|
92
|
+
update_cache()
|
91
93
|
end
|
92
94
|
end
|
93
95
|
# reload last deployed nodes
|
94
|
-
self.deployed_nodes = datas["deployed_nodes"]
|
96
|
+
self.deployed_nodes = datas["deployed_nodes"] if datas
|
95
97
|
end
|
96
98
|
|
97
99
|
end
|
data/xp5k.gemspec
CHANGED
@@ -15,6 +15,7 @@ Gem::Specification.new do |s|
|
|
15
15
|
|
16
16
|
s.required_rubygems_version = '>= 1.3.6'
|
17
17
|
|
18
|
+
s.add_dependency 'rack', '1.6.4'
|
18
19
|
s.add_dependency 'rest-client', '~> 1.8' # SSL problems with newer version
|
19
20
|
s.add_dependency 'restfully', '~>1.1'
|
20
21
|
s.add_dependency 'term-ansicolor', '~> 1.3'
|
metadata
CHANGED
@@ -1,15 +1,29 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: xp5k
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
4
|
+
version: 0.0.16
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Pascal Morillon
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2017-09-
|
11
|
+
date: 2017-09-13 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
|
+
- !ruby/object:Gem::Dependency
|
14
|
+
name: rack
|
15
|
+
requirement: !ruby/object:Gem::Requirement
|
16
|
+
requirements:
|
17
|
+
- - '='
|
18
|
+
- !ruby/object:Gem::Version
|
19
|
+
version: 1.6.4
|
20
|
+
type: :runtime
|
21
|
+
prerelease: false
|
22
|
+
version_requirements: !ruby/object:Gem::Requirement
|
23
|
+
requirements:
|
24
|
+
- - '='
|
25
|
+
- !ruby/object:Gem::Version
|
26
|
+
version: 1.6.4
|
13
27
|
- !ruby/object:Gem::Dependency
|
14
28
|
name: rest-client
|
15
29
|
requirement: !ruby/object:Gem::Requirement
|