vmware-vra 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65183636d3f6ae63ddfcd145b3991d9087a73282
-  data.tar.gz: a4f5bbde07e9a7174ea9ff81f6a24d003c65df8b
+  metadata.gz: 2c8bf64641b851d74d4d1ce864096bdc9cd7c4a8
+  data.tar.gz: 90ecdf6de5c11fadeb6c3662ea193e4505c5318c
 SHA512:
-  metadata.gz: 54e50347512573e05755e67d5b8f8747bab4a647051654fb2d7a777781263b3d9a28edc0eba6054d865bdc90792df7f0b028b8167fcabea7d560027ae2e8a9fa
-  data.tar.gz: 04329bf410e4ca4056e8a8c885884283fc91a78c13cc3fbf2209fc38a65c511ac3f9ae35d228dc70ccf63eeda68f1f7e885b70d9e4be689a0da8874deec681ed
+  metadata.gz: d1cdacf633b38f21eeec6f0223809d13808187844d04e5913f19b4134fa1a92fa0fdbe118a152b8bb44ed31a51b7b35b547321d728a23e51ab61fba97943565b
+  data.tar.gz: dcb8daf0f3ede01d089e7a55ff7f4ce32010079e64924a7f792cc7f9714b57a7174845981f39b87dd11a4e325617eaa381d6d7102bd0d72bbe31b1c72951b015

data/.rubocop.yml

@@ -1,14 +1,5 @@
-Metrics/AbcSize:
-  Max: 30
-Metrics/LineLength:
-  Max: 150
-Metrics/MethodLength:
-  Max: 30
-Style/Documentation:
-  Enabled: false
-Style/SignalException:
-  Enabled: false
-Style/SpaceAroundEqualsInParameterDefault:
-  EnforcedStyle: no_space
-Style/SpaceInsideBrackets:
-  Enabled: false
+AllCops:
+  Exclude:
+    - "spec/data/**/*"
+    - "vendor/**/*"
+    - "pkg/**/*"

data/CHANGELOG.md

@@ -1,7 +1,14 @@
 # Change Log
 
-## [v2.1.0](https://github.com/chef-partners/vmware-vra-gem/tree/v2.1.0)
+## [v2.2.1](https://github.com/chef-partners/vmware-vra-gem/tree/)
 
+[Full Changelog](https://github.com/chef-partners/vmware-vra-gem/compare/v2.1.0...v2.1.1)
+
+**Merged pull requests:**
+
+- Converted to chefstyle [\#41](https://github.com/chef-partners/vmware-vra-gem/pull/41) ([jjasghar](https://github.com/jjasghar))
+
+## [v2.1.0](https://github.com/chef-partners/vmware-vra-gem/tree/v2.1.0) (2017-03-14)
 [Full Changelog](https://github.com/chef-partners/vmware-vra-gem/compare/v2.0.0...v2.1.0)
 
 **Merged pull requests:**

data/Gemfile

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in vmware-vra-gem.gemspec
 gemspec

data/README.md

@@ -1,5 +1,5 @@
 # VMware vRA Gem
-[![Gem Version](https://badge.fury.io/rb/vmware-vra-gem.svg)](http://badge.fury.io/rb/vmware-vra-gem)
+[![Gem Version](https://badge.fury.io/rb/vmware-vra.svg)](http://badge.fury.io/rb/vmware-vra)
 [![Build Status](https://travis-ci.org/chef-partners/vmware-vra-gem.svg?branch=master)](https://travis-ci.org/chef-partners/vmware-vra-gem)
 
 Client gem for interacting with VMware's vRealize Automation application.

data/Rakefile

@@ -1,9 +1,12 @@
 # frozen_string_literal: true
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
-require 'rubocop/rake_task'
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+require "chefstyle"
+require "rubocop/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
-RuboCop::RakeTask.new(:style)
+RuboCop::RakeTask.new do |task|
+  task.options << "--display-cop-names"
+end
 
-task default: [ :spec, :style ]
+task default: [ :spec, :rubocop ]

data/lib/vra.rb

@@ -17,14 +17,14 @@
 # limitations under the License.
 #
 
-require 'vra/catalog'
-require 'vra/catalog_item'
-require 'vra/catalog_request'
-require 'vra/client'
-require 'vra/exceptions'
-require 'vra/request'
-require 'vra/request_parameters'
-require 'vra/requests'
-require 'vra/resource'
-require 'vra/resources'
-require 'vra/version'
+require "vra/catalog"
+require "vra/catalog_item"
+require "vra/catalog_request"
+require "vra/client"
+require "vra/exceptions"
+require "vra/request"
+require "vra/request_parameters"
+require "vra/requests"
+require "vra/resource"
+require "vra/resources"
+require "vra/version"

data/lib/vra/catalog.rb

@@ -26,13 +26,13 @@ module Vra
     end
 
     def all_items
-      client.http_get_paginated_array!('/catalog-service/api/consumer/catalogItems')
+      client.http_get_paginated_array!("/catalog-service/api/consumer/catalogItems")
             .map! { |x| Vra::CatalogItem.new(client, data: x) }
     end
 
     def entitled_items
-      client.http_get_paginated_array!('/catalog-service/api/consumer/entitledCatalogItems')
-            .map! { |x| Vra::CatalogItem.new(client, data: x['catalogItem']) }
+      client.http_get_paginated_array!("/catalog-service/api/consumer/entitledCatalogItems")
+            .map! { |x| Vra::CatalogItem.new(client, data: x["catalogItem"]) }
     end
 
     def request(*args)

data/lib/vra/catalog_item.rb

@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-require 'ffi_yajl'
+require "ffi_yajl"
 
 module Vra
   class CatalogItem
@@ -28,17 +28,17 @@ module Vra
       @catalog_item_data = opts[:data]
 
       if @id.nil? && @catalog_item_data.nil?
-        raise ArgumentError, 'must supply an id or a catalog item data hash'
+        raise ArgumentError, "must supply an id or a catalog item data hash"
       end
 
       if !@id.nil? && !@catalog_item_data.nil?
-        raise ArgumentError, 'must supply an id OR a catalog item data hash, not both'
+        raise ArgumentError, "must supply an id OR a catalog item data hash, not both"
       end
 
       if @catalog_item_data.nil?
         fetch_catalog_item
       else
-        @id = @catalog_item_data['id']
+        @id = @catalog_item_data["id"]
       end
     end
 
@@ -49,41 +49,41 @@ module Vra
     end
 
     def name
-      @catalog_item_data['name']
+      @catalog_item_data["name"]
     end
 
     def description
-      @catalog_item_data['description']
+      @catalog_item_data["description"]
     end
 
     def status
-      @catalog_item_data['status']
+      @catalog_item_data["status"]
     end
 
     def organization
-      return {} if @catalog_item_data['organization'].nil?
+      return {} if @catalog_item_data["organization"].nil?
 
-      @catalog_item_data['organization']
+      @catalog_item_data["organization"]
     end
 
     def tenant_id
-      organization['tenantRef']
+      organization["tenantRef"]
     end
 
     def tenant_name
-      organization['tenantLabel']
+      organization["tenantLabel"]
     end
 
     def subtenant_id
-      organization['subtenantRef']
+      organization["subtenantRef"]
     end
 
     def subtenant_name
-      organization['subtenantLabel']
+      organization["subtenantLabel"]
     end
 
     def blueprint_id
-      @catalog_item_data['providerBinding']['bindingId']
+      @catalog_item_data["providerBinding"]["bindingId"]
     end
   end
 end

data/lib/vra/catalog_request.rb

@@ -23,7 +23,7 @@ module Vra
     attr_writer :subtenant_id
     attr_accessor :cpus, :memory, :requested_for, :lease_days, :notes
 
-    def initialize(client, catalog_id, opts={})
+    def initialize(client, catalog_id, opts = {})
       @client            = client
       @catalog_id        = catalog_id
       @cpus              = opts[:cpus]
@@ -64,16 +64,16 @@ module Vra
 
     def merge_payload(payload)
       hash_payload = JSON.parse(payload)
-      blueprint_name = hash_payload['data'].select { |_k, v| v.is_a?(Hash) }.keys.first
+      blueprint_name = hash_payload["data"].select { |_k, v| v.is_a?(Hash) }.keys.first
 
-      hash_payload['data'][blueprint_name]['data']['cpu'] = @cpus
-      hash_payload['data'][blueprint_name]['data']['memory'] = @memory
-      hash_payload['requestedFor'] = @requested_for
-      hash_payload['data']['_leaseDays'] = @lease_days
-      hash_payload['description'] = @notes
+      hash_payload["data"][blueprint_name]["data"]["cpu"] = @cpus
+      hash_payload["data"][blueprint_name]["data"]["memory"] = @memory
+      hash_payload["requestedFor"] = @requested_for
+      hash_payload["data"]["_leaseDays"] = @lease_days
+      hash_payload["description"] = @notes
 
       parameters.each do |param|
-        hash_payload['data'][blueprint_name]['data'][param.key] = param.value
+        hash_payload["data"][blueprint_name]["data"][param.key] = param.value
       end
 
       JSON.pretty_generate(hash_payload)
@@ -91,7 +91,7 @@ module Vra
         raise
       end
 
-      request_id = JSON.parse(post_response.body)['id']
+      request_id = JSON.parse(post_response.body)["id"]
       Vra::Request.new(client, request_id)
     end
   end

data/lib/vra/client.rb

@@ -17,9 +17,9 @@
 # limitations under the License.
 #
 
-require 'ffi_yajl'
-require 'passwordmasker'
-require 'vra/http'
+require "ffi_yajl"
+require "passwordmasker"
+require "vra/http"
 
 module Vra
   # rubocop:disable ClassLength
@@ -70,24 +70,24 @@ module Vra
 
     def bearer_token_request_body
       {
-        'username' => @username,
-        'password' => @password.value,
-        'tenant'   => @tenant
+        "username" => @username,
+        "password" => @password.value,
+        "tenant"   => @tenant,
       }
     end
 
     def request_headers
       headers = {}
-      headers['Accept']        = 'application/json'
-      headers['Content-Type']  = 'application/json'
-      headers['Authorization'] = "Bearer #{@bearer_token.value}" unless @bearer_token.value.nil?
+      headers["Accept"]        = "application/json"
+      headers["Content-Type"]  = "application/json"
+      headers["Authorization"] = "Bearer #{@bearer_token.value}" unless @bearer_token.value.nil?
       headers
     end
 
     def authorize!
       generate_bearer_token unless authorized?
 
-      raise Vra::Exception::Unauthorized, 'Unable to authorize against vRA' unless authorized?
+      raise Vra::Exception::Unauthorized, "Unable to authorize against vRA" unless authorized?
     end
 
     def authorized?
@@ -101,21 +101,21 @@ module Vra
       @bearer_token.value = nil
       validate_client_options!
 
-      response = http_post('/identity/api/tokens',
+      response = http_post("/identity/api/tokens",
                            FFI_Yajl::Encoder.encode(bearer_token_request_body),
                            :skip_auth)
       unless response.success_ok?
         raise Vra::Exception::Unauthorized, "Unable to get bearer token: #{response.body}"
       end
 
-      @bearer_token.value = FFI_Yajl::Parser.parse(response.body)['id']
+      @bearer_token.value = FFI_Yajl::Parser.parse(response.body)["id"]
     end
 
     def full_url(path)
       "#{@base_url}#{path}"
     end
 
-    def http_fetch(method, path, skip_auth=nil)
+    def http_fetch(method, path, skip_auth = nil)
       authorize! unless skip_auth
 
       response = Vra::Http.execute(method: method,
@@ -128,11 +128,11 @@ module Vra
       response
     end
 
-    def http_head(path, skip_auth=nil)
+    def http_head(path, skip_auth = nil)
       http_fetch(:head, path, skip_auth)
     end
 
-    def http_get(path, skip_auth=nil)
+    def http_get(path, skip_auth = nil)
       http_fetch(:get, path, skip_auth)
     end
 
@@ -152,22 +152,24 @@ module Vra
 
       loop do
         response = get_parsed("#{base_path}&page=#{page}")
-        items += response['content']
+        items += response["content"]
 
-        break if page >= response['metadata']['totalPages']
+        break if page >= response["metadata"]["totalPages"]
         page += 1
       end
 
-      raise Vra::Exception::DuplicateItemsDetected,
-            'Duplicate items were returned by the vRA API. ' \
-            'Increase your page size to avoid this vRA API bug. ' \
-            'See https://github.com/chef-partners/vmware-vra-gem#pagination ' \
-            'for more information.' if items.uniq!
+      if items.uniq!
+        raise Vra::Exception::DuplicateItemsDetected,
+              "Duplicate items were returned by the vRA API. " \
+              "Increase your page size to avoid this vRA API bug. " \
+              "See https://github.com/chef-partners/vmware-vra-gem#pagination " \
+              "for more information."
+      end
 
       items
     end
 
-    def http_post(path, payload, skip_auth=nil)
+    def http_post(path, payload, skip_auth = nil)
       authorize! unless skip_auth
 
       response = Vra::Http.execute(method: :post,
@@ -200,14 +202,14 @@ module Vra
                             klass: caught_exception.class,
                             path: path)
 
-      message = exception.errors.empty? ? caught_exception.message : exception.errors.join(', ')
+      message = exception.errors.empty? ? caught_exception.message : exception.errors.join(", ")
       raise exception, message
     end
 
     def validate_client_options!
-      raise ArgumentError, 'Username and password are required' if @username.nil? || @password.value.nil?
-      raise ArgumentError, 'A tenant is required' if @tenant.nil?
-      raise ArgumentError, 'A base URL is required' if @base_url.nil?
+      raise ArgumentError, "Username and password are required" if @username.nil? || @password.value.nil?
+      raise ArgumentError, "A tenant is required" if @tenant.nil?
+      raise ArgumentError, "A base URL is required" if @base_url.nil?
       raise ArgumentError, "Base URL #{@base_url} is not a valid URI." unless valid_uri?(@base_url)
     end
 

data/lib/vra/exceptions.rb

@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-require 'ffi_yajl'
+require "ffi_yajl"
 
 module Vra
   module Exception
@@ -28,7 +28,7 @@ module Vra
 
     class HTTPError < RuntimeError
       attr_accessor :klass, :code, :body, :errors, :path
-      def initialize(opts={})
+      def initialize(opts = {})
         @code = opts[:code]
         @body = opts[:body]
         @path = opts[:path]
@@ -46,10 +46,10 @@ module Vra
         end
 
         return if data.nil?
-        return unless data['errors'].respond_to?(:each)
+        return unless data["errors"].respond_to?(:each)
 
-        data['errors'].each do |error|
-          @errors << error['systemMessage']
+        data["errors"].each do |error|
+          @errors << error["systemMessage"]
         end
       end
     end

data/lib/vra/http.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require 'net/http'
+require "net/http"
 
 module Vra
   module Http
@@ -7,7 +7,7 @@ module Vra
       request = Request.new(params)
       response = request.call
       response = response.forward(request).call until response.final?
-      fail error(response) unless response.success?
+      raise error(response) unless response.success?
       response
     end
 
@@ -35,15 +35,15 @@ module Vra
       end
 
       def call
-        uri = URI(params[:url]) || fail(':url required')
+        uri = URI(params[:url]) || raise(":url required")
 
-        ssl_params = { use_ssl: uri.scheme == 'https' }
+        ssl_params = { use_ssl: uri.scheme == "https" }
         ssl_params[:verify_mode] = OpenSSL::SSL::VERIFY_NONE unless verify_ssl?
 
         Net::HTTP.start(uri.host, uri.port, ssl_params) do |http|
           request = http_request(params[:method], uri)
           request.initialize_http_header(params[:headers] || {})
-          request.body = params[:payload] || ''
+          request.body = params[:payload] || ""
 
           Response.new(http.request(request))
         end
@@ -53,10 +53,10 @@ module Vra
         type = {
           get: Net::HTTP::Get,
           head: Net::HTTP::Head,
-          post: Net::HTTP::Post
+          post: Net::HTTP::Post,
         }.fetch(method, nil)
 
-        fail "Unknown HTTP method #{method}!" unless type
+        raise "Unknown HTTP method #{method}!" unless type
 
         type.new(uri)
       end
@@ -82,7 +82,7 @@ module Vra
 
       def forward(request)
         if redirect?
-          fail Http.error(self) unless request.redirectable?
+          raise Http.error(self) unless request.redirectable?
           request.redirect_to(location)
         elsif see_other?
           request.see_other(location)
@@ -92,7 +92,7 @@ module Vra
       end
 
       def location
-        @response['location']
+        @response["location"]
       end
 
       def body