sfrest 0.0.21 → 0.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24b7f0820484e682a340217f50f1ee1b236dd80b5612c9020a498a2d63c0577b
-  data.tar.gz: c5b3411f739ec602bb24999bbe23c7fa577634b7b144e8c2ba2b66f0ef67b852
+  metadata.gz: e73f943ba9b8d1fb28f504c382273789e979bc5668f2c6e0df27cc597efe50bf
+  data.tar.gz: 6e63e920a28f1b0d606a25ff011b873ffa145c21a2fd5a143a76ef5ad7b7ba1a
 SHA512:
-  metadata.gz: bfdf52d93199f81c0a41a1b9546eee129bbfc84436df0137e900a05e2b6784135b031c1177980158cd4008ff35fbfdfbc06a76b5b0be271d3fd734f00d7f98db
-  data.tar.gz: a78cd935ffa7d2f181deb91ac8c354d86cbe09f2cb03edcb6a72c24c2467aeeedc3e589499e5964ed6cb674ff99515b639c8581d1f4ef357f4708c1e5b45689d
+  metadata.gz: d70abcb602f762b44906d90eaef11b9a538e9d783ff9bc6ed8264900be6839a130653aa71876011be86d0cb8c76345e7de39cc8d6a209ac4d9096ad9469ee1e2
+  data.tar.gz: fe46c03ba7f8856d22edb5f1a8cecb04476b67233e8195752085d5ad919cfb11d5fbc0dac4b9b8df152e9627f4f1f062f7edb457f1de3d695cc2a5f6e061f682

data/lib/sfrest/collection.rb

@@ -16,6 +16,7 @@ module SFRest
       count = res['count'].to_i
       id = collection_data_from_results(res, name, 'id')
       return id if id
+
       pages = (count / pglimit) + 1
       2.upto(pages) do |i|
         res = @conn.get('/api/v1/collections&limit=' + pglimit.to_s + '?page=' + i.to_s)

data/lib/sfrest/connection.rb

@@ -98,8 +98,7 @@ module SFRest
     #                        else Object
     def api_response(res, return_status = false)
       data = access_check JSON(res.body), res.status
-      ret_data = return_status ? [res.status, data] : data
-      return ret_data
+      return_status ? [res.status, data] : data
     rescue JSON::ParserError
       message = "Invalid data, status #{res.status}, body: #{res.body}"
       raise SFRest::InvalidResponse, message

data/lib/sfrest/role.rb

@@ -46,6 +46,7 @@ module SFRest
       rolecount = res['count'].to_i
       id = role_data_from_results(res, rolename)
       return id if id
+
       pages = (rolecount / pglimit) + 1
       2.upto(pages) do |i|
         res = @conn.get('/api/v1/roles&limit=' + pglimit.to_s + '?page=' + i.to_s)

data/lib/sfrest/site.rb

@@ -16,6 +16,7 @@ module SFRest
       sitecount = res['count'].to_i
       id = site_data_from_results(res, sitename, 'id')
       return id if id
+
       pages = (sitecount / pglimit) + 1
       2.upto(pages) do |i|
         res = @conn.get('/api/v1/sites&limit=' + pglimit.to_s + '?page=' + i.to_s)

data/lib/sfrest/stage.rb

@@ -15,6 +15,7 @@ module SFRest
     # @return [Integer] Id of the staging task created.
     def stage(to_env = 'test', sites = nil, email_site_status = false, skip_gardener = false)
       raise InvalidApiVersion, staging_versions unless staging_versions.include? 1
+
       payload = { 'to_env' => to_env, 'sites' => sites,
                   'detailed_status' => email_site_status,
                   'skip_gardener' => skip_gardener }.to_json
@@ -35,6 +36,7 @@ module SFRest
                        wipe_target_environment: false,
                        synchronize_all_users: true)
       raise InvalidApiVersion, staging_versions unless staging_versions.include? 2
