sfrest 0.0.21 → 0.0.22
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/sfrest/collection.rb +1 -0
- data/lib/sfrest/connection.rb +1 -2
- data/lib/sfrest/role.rb +1 -0
- data/lib/sfrest/site.rb +1 -0
- data/lib/sfrest/stage.rb +2 -0
- data/lib/sfrest/task.rb +9 -0
- data/lib/sfrest/update.rb +3 -0
- data/lib/sfrest/usage.rb +2 -2
- data/lib/sfrest/user.rb +1 -0
- data/lib/sfrest/version.rb +1 -1
- data/lib/sfrest.rb +1 -0
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: e73f943ba9b8d1fb28f504c382273789e979bc5668f2c6e0df27cc597efe50bf
|
4
|
+
data.tar.gz: 6e63e920a28f1b0d606a25ff011b873ffa145c21a2fd5a143a76ef5ad7b7ba1a
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: d70abcb602f762b44906d90eaef11b9a538e9d783ff9bc6ed8264900be6839a130653aa71876011be86d0cb8c76345e7de39cc8d6a209ac4d9096ad9469ee1e2
|
7
|
+
data.tar.gz: fe46c03ba7f8856d22edb5f1a8cecb04476b67233e8195752085d5ad919cfb11d5fbc0dac4b9b8df152e9627f4f1f062f7edb457f1de3d695cc2a5f6e061f682
|
data/lib/sfrest/collection.rb
CHANGED
data/lib/sfrest/connection.rb
CHANGED
@@ -98,8 +98,7 @@ module SFRest
|
|
98
98
|
# else Object
|
99
99
|
def api_response(res, return_status = false)
|
100
100
|
data = access_check JSON(res.body), res.status
|
101
|
-
|
102
|
-
return ret_data
|
101
|
+
return_status ? [res.status, data] : data
|
103
102
|
rescue JSON::ParserError
|
104
103
|
message = "Invalid data, status #{res.status}, body: #{res.body}"
|
105
104
|
raise SFRest::InvalidResponse, message
|
data/lib/sfrest/role.rb
CHANGED
data/lib/sfrest/site.rb
CHANGED
data/lib/sfrest/stage.rb
CHANGED
@@ -15,6 +15,7 @@ module SFRest
|
|
15
15
|
# @return [Integer] Id of the staging task created.
|
16
16
|
def stage(to_env = 'test', sites = nil, email_site_status = false, skip_gardener = false)
|
17
17
|
raise InvalidApiVersion, staging_versions unless staging_versions.include? 1
|
18
|
+
|
18
19
|
payload = { 'to_env' => to_env, 'sites' => sites,
|
19
20
|
'detailed_status' => email_site_status,
|
20
21
|
'skip_gardener' => skip_gardener }.to_json
|
@@ -35,6 +36,7 @@ module SFRest
|
|
35
36
|
wipe_target_environment: false,
|
36
37
|
synchronize_all_users: true)
|
37
38
|
raise InvalidApiVersion, staging_versions unless staging_versions.include? 2
|
39
|
+
|
38
40
|
payload = { 'to_env' => env, 'sites' => sites,
|
39
41
|
'detailed_status' => email_site_status,
|
40
42
|
'wipe_target_environment' => wipe_target_environment,
|
data/lib/sfrest/task.rb
CHANGED
@@ -24,6 +24,7 @@ module SFRest
|
|
24
24
|
# @return [Boolean]
|
25
25
|
def status_not_started?(status)
|
26
26
|
return true if (status.to_i & STATUS_TO_BE_RUN) > 0
|
27
|
+
|
27
28
|
false
|
28
29
|
end
|
29
30
|
|
@@ -32,6 +33,7 @@ module SFRest
|
|
32
33
|
# @return [Boolean]
|
33
34
|
def status_completed?(status)
|
34
35
|
return true if status.to_i == STATUS_COMPLETED
|
36
|
+
|
35
37
|
false
|
36
38
|
end
|
37
39
|
|
@@ -41,6 +43,7 @@ module SFRest
|
|
41
43
|
# @return [Boolean]
|
42
44
|
def status_running?(status)
|
43
45
|
return true if (status.to_i & STATUS_RUNNING) > 0
|
46
|
+
|
44
47
|
false
|
45
48
|
end
|
46
49
|
|
@@ -49,6 +52,7 @@ module SFRest
|
|
49
52
|
# @return [Boolean]
|
50
53
|
def status_error?(status)
|
51
54
|
return true if status.to_i == STATUS_ERROR
|
55
|
+
|
52
56
|
false
|
53
57
|
end
|
54
58
|
|
@@ -57,6 +61,7 @@ module SFRest
|
|
57
61
|
# @return [Boolean]
|
58
62
|
def status_killed?(status)
|
59
63
|
return true if status.to_i == STATUS_KILLED
|
64
|
+
|
60
65
|
false
|
61
66
|
end
|
62
67
|
|
@@ -66,6 +71,7 @@ module SFRest
|
|
66
71
|
# @return [Boolean]
|
67
72
|
def status_done?(status)
|
68
73
|
return true if (status.to_i & STATUS_DONE) > 0
|
74
|
+
|
69
75
|
false
|
70
76
|
end
|
71
77
|
|
@@ -77,6 +83,7 @@ module SFRest
|
|
77
83
|
res = @conn.get(current_path)
|
78
84
|
raise InvalidDataError, "No wip task returned for task id #{task_id}" if res['wip_task'].nil?
|
79
85
|
raise InvalidDataError, "No task status returned for task id #{task_id}" if res['wip_task']['status'].nil?
|
86
|
+
|
80
87
|
res['wip_task']['status']
|
81
88
|
end
|
82
89
|
|
@@ -175,6 +182,7 @@ module SFRest
|
|
175
182
|
tasks = find_tasks(limit: page_size, page: page, group: group, class: klass, status: status)
|
176
183
|
tasks.each do |task|
|
177
184
|
return task['id'].to_i if task['name'] =~ /#{name}/
|
185
|
+
|
178
186
|
page += 1
|
179
187
|
end
|
180
188
|
break if tasks.size < page_size
|
@@ -289,6 +297,7 @@ module SFRest
|
|
289
297
|
loop do
|
290
298
|
break if state_method.call(task_id)
|
291
299
|
raise TaskNotDoneError, "Task: #{task_id} has taken too long to complete!" if Time.new > (nap_start + max_nap)
|
300
|
+
|
292
301
|
sleep blink_time
|
293
302
|
end
|
294
303
|
task_id
|
data/lib/sfrest/update.rb
CHANGED
@@ -33,6 +33,7 @@ module SFRest
|
|
33
33
|
if update_version == 'v2'
|
34
34
|
raise InvalidApiVersion, 'There is more than one codebase use sfrest.update.update directly.'
|
35
35
|
end
|
36
|
+
|
36
37
|
update_data = { scope: 'sites', sites_type: 'code, db', sites_ref: ref }
|
37
38
|
update(update_data)
|
38
39
|
end
|
@@ -102,12 +103,14 @@ module SFRest
|
|
102
103
|
# A factory without the endpoint will raise SFRest::InvalidResponse
|
103
104
|
def v2_endpoint?
|
104
105
|
return @has_v2_endpoint unless @has_v2_endpoint.nil?
|
106
|
+
|
105
107
|
begin
|
106
108
|
@conn.post '/api/v2/update', '{}'
|
107
109
|
rescue SFRest::BadRequestError
|
108
110
|
return @has_v2_endpoint = true
|
109
111
|
rescue SFRest::InvalidResponse => e
|
110
112
|
return @has_v2_endpoint = false if e.message =~ /Invalid data, status 404/
|
113
|
+
|
111
114
|
raise e
|
112
115
|
end
|
113
116
|
end
|
data/lib/sfrest/usage.rb
CHANGED
@@ -41,12 +41,12 @@ module SFRest
|
|
41
41
|
@conn.get URI.parse(pb.build_url_query(current_path, datum)).to_s
|
42
42
|
end
|
43
43
|
|
44
|
+
private
|
45
|
+
|
44
46
|
# returns a Pathbuilder object for manipulating the query parameters
|
45
47
|
# @return [SFRest::Pathbuilder]
|
46
48
|
def pb
|
47
49
|
@pb ||= SFRest::Pathbuilder.new
|
48
50
|
end
|
49
|
-
|
50
|
-
private :pb
|
51
51
|
end
|
52
52
|
end
|
data/lib/sfrest/user.rb
CHANGED
data/lib/sfrest/version.rb
CHANGED
data/lib/sfrest.rb
CHANGED
@@ -54,6 +54,7 @@ module SFRest
|
|
54
54
|
def self.find_data_from_results(res, field, datapat, key)
|
55
55
|
data = res.reject { |k| k.to_s.match(/time|count/) }
|
56
56
|
raise InvalidDataError('The data you are searching is not a hash') unless data.is_a?(Hash)
|
57
|
+
|
57
58
|
data.each_value do |datum|
|
58
59
|
datum.each do |dat|
|
59
60
|
return dat[key] if dat[field].to_s =~ /#{datapat}/
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: sfrest
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
4
|
+
version: 0.0.22
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- ACSF Engineering
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2018-10-
|
11
|
+
date: 2018-10-15 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: excon
|