knife-rackspace 1.0.1 → 2.0.2

data/lib/chef/knife/rackspace_server_delete.rb

@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-require "chef/knife/rackspace_base"
+require_relative "rackspace_base"
 
 # These two are needed for the '--purge' deletion case
 require "chef/node"
@@ -32,16 +32,16 @@ class Chef
       banner "knife rackspace server delete SERVER_ID [SERVER_ID] (options)"
 
       option :purge,
-        :short => "-P",
-        :long => "--purge",
-        :boolean => true,
-        :default => false,
-        :description => "Destroy corresponding node and client on the Chef Server, in addition to destroying the Rackspace node itself. Assumes node and client have the same name as the server (if not, add the '--node-name' option)."
+        short: "-P",
+        long: "--purge",
+        boolean: true,
+        default: false,
+        description: "Destroy corresponding node and client on the Chef Server, in addition to destroying the Rackspace node itself. Assumes node and client have the same name as the server (if not, add the '--node-name' option)."
 
       option :chef_node_name,
-        :short => "-N NAME",
-        :long => "--node-name NAME",
-        :description => "The name of the node and client to delete, if it differs from the server name. Only has meaning when used with the '--purge' option."
+        short: "-N NAME",
+        long: "--node-name NAME",
+        description: "The name of the node and client to delete, if it differs from the server name. Only has meaning when used with the '--purge' option."
 
       # Extracted from Chef::Knife.delete_object, because it has a
       # confirmation step built in... By specifying the '--purge'
@@ -49,13 +49,11 @@ class Chef
       # the user is already making their intent known.  It is not
       # necessary to make them confirm two more times.
       def destroy_item(klass, name, type_name)
-        begin
-          object = klass.load(name)
-          object.destroy
-          ui.warn("Deleted #{type_name} #{name}")
-        rescue Net::HTTPServerException
-          ui.warn("Could not find a #{type_name} named #{name} to delete!")
-        end
+        object = klass.load(name)
+        object.destroy
+        ui.warn("Deleted #{type_name} #{name}")
+      rescue Net::HTTPServerException
+        ui.warn("Could not find a #{type_name} named #{name} to delete!")
       end
 
       def run
@@ -84,7 +82,7 @@ class Chef
                 destroy_item(Chef::Node, thing_to_delete, "node")
                 destroy_item(Chef::ApiClient, thing_to_delete, "client")
               else
-                #v2 nodes may be named automatically
+                # v2 nodes may be named automatically
                 thing_to_delete = config[:chef_node_name] || server.name
                 destroy_item(Chef::Node, thing_to_delete, "node")
                 destroy_item(Chef::ApiClient, thing_to_delete, "client")

data/lib/chef/knife/rackspace_server_list.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require "chef/knife/rackspace_base"
+require_relative "rackspace_base"
 
 class Chef
   class Knife
@@ -39,7 +39,7 @@ class Chef
         if version_one?
           network_list = %w{public private}
         else
-          network_list = connection.networks.sort_by(&:label).collect { |t| t.label }
+          network_list = connection.networks.sort_by(&:label).collect(&:label)
         end
         server_list.insert(2, network_list.collect { |n| ui.color("#{n.capitalize} IP", :bold) }).flatten!
         num_columns_across = server_list.length
@@ -48,8 +48,8 @@ class Chef
           server_list << server.id.to_s
           server_list << server.name
           server_list += network_list.collect { |n| ip_address(server, n) }
-          server_list << (server.flavor_id == nil ? "" : server.flavor_id.to_s)
-          server_list << (server.image_id == nil ? "" : server.image_id.to_s)
+          server_list << (server.flavor_id.nil? ? "" : server.flavor_id.to_s)
+          server_list << (server.image_id.nil? ? "" : server.image_id.to_s)
           server_list << begin
             case server.state.downcase
             when "deleted", "suspended"

data/lib/knife-rackspace/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Rackspace
-    VERSION = "1.0.1"
+    VERSION = "2.0.2".freeze
     MAJOR, MINOR, TINY = VERSION.split(".")
   end
 end

data/spec/integration_spec_helper.rb

@@ -3,8 +3,8 @@ require "vcr"
 require "ansi/code"
 require "ansi/diff"
 
-Chef::Config[:knife][:rackspace_api_username] = "#{ENV['OS_USERNAME']}"
-Chef::Config[:knife][:rackspace_api_key] = "#{ENV['OS_PASSWORD']}"
+Chef::Config[:knife][:rackspace_api_username] = "#{ENV["OS_USERNAME"]}"
+Chef::Config[:knife][:rackspace_api_key] = "#{ENV["OS_PASSWORD"]}"
 Chef::Config[:knife][:ssl_verify_peer] = false
 # Chef::Config[:knife][:rackspace_version] = "#{ENV['RS_VERSION']}"
 
@@ -45,9 +45,9 @@ VCR.configure do |c|
   c.default_cassette_options = {
     # :record => :none,
     # Ignores cache busting parameters.
-    :match_requests_on => [:host, :path],
+    match_requests_on: %i{host path},
   }
-  c.default_cassette_options.merge!({ :record => :all }) if ENV["INTEGRATION_TESTS"] == "live"
+  c.default_cassette_options.merge!({ record: :all }) if ENV["INTEGRATION_TESTS"] == "live"
 end
 
 def filter_headers(interaction, pattern, placeholder)
@@ -104,7 +104,7 @@ def capture_instance_data(stdout, labels = {})
   result
 end
 
-# Ideally this belongs in knife-dsl, but it causes a scoping conflict with knife.rb.
+# Ideally this belongs in knife-dsl, but it causes a scoping conflict with config.rb (knife.rb).
 # See https://github.com/chef-workflow/knife-dsl/issues/2
 def knife_capture(command, args = [], input = nil)
   null = Gem.win_platform? ? File.open("NUL:", "r") : File.open("/dev/null", "r")
@@ -124,7 +124,7 @@ def knife_capture(command, args = [], input = nil)
   $VERBOSE = warn
 
   status = Chef::Knife::DSL::Support.run_knife(command, args)
-  return $stdout.string, $stderr.string, status
+  [$stdout.string, $stderr.string, status]
 ensure
   warn = $VERBOSE
   $VERBOSE = nil

data/spec/unit/rackspace_base_spec.rb

@@ -18,7 +18,7 @@ describe "auth_endpoint" do
     expect(tester.auth_endpoint).to eq(test_url)
   end
 
-  [:dfw, :ord, :syd].each do |region|
+  %i{dfw ord syd}.each do |region|
     it "should pick the US endpoint if the region is #{region}" do
       tester = RackspaceBaseTester.new
       Chef::Config[:knife][:rackspace_auth_url] = nil
@@ -38,7 +38,7 @@ describe "auth_endpoint" do
 end
 
 describe "locate_config_value" do
-  it 'with cli options' do
+  it "with cli options" do
     # CLI
     tester = RackspaceBaseTester.new
     tester.parse_options([ "--rackspace-api-key", "12345" ])
@@ -50,7 +50,7 @@ describe "locate_config_value" do
     expect(tester.locate_config_value(:rackspace_api_key)).to eq("12345")
   end
 
-  it 'without cli options' do
+  it "without cli options" do
     # CLI
     tester = RackspaceBaseTester.new
     tester.parse_options([])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-rackspace
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Adam Jacob
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-14 00:00:00.000000000 Z
+date: 2019-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: knife-windows
@@ -48,14 +48,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
 description: Rackspace Support for Chef's Knife Command
 email:
 - adam@chef.io
@@ -64,20 +64,9 @@ email:
 - jj@chef.io
 executables: []
 extensions: []
-extra_rdoc_files:
-- README.md
-- LICENSE
+extra_rdoc_files: []
 files:
-- ".chef/knife.rb"
-- ".github/ISSUE_TEMPLATE.md"
-- ".gitignore"
-- ".travis.yml"
-- CHANGELOG.md
-- Gemfile
 - LICENSE
-- README.md
-- Rakefile
-- knife-rackspace.gemspec
 - lib/chef/knife/rackspace_base.rb
 - lib/chef/knife/rackspace_flavor_list.rb
 - lib/chef/knife/rackspace_image_list.rb
@@ -97,7 +86,8 @@ files:
 - spec/spec_helper.rb
 - spec/unit/rackspace_base_spec.rb
 homepage: https://github.com/chef/knife-rackspace
-licenses: []
+licenses:
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -107,16 +97,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Rackspace Support for Chef's Knife Command
-test_files: []
+test_files:
+- spec/cassettes/v1/should_list_images.yml
+- spec/cassettes/v1/should_list_server_flavors.yml
+- spec/cassettes/v2/should_list_images.yml
+- spec/cassettes/v2/should_list_server_flavors.yml
+- spec/integration/integration_spec.rb
+- spec/integration_spec_helper.rb
+- spec/spec_helper.rb
+- spec/unit/rackspace_base_spec.rb

data/.chef/knife.rb

@@ -1,18 +0,0 @@
-current_dir = File.dirname(__FILE__)
-log_level                :info
-log_location             STDOUT
-#node_name                "knife-rackspace"
-#client_key               "#{current_dir}/knife-rackspace.pem"
-#validation_client_name   "knife-rackspace-validator"
-#validation_key           "#{current_dir}/knife-rackspace-validator.pem"
-#chef_server_url          "https://api.opscode.com/organizations/knife-rackspace"
-#cache_type               'basicfile'
-#cache_options( :path => "#{ENV['home']}/.chef/checksums" )
-#cookbook_path            ["#{current_dir}/../cookbooks"]
-
-knife[:rackspace_api_username] = "#{ENV['OS_USERNAME']}"
-knife[:rackspace_api_key] = "#{ENV['OS_PASSWORD']}"
-
-#https_proxy 'https://localhost:8888'
-#knife[:ssl_verify_peer] = false
-

data/.github/ISSUE_TEMPLATE.md

@@ -1,21 +0,0 @@
-# Version:
-
-[Version of the project installed]
-
-# Environment: [Details about the environment such as the Operating System, cookbook details, etc...]
-
-# Scenario:
-
-[What you are trying to achieve and you can't?]
-
-# Steps to Reproduce:
-
-[If you are filing an issue what are the things we need to do in order to repro your problem?]
-
-# Expected Result:
-
-[What are you expecting to happen as the consequence of above reproduction steps?]
-
-# Actual Result:
-
-[What actually happens after the reproduction steps?]

data/.gitignore

@@ -1,36 +0,0 @@
-.rake_tasks~
-tags
-coverage
-rdoc
-pkg
-test/tmp
-test/version_tmp
-tmp
-pkg
-*.gem
-*.rbc
-lib/bundler/man
-spec/reports
-.config
-InstalledFiles
-.bundle
-.rackspace_cloud_credentials*
-*.lock
-
-# YARD artifacts
-.yardoc
-_yardoc
-doc/
-
-.DS_Store
-Icon?
-
-# Thumbnails
-._*
-
-# Files that might appear on external disk
-.Spotlight-V100
-.Trashes
-
-*.swp
-*.swo

data/.travis.yml

@@ -1,47 +0,0 @@
-language: ruby
-cache: bundler
-sudo: false
-rvm:
-- 2.2.5
-- 2.3.1
-env:
-  global:
-    - excon_debug: true
-    - secure: |-
-        eEsikE/p2yz7/cFvCN/NOoljxBqjzsTWnKC7iZ+fEGGsyhKVJgWn4AasBusZ
-        mhtQcOqwakRulzVc+EZN4pqWHgaMC7SnSwhqRU5u1E+BPI4iWNsu+7rjiXhE
-        cJK1vE8YodgsgRDQ6evZVQLkwJpRk0qq2tM2LDqpzvy2MeQJIGc=
-    - secure: |-
-        V3ohIIF3I8lD05zTUs2nu+CcIzBYcvt1c1euRJ+SPcAH493b4cPquw1NZNFy
-        WDIW+1qDQi1DXr8C3Yq8bL4+pY66SukHtxyLhx0V26lGUvI8naq3IqageBQK
-        pkb2zZwVYO0a5mLEKOI/7omExBVHDxxX9Bw45vCHLKId3Wt21HE=
-    - secure: |-
-        OyKQU1muVBijz2/EkLUgBWbwPKG2UqRhIfpB1ZFkfdQ/06+Vaf82ZEQk3DvY
-        2lYFrzvSN1yWrKTMU3XES/dPlVlH87LDOrRhNhgW/NeHhC5BzdwrtvBm08RN
-        64ACuFG8fch9zIbx2VTkyLV8xsFXPPSaKMbEXrnikLwqnl5M8PQ=
-    - secure: |-
-        DoDVG0HwFg2a7Fj72tlxb8KJto+cBEh7J9YQZ35hK2cmeTsBAcZ4oSOUeAFg
-        s2MvBhX0man0zjYPStbL1vcpuS1Ecea3kGzefG0lYhHAzvK7wqqRqhKNFsnd
-        FPEVgZrcj3/Lc7mlkbigZouDM7BJLQbMGOv/KOS6f3nYzIhkOfE=
-    - secure: |-
-        SB4aoB5BCqqSFMpxJvN031tikc7VzXGX6PaOIngu5h3M9k3Qmkuvel8oQISb
-        fhcbsmuA0EKlaCvjQsgXFoUvUE6UnPCc7h2816fEAEz7FrRF1Q1mnbZ2V/kG
-        PtPYcPl4ZH4VxwAD+6kTtbl1aCTP8nKXTFXlKlrPAawpS7ef0B8=
-    - secure: |-
-        J01xNjFaqlwzin59fpvgKkp49p5VI128cFvM3pxvlErPLnjWE9kJ4NKzzznv
-        tVc12zVat/twxepvjSzg88b0q4Ks6P0Ovy0LeQCFUkva/jiBQuGukByR3joU
-        xuAFiCssBoaZEEKlN69n/zhihFxG/0z8Tn4h9pgAkSAyAq8UZJ0=
-    - secure: |-
-        W7NIurlDI/LtO27N5Yv9i2i/TLvwSL6L5bF0yJMtPNsL21xbcqBkcFY+0PEU
-        2jIzA6Ib861UACb9Xh45tXmY/zuUHQ/otuIdAwocawulxBjrTuNUDo58ZVEv
-        GzvTdFIaOWczTTvBcaNy9msenXiRBQTWriMFR0uPKIH/mYGF3Ew=
-    - secure: |-
-        RQDTTLjob/9p+9XpcpYo4VaQSVvVbbHtUcpVyTXcnHwMq3WJzXXBoj/9iFxA
-        Uupx9IhP0gZhX6kzcm5BG+oKTYAxTQkf2tRCRkVMBFCJKreER1SuSDVvljdV
-        KLMfTbC5qwXox78PtD23BjO5k8hCJCSHfs0XuQ5y7k1mMFjM4ok=
-deploy:
-  provider: rubygems
-  api_key:
-    secure: YeHeF7cuLuN3lHJQNQ4jpgfhaHGuB861cF6dzoyGPzAi/PO3wmTZfDNG27iI3zCe3CPviDSPiK4v14SQA1Xq3UtvSmeE+zcX/PxYsjNp7EQPn8J6fq2DfjmhYU5ECXnojbTkoh2HIM29YXBjxS8VlSTFDHYx0oV6uMZFgrzSLrI=
-  on:
-    tags: true

data/CHANGELOG.md

@@ -1,109 +0,0 @@
-## v1.0.1
-* Fix Server List exception (#131)
-* Fix bug preferring knife over CLI configurations items (#128)
-
-## v1.0.0
-* Use fog/rackspace instead of fog gem
-* Require Ruby 2.2.2 / Chef 12 and general cleanup
-* Spec updates to avoid deprecation warnings
-* Chefstyle fixes
-* Modified server list - #118
-
-## v0.11.1
-* Remove unused, and unsupported/ancient knife-dsl requirement
-* Take it all the way to 11 (Chef 11.x) and greater
-
-## v0.11.0
-* Add -B (boot volume ID) to `knife rackspace server create` - #91
-
-## v0.10.1
-* Support new chef-vault boostrap flags (--bootstrap-vault-file, -bootstrap-vault-json, and --bootstrap-vault-item)
-
-## v0.10.0
-* KNIFE-498 knife rackspace uses direct TCP connection on port 22 to verify SSHD
-* Update Windows bootstrapping instructions in the README
-* Fix warning for deprecated :keypair for :key_name
-
-## v0.9.3
-* KNIFE-497 Create server command does not honor timeout parameter
-
-## v0.9.2
-* KNIFE-480 Add support for user-data
-* --secret-file support for bootstrap
-
-## v0.9.1
-* KNIFE-460 Remove extraneous flavor reloads
-* KNIFE-459 Add support for config-drive
-* KNIFE-440 fix two minor typos in the ui.error message
-* use {public_ip_address}.xip.io instead of {public_ip_address}.rs-cloud.xip.io
-
-## v0.9.0
-* KNIFE-398 support secret/secret_file in knife.rb
-* KNIFE-420 Add --ssh-keypair for using ssh keys already registered with nova.
-* KNIFE-437 remove default region and make region required
-* replace static.cloud-ips with xip (cloud-ips was deprecated https://community.rackspace.com/general/f/34/t/623)
-* updated Fog dependency to 1.16
-
-## v0.8.4
-* KNIFE-408 TypeError: wrong argument type Symbol (expected Module)
-
-## v0.8.2
-* KNIFE-335 Wait for RackConnect and/or Service Level automation before bootstrapping
-* KNIFE-366 Allow arbitrary bootstrap networks
-* KNIFE-399 update knife rackspace to support string based flavor ids
-* Fixing issue with bootstrapping Windows server
-* Fog 1.16 updates
-
-## v0.8.0
-* KNIFE-68 enable ability to modify ssh port number
-* KNIFE-180 include option to pass :disk_config option to fog for new node bootstrap
-* KNIFE-312 updated to reflect new configuration options in Fog 1.10.1
-* KNIFE-314 provisioning First Gen Cloud Server is broken
-* KNIFE-315 fixed DEPRECATION warnings related to use of old rackpace_auth_url and removed rackspace_endpoint
-
-## v0.7.0
-* KNIFE_RACKSPACE-32 Ensure hint file is created to improve Ohai detection.
-* KNIFE-181 correct mixed use of 'rackspace_auth_url' and 'rackspace_api_auth_url'. Only 'rackspace_auth_url' is correct.
-* KNIFE-182 default to Rackspace Open Cloud (v2)
-* KNIFE-267 Rackspace server create with networks
-* KNIFE-271 Enable winrm authentication on knife-rackspace
-* KNIFE-281 pass https_proxy and http_proxy setting onto fog; added ssl_verify_peer setting to disable certificate validation
-* KNIFE-282 Add the ability to inject files on server creation
-* KNIFE-289 Add Integration Tests
-
-* KNOWN ISSUES: KNIFE-296 knife-windows overrides -x option with winrm-user
-
-## v0.6.2
-* bump release to fix permission issues inside the gem
-
-## v0.6.0
-* KNIFE_RACKSPACE-39 support for Rackspace Open Cloud (v2)
-* server list puts the name in second column
-* flavor list supports VCPUs for v2
-* server delete for v2 will attempt the name when purging since we set the name
-* docs updated to reflect all of the regions and APIs supported
-
-## v0.5.16
-* KNIFE_RACKSPACE-36 Changed to code to use IP address for bootstrapping
-* KNIFE_RACKSPACE-38 Support the -P --purge option
-* Refactored to use msg_pair method like other knife plugins with eye on eventual base class.
-* KNIFE_RACKSPACE-29 Support private network to connect to for bootstrap
-* KNIFE_RACKSPACE-40 Support for disabling host key checking
-* Added the 'unknown' state to `rackspace server list`, appeared transitory
-
-## v0.5.14
-* KNIFE_RACKSPACE-25 version bump to match knife-ec2's dependencies
-* KNIFE_RACKSPACE-33 chef-full is new default
-* updated authors
-* Fix of small typo "backspace" > "rackspace".
-* KNIFE_RACKSPACE-31 chef dependency needed, add explicit gem deps
-* KNIFE_RACKSPACE-7 switch to uneven_columns_across for prettier output
-* updated for rackspace_api_username and the correct current image number for Ubuntu 10.04 LTS
-* KNIFE-RACKSPACE-26 fog doesn't provide cores enumeration anymore
-* updated copyright and removed trailing comma
-* KNIFE_RACKSPACE-30 Make use of --json-attributes option for knife
-  bootstrap.
-
-## v0.5.12
-* remove dependency on net-ssh and net-ssh-multi..neither is access directly in plugin
-* KNIFE_RACKSPACE-18: Increase net-ssh-multi dependecy to 1.1.0