+
       payload = { 'to_env' => env, 'sites' => sites,
                   'detailed_status' => email_site_status,
                   'wipe_target_environment' => wipe_target_environment,

data/lib/sfrest/task.rb

@@ -24,6 +24,7 @@ module SFRest
     # @return [Boolean]
     def status_not_started?(status)
       return true if (status.to_i & STATUS_TO_BE_RUN) > 0
+
       false
     end
 
@@ -32,6 +33,7 @@ module SFRest
     # @return [Boolean]
     def status_completed?(status)
       return true if status.to_i == STATUS_COMPLETED
+
       false
     end
 
@@ -41,6 +43,7 @@ module SFRest
     # @return [Boolean]
     def status_running?(status)
       return true if (status.to_i & STATUS_RUNNING) > 0
+
       false
     end
 
@@ -49,6 +52,7 @@ module SFRest
     # @return [Boolean]
     def status_error?(status)
       return true if status.to_i == STATUS_ERROR
+
       false
     end
 
@@ -57,6 +61,7 @@ module SFRest
     # @return [Boolean]
     def status_killed?(status)
       return true if status.to_i == STATUS_KILLED
+
       false
     end
 
@@ -66,6 +71,7 @@ module SFRest
     # @return [Boolean]
     def status_done?(status)
       return true if (status.to_i & STATUS_DONE) > 0
+
       false
     end
 
@@ -77,6 +83,7 @@ module SFRest
       res = @conn.get(current_path)
       raise InvalidDataError, "No wip task returned for task id #{task_id}" if res['wip_task'].nil?
       raise InvalidDataError, "No task status returned for task id #{task_id}" if res['wip_task']['status'].nil?
+
       res['wip_task']['status']
     end
 
@@ -175,6 +182,7 @@ module SFRest
         tasks = find_tasks(limit: page_size, page: page, group: group, class: klass, status: status)
         tasks.each do |task|
           return task['id'].to_i if task['name'] =~ /#{name}/
+
           page += 1
         end
         break if tasks.size < page_size
@@ -289,6 +297,7 @@ module SFRest
       loop do
         break if state_method.call(task_id)
         raise TaskNotDoneError, "Task: #{task_id} has taken too long to complete!" if Time.new > (nap_start + max_nap)
+
         sleep blink_time
       end
       task_id

data/lib/sfrest/update.rb

@@ -33,6 +33,7 @@ module SFRest
       if update_version == 'v2'
         raise InvalidApiVersion, 'There is more than one codebase use sfrest.update.update directly.'
       end
+
       update_data = { scope: 'sites', sites_type: 'code, db', sites_ref: ref }
       update(update_data)
     end
@@ -102,12 +103,14 @@ module SFRest
     # A factory without the endpoint will raise SFRest::InvalidResponse
     def v2_endpoint?
       return @has_v2_endpoint unless @has_v2_endpoint.nil?
+
       begin
         @conn.post '/api/v2/update', '{}'
       rescue SFRest::BadRequestError
         return @has_v2_endpoint = true
       rescue SFRest::InvalidResponse => e
         return @has_v2_endpoint = false if e.message =~ /Invalid data, status 404/
+
         raise e
       end
     end

data/lib/sfrest/usage.rb

@@ -41,12 +41,12 @@ module SFRest
       @conn.get URI.parse(pb.build_url_query(current_path, datum)).to_s
     end
 
+    private
+
     # returns a Pathbuilder object for manipulating the query parameters
     # @return [SFRest::Pathbuilder]
     def pb
       @pb ||= SFRest::Pathbuilder.new
     end
-
-    private :pb
   end
 end

data/lib/sfrest/user.rb

@@ -43,6 +43,7 @@ module SFRest
       usercount = res['count'].to_i
       id = user_data_from_results(res, username, 'uid')
       return id if id
+
       pages = (usercount / pglimit) + 1
       2.upto(pages) do |i|
         res = @conn.get('/api/v1/users&limit=' + pglimit.to_s + '?page=' + i.to_s)

data/lib/sfrest/version.rb

@@ -1,4 +1,4 @@
 module SFRest
   # Just tracks the version of sfrest.
-  VERSION = '0.0.21'.freeze
+  VERSION = '0.0.22'.freeze
 end

data/lib/sfrest.rb

@@ -54,6 +54,7 @@ module SFRest
   def self.find_data_from_results(res, field, datapat, key)
     data = res.reject { |k| k.to_s.match(/time|count/) }
     raise InvalidDataError('The data you are searching is not a hash') unless data.is_a?(Hash)
+
     data.each_value do |datum|
       datum.each do |dat|
         return dat[key] if dat[field].to_s =~ /#{datapat}/

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sfrest
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.22
 platform: ruby
 authors:
 - ACSF Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-12 00:00:00.000000000 Z
+date: 2018-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon