knife-oraclecloud 1.2.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8a5f09710336f43f39cf4c6265ce3f586c6f82ac
-  data.tar.gz: 854c35c78538ce9aa3f78dbdfca8ec95117c8afc
+SHA256:
+  metadata.gz: 666bd32a9f28ba1daad7ecbbd071d499a6b20381ed6213e44858b3ee5b17908f
+  data.tar.gz: 9e985b970efc5ca2ea52c97dfb47336aadf200c11865a042fff18c048998ed77
 SHA512:
-  metadata.gz: c0e1377013cd712f9bd5e7062d78f2ef62fee2d55c1dec6d49609dfbff901f4641a6a6f168a9a2d2481675b56c4770fff44029b1aeff3360413d4cc374e02027
-  data.tar.gz: 9c46f5d060b6ee32b9cc99cad405ff168ebcd9e045c250ce0350bc399e7589c212cfe972c15b92655acc60536c4b7125b94925928914014c63f6e5ba48a8a60b
+  metadata.gz: 7e8165a0fd7e89521db91a56090e082514e1b77e04f26fcca2560327d6878dcc2fb9ce2e8b77a55d3d55be5c667c8b99a094239ab95e1a11c566c083f70fe9b9
+  data.tar.gz: eb13434d1c161a791e6cd2a64c539765764128166e3ed9c27a2deffee1555a0604d9665550ff55e2ca23332e2c90885408c52af50e1be1270fd0c1b1d317bee7

data/.rubocop.yml

@@ -1,3 +1,5 @@
+inherit_from: .rubocop_todo.yml
+
 Metrics/AbcSize:
   Max: 30
 Metrics/LineLength:

data/.rubocop_todo.yml

@@ -0,0 +1,28 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2018-05-01 10:24:59 -0500 using RuboCop version 0.54.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 14
+# Configuration parameters: CountComments, ExcludedMethods.
+Metrics/BlockLength:
+  Max: 285
+
+# Offense count: 1
+# Configuration parameters: CountComments.
+Metrics/ClassLength:
+  Max: 145
+
+# Offense count: 1
+Naming/MemoizedInstanceVariableName:
+  Exclude:
+    - 'lib/chef/knife/cloud/oraclecloud_service.rb'
+
+# Offense count: 1
+# Configuration parameters: MinBodyLength.
+Style/GuardClause:
+  Exclude:
+    - 'lib/chef/knife/cloud/oraclecloud_service_helpers.rb'

data/.travis.yml

@@ -1,19 +1,16 @@
 language: ruby
 cache: bundler
 sudo: false
-
 rvm:
 - 2.0.0
 - 2.1
 - 2.2
-
 branches:
   only:
-    - master
-
+  - master
 notifications:
   slack:
     on_success: change
     on_failure: always
     rooms:
-      secure: iESaLLqy5RK9os0fB83vXF0DgmMaWE8/tuhEg6rL6m2YlHq+mHwT5Hoc+YIFHbzl4PXS07i99ICFpGiUXuyHSn0jrNrI4z4BRA+3EZ+DLmhHGis3znWZJ1SxrCjYCZazj0SFG49mwaZjeggQNafPm/++sqzVVI5zJuLx+92Dwuztr4sa20Oa2UOKtCsgkNojmNwTKNqlN+bh+/pX7IH5rVUDMkd3k8Sdrd8Jk0AblztGvXJO/Sn+L6Ud9NAb38bVkC7Pw8Zows6Icw4ioCIwH4tl/AI6NwfvHJu33UqoEZu/8aBkSvgjGi+hTaztcwK9xMpK70AZlYEqNS4bVTAw/otAbw+xnqWUQfL3Kc2MjSpxdiLDXhELtV9jV/VlnDwX3L79B0sICKFdcLHrG8I4tMgCDxYTNjUHY+UcccHrPsYwXn01lkCc6Pa7LZnCqS69/2vVfdb8i2LOaEvMvj9uLeeADu2EHeqM0VV1Y58dRCef7Ls8cOiOZEqghG24H1Cu26vHKamLUMZu0ctYOOmxGP159j1iwCkygb2k10BXTGdFuMch3GE3RfwaPFk8UZoY+0tQNP5OGiHhhLyLo16yxXQuDyHq5kkSMuhT/34kdY2cZuJAi8U79YJkNb29CGPUeBJ1QqXulYg/xPKW03FBWxpbkPjdPr9WTbpMGOlhBwc=
+      secure: BvdbFPImsNTFSbNzg7h1S1zjfKO7rhurKx28pP474ppk1uV1V096F8Lu5IaGEykAuCBkqOfMOBcAcOU6+qTxv1Pv2tCftKf92AoXe7R+ZnKstT7MZm4MorvLqz5YsylcoEZG96JhEG7S0ZdKdEYwYB1CXU+iL6hG8aued20KdrvX+uRS2Otk1S4KMG+sgMlTwnUKsQEhJeiWGarGNA6C4K2QbEf91FpHjTKORgeUlq5NBvNOLdp1+R6cYbvlmKom7rvdkY91J//H4k+YnGUfuGLdB/L+pQLlWBF9yrxn8a4C7A3tpWcHgZWXD+jhPSstiWorWIyeqj/OUWU2W0CW8FHsNwfJvYJcnC+1IcwanHgjtp7DjojvNNnKGkkXIa0rDoHTRlCREgmuiDhU+kgcrS8Lc8vRasKwDJy2b24St5HcrkLJl/m+atTtzZqtK3wGssDqM6AEFWn8RYNNpeh1lu/fM6MIVfpwTVmEq7R6gnyv6HC9Qd0U7FjE5s/+GKvnSVJbmc9YQxFbH66xCkp5gHeHb4/dYeAbak4M+/qT4YmrET0eKJjn3WftMB/qu93ck+cASl/jxj27mMowB6njjDuVsx6sn3bDGc3fvHBfsBLqk6IEwFRm2i0Devxp8hgn+jruN0cAWAvo/OtOwDsHbts01fOX82eVd2VFVDXa+/I=

data/CHANGELOG.md

@@ -1,11 +1,40 @@
-# knife-oraclecloud
+# Change Log
 
