opsmgr 0.34.5 → 0.34.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fb08546ef1c500b4a048875bb7b99df48d51e5c
-  data.tar.gz: 94b01acdfd5af0f210605174b3d4a10a9bf2d8ef
+  metadata.gz: 98a5d3ec68d13e79a28359983cfb2c992e0a2f43
+  data.tar.gz: 91cd8d00821a78015e92cbcb8411ce02d98e77a3
 SHA512:
-  metadata.gz: 7636ee061f77904d59e02841997628bf2be92b54510498459767ce16916004967361b060ecd1dbb950d722522f1229c4bb32fd083173f58bfd938eba1dc7c7fd
-  data.tar.gz: eb3102e3c807f8bc2943c150a187fb41057be2e01385dcc95174b316e3e74dd1f31af0ce582b6b6b763fe16875880e9c5dbf6e5531967ccc085748f633a2b500
+  metadata.gz: 25bf024931606d04efba69ad4af8067b5043b25e5220b6d2d9a806597d543f727745cd3850d5e243c05854a977ebd29fc26acea94ba6dddc4baa55591c14a3d1
+  data.tar.gz: 7ac29429cc877afa5341748dd349a62e419d355b842abad424595a0351faecabd882a5d40fa01833c4e4651591740f82a565ca63a9185fef75f43f24d41e36f7

data/lib/opsmgr/api/http_client.rb

@@ -224,7 +224,7 @@ module Opsmgr
         retry_count = 0
 
         loop do
-          request =  Net::HTTP::Get.new(
+          request = Net::HTTP::Get.new(
             endpoints.login_ensure_availability
           )
 
@@ -247,16 +247,16 @@ module Opsmgr
       end
 
       def ensure_env_admin_user_exists
-        token =  get_oauth_token('admin')
+        token = get_oauth_token('admin')
 
         create_env_admin_user(token) unless verify_if_env_admin_user_exists?(token)
       end
 
       def verify_if_env_admin_user_exists?(token)
-        request =  Net::HTTP::Get.new(
+        request = Net::HTTP::Get.new(
           endpoints.uaa_get_user_by_username_path(web_auth_user)
         )
-        request['Authorization'] =  token
+        request['Authorization'] = token
 
         response = http.request(request)
 
@@ -270,7 +270,7 @@ module Opsmgr
           raise("Invalid response body from UAA: #{response.body}")
         end
 
-        reply['resources'].length > 0
+        !reply['resources'].empty?
       end
 
       def create_env_admin_user(token)

data/lib/opsmgr/cmd/bosh_command.rb

@@ -73,7 +73,7 @@ module Opsmgr
       def root_cert_file
         @root_cert_file_name ||= begin
           Net::SCP.download!(
-            env_settings['ops_manager']['url'].gsub('https://', '').gsub('/', ''),
+            env_settings['ops_manager']['url'].gsub('https://', '').delete('/'),
             'ubuntu',
             '/var/tempest/workspaces/default/root_ca_certificate',
             filename,

data/lib/opsmgr/errand_runner.rb

@@ -24,9 +24,7 @@ module Opsmgr
         raise 'bosh deployments failed'
       end
 
-      /#{@product_name}-[0-9a-f]{8,}/.match(deployments_output)
-
-      bosh_deployment = $&
+      bosh_deployment = deployments_output[/#{@product_name}-[0-9a-f]{8,}/]
 
       fail 'Deployment not found' if bosh_deployment.nil?
 

data/lib/opsmgr/product_upload_wrapper.rb

@@ -53,10 +53,8 @@ class ProductUploadWrapper
 
        if stored_version.nil?
          stored_version = p['product_version']
-       else
-         if Gem::Version.new(p['product_version']) > Gem::Version.new(stored_version)
-           stored_version = p['product_version']
-         end
+       elsif Gem::Version.new(p['product_version']) > Gem::Version.new(stored_version)
+         stored_version = p['product_version']
        end
     end
 

data/lib/opsmgr/renderer/aws.rb

@@ -30,7 +30,7 @@ module Opsmgr
         rds_ops_manager_dbname: 'PcfRdsDBName',
         ert_elb_dns_name: 'PcfElbDnsName',
         ert_ssh_elb_dns_name: 'PcfElbSshDnsName',
-      }
+      }.freeze
 
       BASE_RENDERER_FIELDS.each do |method_sym, output_key|
         define_method(method_sym) do

data/lib/opsmgr/settings/microbosh/job.rb

@@ -9,7 +9,9 @@ module Opsmgr
         end
 
         def name
-          job_hash.fetch('identifier') rescue job_hash.fetch('type')
+          job_hash.fetch('identifier')
+        rescue
+          job_hash.fetch('type')
         end
 
         def property(property_name)

data/lib/opsmgr/settings/microbosh/product.rb

@@ -15,7 +15,9 @@ module Opsmgr
         end
 
         def name
-          product_hash.fetch('identifier') rescue product_hash.fetch('type')
+          product_hash.fetch('identifier')
+        rescue
+          product_hash.fetch('type')
         end
 
         def disabled_post_deploy_errand_names(errands = nil)

data/lib/opsmgr/settings/microbosh/property.rb

@@ -7,7 +7,9 @@ module Opsmgr
         end
 
         def name
-          @hash.fetch('identifier') rescue @hash['definition']
+          @hash.fetch('identifier')
+        rescue
+          @hash['definition']
         end
 
         def value

data/lib/opsmgr/version.rb

@@ -1,5 +1,5 @@
 module Opsmgr
-  VERSION = '0.34.5'
+  VERSION = '0.34.6'.freeze
 end
 # Copyright (c) 2014-2015 Pivotal Software, Inc.
 # All rights reserved.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opsmgr
 version: !ruby/object:Gem::Version
-  version: 0.34.5
+  version: 0.34.6
 platform: ruby
 authors:
 - Release Engineering
@@ -252,16 +252,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.32.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.32.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement