knife-rackspace 0.11.0 → 1.0.0

data/lib/chef/knife/rackspace_server_delete.rb

@@ -1,7 +1,7 @@
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Author:: Matt Ray (<matt@opscode.com>)
-# Copyright:: Copyright (c) 2009-2012 Opscode, Inc.
+# Author:: Adam Jacob (<adam@chef.io>)
+# Author:: Matt Ray (<matt@chef.io>)
+# Copyright:: Copyright (c) 2009-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,11 +17,11 @@
 # limitations under the License.
 #
 
-require 'chef/knife/rackspace_base'
+require "chef/knife/rackspace_base"
 
 # These two are needed for the '--purge' deletion case
-require 'chef/node'
-require 'chef/api_client'
+require "chef/node"
+require "chef/api_client"
 
 class Chef
   class Knife
@@ -67,8 +67,9 @@ class Chef
             msg_pair("Name", server.name)
             msg_pair("Flavor", server.flavor.name)
             msg_pair("Image", server.image.name) if server.image
-            msg_pair("Public IP Address", ip_address(server, 'public'))
-            msg_pair("Private IP Address", ip_address(server, 'private'))
+            msg_pair("Boot Image ID", server.boot_image_id) if server.boot_image_id
+            msg_pair("Public IP Address", ip_address(server, "public"))
+            msg_pair("Private IP Address", ip_address(server, "private"))
 
             puts "\n"
             confirm("Do you really want to delete this server")

data/lib/chef/knife/rackspace_server_list.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2009 Opscode, Inc.
+# Author:: Adam Jacob (<adam@chef.io>)
+# Copyright:: Copyright (c) 2009-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require 'chef/knife/rackspace_base'
+require "chef/knife/rackspace_base"
 
 class Chef
   class Knife
@@ -30,34 +30,38 @@ class Chef
         $stdout.sync = true
 
         server_list = [
-          ui.color('Instance ID', :bold),
-          ui.color('Name', :bold),
-          ui.color('Public IP', :bold),
-          ui.color('Private IP', :bold),
-          ui.color('Flavor', :bold),
-          ui.color('Image', :bold),
-          ui.color('State', :bold)
+          ui.color("Instance ID", :bold),
+          ui.color("Name", :bold),
+          ui.color("Flavor", :bold),
+          ui.color("Image", :bold),
+          ui.color("State", :bold),
         ]
+        if version_one?
+          network_list = %w{public private}
+        else
+          network_list = connection.images.sort_by(&:name).collect { |t| t.label }
+        end
+        server_list.insert(2, network_list.collect { |n| ui.color("#{n.capitalize} IP", :bold) }).flatten!
+        num_columns_across = server_list.length
         connection.servers.all.each do |server|
           server = connection.servers.get(server.id)
           server_list << server.id.to_s
           server_list << server.name
-          server_list << ip_address(server, 'public')
-          server_list << ip_address(server, 'private')
+          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 << begin
             case server.state.downcase
-            when 'deleted','suspended'
+            when "deleted", "suspended"
               ui.color(server.state.downcase, :red)
-            when 'build','unknown'
+            when "build", "unknown"
               ui.color(server.state.downcase, :yellow)
             else
               ui.color(server.state.downcase, :green)
             end
           end
         end
-        puts ui.list(server_list, :uneven_columns_across, 7)
+        puts ui.list(server_list, :uneven_columns_across, num_columns_across)
       end
     end
   end

data/lib/knife-rackspace/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Rackspace
-    VERSION = '0.11.0'
-    MAJOR, MINOR, TINY = VERSION.split('.')
+    VERSION = "1.0.0"
+    MAJOR, MINOR, TINY = VERSION.split(".")
   end
 end

data/spec/integration_spec_helper.rb

@@ -1,7 +1,7 @@
-require 'spec_helper'
-require 'vcr'
-require 'ansi/code'
-require 'ansi/diff'
+require "spec_helper"
+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']}"
@@ -9,28 +9,28 @@ Chef::Config[:knife][:ssl_verify_peer] = false
 # Chef::Config[:knife][:rackspace_version] = "#{ENV['RS_VERSION']}"
 
 VCR.configure do |c|
-  c.cassette_library_dir = 'spec/cassettes'
+  c.cassette_library_dir = "spec/cassettes"
   c.hook_into :excon
   c.configure_rspec_metadata!
 
   # Sensitive data
-  c.filter_sensitive_data('_RAX_USERNAME_') { Chef::Config[:knife][:rackspace_api_username] }
-  c.filter_sensitive_data('_RAX_PASSWORD_') { Chef::Config[:knife][:rackspace_api_key] }
-  c.filter_sensitive_data('_CDN-TENANT-NAME_') { ENV['RS_CDN_TENANT_NAME'] }
-  c.filter_sensitive_data('000000') { ENV['RS_TENANT_ID'] }
+  c.filter_sensitive_data("_RAX_USERNAME_") { Chef::Config[:knife][:rackspace_api_username] }
+  c.filter_sensitive_data("_RAX_PASSWORD_") { Chef::Config[:knife][:rackspace_api_key] }
+  c.filter_sensitive_data("_CDN-TENANT-NAME_") { ENV["RS_CDN_TENANT_NAME"] }
+  c.filter_sensitive_data("000000") { ENV["RS_TENANT_ID"] }
 
   c.before_record do |interaction|
     # Sensitive data
-    filter_headers(interaction, /X-\w*-Token/, '_ONE-TIME-TOKEN_')
+    filter_headers(interaction, /X-\w*-Token/, "_ONE-TIME-TOKEN_")
 
     # Transient data (trying to avoid unnecessary cassette churn)
-    filter_headers(interaction, 'X-Compute-Request-Id', '_COMPUTE-REQUEST-ID_')
-    filter_headers(interaction, 'X-Varnish', '_VARNISH-REQUEST-ID_')
+    filter_headers(interaction, "X-Compute-Request-Id", "_COMPUTE-REQUEST-ID_")
+    filter_headers(interaction, "X-Varnish", "_VARNISH-REQUEST-ID_")
 
     # Throw away build state - just makes server.wait_for loops really long during replay
     begin
       json = JSON.parse(interaction.response.body)
-      if json['server']['status'] == 'BUILD'
+      if json["server"]["status"] == "BUILD"
         # Ignoring interaction because server is in BUILD state
         interaction.ignore!
       end
@@ -38,21 +38,21 @@ VCR.configure do |c|
     end
   end
 
-  c.before_playback do | interaction |
-    interaction.filter!('_TENANT-ID_', '0000000')
+  c.before_playback do |interaction|
+    interaction.filter!("_TENANT-ID_", "0000000")
   end
 
   c.default_cassette_options = {
     # :record => :none,
     # Ignores cache busting parameters.
-    :match_requests_on => [:host, :path]
+    :match_requests_on => [: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)
-  [interaction.request.headers, interaction.response.headers].each do | headers |
-    sensitive_tokens = headers.select{|key| key.to_s.match(pattern)}
+  [interaction.request.headers, interaction.response.headers].each do |headers|
+    sensitive_tokens = headers.select { |key| key.to_s.match(pattern) }
     sensitive_tokens.each do |key, value|
       headers[key] = placeholder
     end
@@ -67,8 +67,8 @@ end
 
 def clean_output(output)
   output = ANSI.unansi(output)
-  output.gsub!(/\s+$/,'')
-  output.gsub!("\e[0G", '')
+  output.gsub!(/\s+$/, "")
+  output.gsub!("\e[0G", "")
   output
 end
 
@@ -77,7 +77,7 @@ RSpec::Matchers.define :match_output do |expected_output|
     clean_output(actual_output) == expected_output.strip
   end
   # Nice when it works, but has ANSI::Diff has some bugs that prevent it from showing any output
-  failure_message_for_should do |actual_output|
+  failure_message do |actual_output|
     buffer = StringIO.new
     buffer.puts clean_output(actual_output)
     buffer.puts
@@ -87,18 +87,18 @@ RSpec::Matchers.define :match_output do |expected_output|
     # ANSI::Diff.new(output, expected_output)
   end
   description do
-    'Compare actual and expected output, ignoring ansi color and trailing whitespace'
+    "Compare actual and expected output, ignoring ansi color and trailing whitespace"
   end
 end
 
 def server_list
-  stdout, stderr, status = knife_capture('rackspace server list')
+  stdout, stderr, status = knife_capture("rackspace server list")
   status == 0 ? stdout : stderr
 end
 
 def capture_instance_data(stdout, labels = {})
   result = {}
-  labels.each do | key, label |
+  labels.each do |key, label|
     result[key] = clean_output(stdout).match(/^#{label}: (.*)$/)[1]
   end
   result
@@ -106,8 +106,8 @@ end
 
 # Ideally this belongs in knife-dsl, but it causes a scoping conflict with 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')
+def knife_capture(command, args = [], input = nil)
+  null = Gem.win_platform? ? File.open("NUL:", "r") : File.open("/dev/null", "r")
 
   if defined? Pry
     Pry.config.input = STDIN
@@ -118,9 +118,9 @@ def knife_capture(command, args=[], input=nil)
   $VERBOSE = nil
   old_stderr, old_stdout, old_stdin = $stderr, $stdout, $stdin
 
-  $stderr = StringIO.new('', 'r+')
-  $stdout = StringIO.new('', 'r+')
-  $stdin = input ? StringIO.new(input, 'r') : null
+  $stderr = StringIO.new("", "r+")
+  $stdout = StringIO.new("", "r+")
+  $stdin = input ? StringIO.new(input, "r") : null
   $VERBOSE = warn
 
   status = Chef::Knife::DSL::Support.run_knife(command, args)

data/spec/spec_helper.rb

@@ -1,3 +1,3 @@
-$:.unshift File.expand_path('../../lib', __FILE__)
-require 'chef/knife/bootstrap'
-require 'chef/knife/rackspace_base'
+$:.unshift File.expand_path("../../lib", __FILE__)
+require "chef/knife/bootstrap"
+require "chef/knife/rackspace_base"

data/spec/unit/rackspace_base_spec.rb

@@ -1,7 +1,7 @@
-require 'spec_helper'
+require "spec_helper"
 
-require 'chef/knife/rackspace_base'
-require 'chef/knife'
+require "chef/knife/rackspace_base"
+require "chef/knife"
 
 class RackspaceBaseTester < Chef::Knife
   include Chef::Knife::RackspaceBase
@@ -15,7 +15,7 @@ describe "auth_endpoint" do
     Chef::Config[:knife][:rackspace_auth_url] = test_url
     Chef::Config[:knife][:rackspace_region] = :ord
 
-    tester.auth_endpoint.should == test_url
+    expect(tester.auth_endpoint).to eq(test_url)
   end
 
   [:dfw, :ord, :syd].each do |region|
@@ -24,15 +24,15 @@ describe "auth_endpoint" do
       Chef::Config[:knife][:rackspace_auth_url] = nil
       Chef::Config[:knife][:rackspace_region] = region
 
-      tester.auth_endpoint.should == ::Fog::Rackspace::US_AUTH_ENDPOINT
+      expect(tester.auth_endpoint).to eq(::Fog::Rackspace::US_AUTH_ENDPOINT)
     end
   end
 
   it "should pick the UK end point if the region is :lon" do
     tester = RackspaceBaseTester.new
     Chef::Config[:knife][:rackspace_auth_url] = nil
-    Chef::Config[:knife][:rackspace_region] = 'lon'
+    Chef::Config[:knife][:rackspace_region] = "lon"
 
-    tester.auth_endpoint.should == ::Fog::Rackspace::UK_AUTH_ENDPOINT
+    expect(tester.auth_endpoint).to eq(::Fog::Rackspace::UK_AUTH_ENDPOINT)
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-rackspace
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Adam Jacob
@@ -12,120 +12,50 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-08 00:00:00.000000000 Z
+date: 2016-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: knife-windows
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fog
+  name: fog-rackspace
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.24'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.24'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.10
+        version: '12.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.10
-- !ruby/object:Gem::Dependency
-  name: knife-dsl
-  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: rspec
-  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: vcr
-  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: ansi
-  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
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.0'
 description: Rackspace Support for Chef's Knife Command
 email:
 - adam@chef.io
@@ -135,16 +65,17 @@ email:
 executables: []
 extensions: []
 extra_rdoc_files:
-- README.rdoc
+- README.md
 - LICENSE
 files:
-- .chef/knife.rb
-- .gitignore
-- .travis.yml
+- ".chef/knife.rb"
+- ".github/ISSUE_TEMPLATE.md"
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
-- README.rdoc
+- README.md
 - Rakefile
 - knife-rackspace.gemspec
 - lib/chef/knife/rackspace_base.rb
@@ -165,7 +96,7 @@ files:
 - spec/integration_spec_helper.rb
 - spec/spec_helper.rb
 - spec/unit/rackspace_base_spec.rb
-homepage: https://docs.chef.io/plugin_knife_rackspace.html
+homepage: https://github.com/chef/knife-rackspace
 licenses: []
 metadata: {}
 post_install_message: 
@@ -174,17 +105,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Rackspace Support for Chef's Knife Command