-## v1.2.0 (2015-12-22)
-* [pr#3](https://github.com/chef-partners/knife-oraclecloud/pull/3) Adding support for private cloud deployments
+## [v2.0.0](https://github.com/chef-partners/knife-oraclecloud/tree/v2.0.0)
 
-## v1.1.0 (2015-12-07)
-* [pr#2](https://github.com/chef-partners/knife-oraclecloud/pull/2) Updated identity domain method calls to match recent changes in the underlying Oracle Cloud client library
+[Full Changelog](https://github.com/chef-partners/knife-oraclecloud/compare/v1.2.0...v2.0.0)
 
-## v1.0.0 (2015-10-15)
-* Initial release
+**Closed issues:**
 
+- Orchestration list command errors out with hard-coded email [\#8](https://github.com/chef-partners/knife-oraclecloud/issues/8)
+- Unable to associate public key to a provisioned Compute instance [\#6](https://github.com/chef-partners/knife-oraclecloud/issues/6)
+- knife.rb configuration [\#5](https://github.com/chef-partners/knife-oraclecloud/issues/5)
+
+**Merged pull requests:**
+
+- Chef 14 support [\#17](https://github.com/chef-partners/knife-oraclecloud/pull/17) ([jjasghar](https://github.com/jjasghar))
+- convert to using chefstyle [\#7](https://github.com/chef-partners/knife-oraclecloud/pull/7) ([adamleff](https://github.com/adamleff))
+- fixing travis notifications [\#4](https://github.com/chef-partners/knife-oraclecloud/pull/4) ([adamleff](https://github.com/adamleff))
+
+## [v1.2.0](https://github.com/chef-partners/knife-oraclecloud/tree/v1.2.0) (2015-12-22)
+[Full Changelog](https://github.com/chef-partners/knife-oraclecloud/compare/v1.1.0...v1.2.0)
+
+**Merged pull requests:**
+
+- Add support for private cloud deployments [\#3](https://github.com/chef-partners/knife-oraclecloud/pull/3) ([adamleff](https://github.com/adamleff))
+
+## [v1.1.0](https://github.com/chef-partners/knife-oraclecloud/tree/v1.1.0) (2015-12-07)
+[Full Changelog](https://github.com/chef-partners/knife-oraclecloud/compare/v1.0.0...v1.1.0)
+
+**Merged pull requests:**
+
+- method name updates due to changes in latest oraclecloud client [\#2](https://github.com/chef-partners/knife-oraclecloud/pull/2) ([adamleff](https://github.com/adamleff))
+
+## [v1.0.0](https://github.com/chef-partners/knife-oraclecloud/tree/v1.0.0) (2015-10-15)
+**Merged pull requests:**
+
+- Initial release [\#1](https://github.com/chef-partners/knife-oraclecloud/pull/1) ([adamleff](https://github.com/adamleff))
+
+
+
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gemspec

data/README.md

@@ -1,7 +1,7 @@
 # knife-oraclecloud
 
 This is a Knife plugin that will allow you to interact with
-Oracle Cloud.
+Oracle Cloud Infrastructure Classic. Please use [knife-oci](https://github.com/oracle/knife-oci) for the newer Oracle Cloud Infrastructure (aka 'OCI').
 
 ## Installation
 

data/Rakefile

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

data/knife-oraclecloud.gemspec

@@ -1,5 +1,7 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 require 'knife-oraclecloud/version'
@@ -19,11 +21,12 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'chef',         '~> 12.0'
+  spec.add_dependency 'chef',         '>= 12.0'
   spec.add_dependency 'knife-cloud',  '~> 1.2.0'
   spec.add_dependency 'oraclecloud',  '~> 1.1'
 
   spec.add_development_dependency 'bundler', '~> 1.7'
+  spec.add_development_dependency 'chefstyle'
   spec.add_development_dependency 'rake',    '~> 10.0'
   spec.add_development_dependency 'rubocop', '~> 0.35'
 end

data/lib/chef/knife/cloud/oraclecloud_service.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #
 # Author:: Chef Partner Engineering (<partnereng@chef.io>)
 # Copyright:: Copyright (c) 2015 Chef Software, Inc.
@@ -25,7 +27,7 @@ require 'oraclecloud'
 class Chef
   class Knife
     class Cloud
-      class OraclecloudService < Service # rubocop:disable Metrics/ClassLength
+      class OraclecloudService < Service
         include OraclecloudServiceHelpers
 
         attr_reader :wait_time, :refresh_time
@@ -68,9 +70,11 @@ class Chef
           ui.msg('')
 
           servers = orchestration.instances
-          raise CloudExceptions::ServerCreateError, 'The orchestration created more than one server, ' \
-            'but we were only expecting 1' if servers.length > 1
-          raise CloudExceptions::ServerCreateError, 'The orchestration did not create any servers' if servers.length == 0
+          if servers.length > 1
+            raise CloudExceptions::ServerCreateError, 'The orchestration created more than one server, ' \
+              'but we were only expecting 1'
+          end
+          raise CloudExceptions::ServerCreateError, 'The orchestration did not create any servers' if servers.empty?
 
           servers.first
         end
@@ -97,7 +101,7 @@ class Chef
           connection.orchestrations.create(
             name: options[:name],
             description: "#{options[:name]} by #{connection.username} via Knife",
-            instances: [ instance_request(options) ]
+            instances: [instance_request(options)]
           )
         end
 

data/lib/chef/knife/cloud/oraclecloud_service_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #
 # Author:: Chef Partner Engineering (<partnereng@chef.io>)
 # Copyright:: Copyright (c) 2015 Chef Software, Inc.
@@ -38,7 +40,7 @@ class Chef
         def check_for_missing_config_values!(*keys)
           missing = keys.select { |x| locate_config_value(x).nil? }
 
-          unless missing.empty? # rubocop:disable Style/GuardClause
+          unless missing.empty?
             ui.error("The following required parameters are missing: #{missing.join(', ')}")
             exit(1)
           end

data/lib/chef/knife/cloud/oraclecloud_service_options.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #
 # Author:: Chef Partner Engineering (<partnereng@chef.io>)
 # Copyright:: Copyright (c) 2015 Chef Software, Inc.
@@ -19,43 +21,42 @@
 class Chef
   class Knife
     class Cloud
-      # rubocop:disable Style/AlignParameters
       module OraclecloudServiceOptions
         def self.included(includer)
           includer.class_eval do
             option :oraclecloud_api_url,
-              long:        '--oraclecloud-api-url API_URL',
-              description: 'URL for the oraclecloud API server'
+                   long:        '--oraclecloud-api-url API_URL',
+                   description: 'URL for the oraclecloud API server'
 
             option :oraclecloud_username,
-              long:        '--oraclecloud-username USERNAME',
-              description: 'Username to use with the oraclecloud API'
+                   long:        '--oraclecloud-username USERNAME',
+                   description: 'Username to use with the oraclecloud API'
 
             option :oraclecloud_password,
-              long:        '--oraclecloud-password PASSWORD',
-              description: 'Password to use with the oraclecloud API'
+                   long:        '--oraclecloud-password PASSWORD',
+                   description: 'Password to use with the oraclecloud API'
 
             option :oraclecloud_domain,
-              long:        '--oraclecloud-domain IDENTITYDOMAIN',
-              description: 'Identity domain to use with the oraclecloud API'
+                   long:        '--oraclecloud-domain IDENTITYDOMAIN',
+                   description: 'Identity domain to use with the oraclecloud API'
 
             option :oraclecloud_disable_ssl_verify,
-              long:        '--oraclecloud-disable-ssl-verify',
-              description: 'Skip any SSL verification for the oraclecloud API',
-              boolean:     true,
-              default:     false
+                   long:        '--oraclecloud-disable-ssl-verify',
+                   description: 'Skip any SSL verification for the oraclecloud API',
+                   boolean:     true,
+                   default:     false
 
             option :oraclecloud_private_cloud,
-              long:        '--oraclecloud-private-cloud',
-              description: 'Indicate the --oraclecloud-api-url is a private cloud endpoint',
-              boolean:     true,
-              default:     false
+                   long:        '--oraclecloud-private-cloud',
+                   description: 'Indicate the --oraclecloud-api-url is a private cloud endpoint',
+                   boolean:     true,
+                   default:     false
 
             option :request_refresh_rate,
-              long:        '--request-refresh-rate SECS',
-              description: 'Number of seconds to sleep between each check of the request status, defaults to 2',
-              default:     2,
-              proc:        proc { |secs| secs.to_i }
+                   long:        '--request-refresh-rate SECS',
+                   description: 'Number of seconds to sleep between each check of the request status, defaults to 2',
+                   default:     2,
+                   proc:        proc { |secs| secs.to_i }
           end
         end
       end

data/lib/chef/knife/oraclecloud_image_list.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #
 # Author:: Chef Partner Engineering (<partnereng@chef.io>)
 # Copyright:: Copyright (c) 2015 Chef Software, Inc.

data/lib/chef/knife/oraclecloud_orchestration_delete.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #
 # Author:: Chef Partner Engineering (<partnereng@chef.io>)
 # Copyright:: Copyright (c) 2015 Chef Software, Inc.

data/lib/chef/knife/oraclecloud_orchestration_list.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #
 # Author:: Chef Partner Engineering (<partnereng@chef.io>)
 # Copyright:: Copyright (c) 2015 Chef Software, Inc.

data/lib/chef/knife/oraclecloud_orchestration_show.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #
 # Author:: Chef Partner Engineering (<partnereng@chef.io>)
 # Copyright:: Copyright (c) 2015 Chef Software, Inc.

data/lib/chef/knife/oraclecloud_server_create.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #
 # Author:: Chef Partner Engineering (<partnereng@chef.io>)
 # Copyright:: Copyright (c) 2015 Chef Software, Inc.
@@ -63,7 +65,7 @@ class Chef
         def public_ip
           return nil unless locate_config_value(:public_ip)
 
-          (locate_config_value(:public_ip) == 'pool') ? :pool : "ipreservation:#{locate_config_value(:public_ip)}"
+          locate_config_value(:public_ip) == 'pool' ? :pool : "ipreservation:#{locate_config_value(:public_ip)}"
         end
 
         def sshkeys

data/lib/chef/knife/oraclecloud_server_delete.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #
 # Author:: Chef Partner Engineering (<partnereng@chef.io>)
 # Copyright:: Copyright (c) 2015 Chef Software, Inc.

data/lib/chef/knife/oraclecloud_server_list.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #
 # Author:: Chef Partner Engineering (<partnereng@chef.io>)
 # Copyright:: Copyright (c) 2015 Chef Software, Inc.

data/lib/chef/knife/oraclecloud_server_show.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #
 # Author:: Chef Partner Engineering (<partnereng@chef.io>)
 # Copyright:: Copyright (c) 2015 Chef Software, Inc.

data/lib/chef/knife/oraclecloud_shape_list.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #
 # Author:: Chef Partner Engineering (<partnereng@chef.io>)
 # Copyright:: Copyright (c) 2015 Chef Software, Inc.

data/lib/knife-oraclecloud/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #
 # Author:: Chef Partner Engineering (<partnereng@chef.io>)
 # Copyright:: Copyright (c) 2015 Chef Software, Inc.
@@ -17,5 +19,5 @@
 #
 
 module KnifeOracleCloud
-  VERSION = '1.2.0'
+  VERSION = '2.0.0'
 end

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Chef Partner Engineering (<partnereng@chef.io>)
 # Copyright:: Copyright (c) 2015 Chef Software, Inc.

data/spec/unit/cloud/oraclecloud_service_helpers_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #
 # Author:: Chef Partner Engineering (<partnereng@chef.io>)
 # Copyright:: Copyright (c) 2015 Chef Software, Inc.

data/spec/unit/cloud/oraclecloud_service_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #
 # Author:: Chef Partner Engineering (<partnereng@chef.io>)
 # Copyright:: Copyright (c) 2015 Chef Software, Inc.
@@ -60,7 +62,7 @@ describe Chef::Knife::Cloud::OraclecloudService do
       allow(service).to receive(:create_orchestration).and_return(orchestration)
       allow(orchestration).to receive(:start)
       allow(orchestration).to receive(:name_with_container)
-      allow(orchestration).to receive(:instances).and_return([ instance ])
+      allow(orchestration).to receive(:instances).and_return([instance])
       allow(service).to receive(:wait_for_status)
       allow(service).to receive(:orchestration_summary)
     end
@@ -90,7 +92,7 @@ describe Chef::Knife::Cloud::OraclecloudService do
     end
 
     it 'gathers the instances from the orchestration' do
-      expect(orchestration).to receive(:instances).and_return([ instance ])
+      expect(orchestration).to receive(:instances).and_return([instance])
 
       service.create_server(options)
     end
@@ -101,7 +103,7 @@ describe Chef::Knife::Cloud::OraclecloudService do
 
     context 'when more than one instance is returned' do
       it 'raises an exception' do
-        allow(orchestration).to receive(:instances).and_return(%w(instance1 instance2))
+        allow(orchestration).to receive(:instances).and_return(%w[instance1 instance2])
 
         expect { service.create_server(options) }.to raise_error(Chef::Knife::Cloud::CloudExceptions::ServerCreateError)
       end
@@ -182,8 +184,8 @@ describe Chef::Knife::Cloud::OraclecloudService do
       expect(service).to receive(:instance_request).with(options).and_return(instance_request)
       expect(orchestrations).to receive(:create).with(name: 'test_name',
                                                       description: 'test_name by test_username via Knife',
-                                                      instances: [ instance_request ])
-        .and_return(orchestration)
+                                                      instances: [instance_request])
+                                                .and_return(orchestration)
       expect(service.create_orchestration(options)).to eq(orchestration)
     end
   end
@@ -253,7 +255,7 @@ describe Chef::Knife::Cloud::OraclecloudService do
                                                             sshkeys:   'test_sshkeys',
                                                             label:     'test_label',
                                                             public_ip: 'test_public_ip')
-        .and_return(instance_request)
+                                                      .and_return(instance_request)
       expect(service.instance_request(options)).to eq(instance_request)
     end
   end

data/spec/unit/oraclecloud_image_list_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #
 # Author:: Chef Partner Engineering (<partnereng@chef.io>)
 # Copyright:: Copyright (c) 2015 Chef Software, Inc.

data/spec/unit/oraclecloud_orchestration_delete_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #
 # Author:: Chef Partner Engineering (<partnereng@chef.io>)
 # Copyright:: Copyright (c) 2015 Chef Software, Inc.
@@ -21,14 +23,14 @@ require 'chef/knife/oraclecloud_orchestration_delete'
 require 'support/shared_examples_for_command'
 
 describe Chef::Knife::Cloud::OraclecloudOrchestrationDelete do
-  let(:command) { described_class.new(%w(orch1 orch2)) }
+  let(:command) { described_class.new(%w[orch1 orch2]) }
   let(:service) { double('service') }
 
   before do
     allow(command).to receive(:service).and_return(service)
   end
 
-  it_behaves_like Chef::Knife::Cloud::Command, described_class.new(%w(orch1 orch2))
+  it_behaves_like Chef::Knife::Cloud::Command, described_class.new(%w[orch1 orch2])
 
   describe '#validate_params!' do
     context 'when no orchestrations are provided' do

data/spec/unit/oraclecloud_orchestration_list_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #
 # Author:: Chef Partner Engineering (<partnereng@chef.io>)
 # Copyright:: Copyright (c) 2015 Chef Software, Inc.

data/spec/unit/oraclecloud_orchestration_show_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #
 # Author:: Chef Partner Engineering (<partnereng@chef.io>)
 # Copyright:: Copyright (c) 2015 Chef Software, Inc.
@@ -21,7 +23,7 @@ require 'chef/knife/oraclecloud_orchestration_show'
 require 'support/shared_examples_for_command'
 
 describe Chef::Knife::Cloud::OraclecloudOrchestrationShow do
-  let(:command) { described_class.new(%w(orch1)) }
+  let(:command) { described_class.new(%w[orch1]) }
   let(:service) { double('service') }
 
   before do
@@ -40,7 +42,7 @@ describe Chef::Knife::Cloud::OraclecloudOrchestrationShow do
     end
 
     context 'when more than one orchestration is provided' do
-      let(:command) { described_class.new(%w(orch1 orch2)) }
+      let(:command) { described_class.new(%w[orch1 orch2]) }
       it 'print an error and exits' do
         expect(command.ui).to receive(:error)
         expect { command.validate_params! }.to raise_error(SystemExit)
@@ -60,7 +62,7 @@ describe Chef::Knife::Cloud::OraclecloudOrchestrationShow do
     let(:ui)            { double('ui') }
     let(:instance1)     { double('instance1') }
     let(:instance2)     { double('instance2') }
-    let(:instances)     { [ instance1, instance2 ] }
+    let(:instances)     { [instance1, instance2] }
 
     before do
       allow(command).to receive(:ui).and_return(ui)

data/spec/unit/oraclecloud_server_create_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #
 # Author:: Chef Partner Engineering (<partnereng@chef.io>)
 # Copyright:: Copyright (c) 2015 Chef Software, Inc.
@@ -22,13 +24,13 @@ require 'support/shared_examples_for_servercreatecommand'
 
 describe Chef::Knife::Cloud::OraclecloudServerCreate do
   argv = []
-  argv += %w(--image /path/to/test_image)
-  argv += %w(--shape test_shape)
-  argv += %w(--hostname test_hostname)
-  argv += %w(--public-ip pool)
-  argv += %w(--sshkeys user/test_key)
-  argv += %w(--bootstrap-protocol ssh)
-  argv += %w(--ssh-password test_password)
+  argv += %w[--image /path/to/test_image]
+  argv += %w[--shape test_shape]
+  argv += %w[--hostname test_hostname]
+  argv += %w[--public-ip pool]
+  argv += %w[--sshkeys user/test_key]
+  argv += %w[--bootstrap-protocol ssh]
+  argv += %w[--ssh-password test_password]
 
   let(:command) { described_class.new(argv) }
   let(:service) { double('service') }
@@ -81,7 +83,7 @@ describe Chef::Knife::Cloud::OraclecloudServerCreate do
       allow(service).to receive(:prepend_identity_domain).with('key1').and_return('domain/key1')
       allow(service).to receive(:prepend_identity_domain).with('key2').and_return('domain/key2')
 
-      expect(command.sshkeys).to eq([ 'domain/key1', 'domain/key2' ])
+      expect(command.sshkeys).to eq(['domain/key1', 'domain/key2'])
     end
   end
 
@@ -103,7 +105,7 @@ describe Chef::Knife::Cloud::OraclecloudServerCreate do
   describe '#ip_address' do
     it 'defaults to a public IP if a public IP was requested' do
       allow(command).to receive(:locate_config_value).with(:public_ip).and_return('pool')
-      allow(server).to receive(:public_ip_addresses).and_return([ '1.2.3.4' ])
+      allow(server).to receive(:public_ip_addresses).and_return(['1.2.3.4'])
 
       expect(command.ip_address).to eq('1.2.3.4')
     end

data/spec/unit/oraclecloud_server_delete_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #
 # Author:: Chef Partner Engineering (<partnereng@chef.io>)
 # Copyright:: Copyright (c) 2015 Chef Software, Inc.
@@ -21,11 +23,11 @@ require 'chef/knife/oraclecloud_server_delete'
 require 'support/shared_examples_for_command'
 
 describe Chef::Knife::Cloud::OraclecloudServerDelete do
-  let(:command) { described_class.new(%w(server1)) }
+  let(:command) { described_class.new(%w[server1]) }
   let(:service) { double('service') }
   let(:server)  { double('server') }
 
-  it_behaves_like Chef::Knife::Cloud::Command, described_class.new(%w(server1))
+  it_behaves_like Chef::Knife::Cloud::Command, described_class.new(%w[server1])
 
   it 'executes the correct methods in the overrided execute_command' do
     allow(command).to receive(:service).and_return(service)

data/spec/unit/oraclecloud_server_list_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #
 # Author:: Chef Partner Engineering (<partnereng@chef.io>)
 # Copyright:: Copyright (c) 2015 Chef Software, Inc.

data/spec/unit/oraclecloud_server_show_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #
 # Author:: Chef Partner Engineering (<partnereng@chef.io>)
 # Copyright:: Copyright (c) 2015 Chef Software, Inc.
@@ -21,7 +23,7 @@ require 'chef/knife/oraclecloud_server_show'
 require 'support/shared_examples_for_command'
 
 describe Chef::Knife::Cloud::OraclecloudServerShow do
-  let(:command) { described_class.new(%w(server1)) }
+  let(:command) { described_class.new(%w[server1]) }
   let(:service) { double('service') }
 
   before do
@@ -40,7 +42,7 @@ describe Chef::Knife::Cloud::OraclecloudServerShow do
     end
 
     context 'when more than one server is provided' do
-      let(:command) { described_class.new(%w(server1 server2)) }
+      let(:command) { described_class.new(%w[server1 server2]) }
       it 'print an error and exits' do
         expect(command.ui).to receive(:error)
         expect { command.validate_params! }.to raise_error(SystemExit)

data/spec/unit/oraclecloud_shape_list_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #
 # Author:: Chef Partner Engineering (<partnereng@chef.io>)
 # Copyright:: Copyright (c) 2015 Chef Software, Inc.

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: knife-oraclecloud
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Chef Partner Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-22 00:00:00.000000000 Z
+date: 2018-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '12.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '12.0'
 - !ruby/object:Gem::Dependency
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: chefstyle
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -104,6 +118,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -156,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Knife plugin to interact with Oracle Cloud.
@@ -173,4 +188,3 @@ test_files:
 - spec/unit/oraclecloud_server_list_spec.rb
 - spec/unit/oraclecloud_server_show_spec.rb
 - spec/unit/oraclecloud_shape_list_spec.rb
-has_rdoc: