knife-cloud 1.2.1 → 1.2.3

data/lib/chef/knife/cloud/server/list_options.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Siddheshwar More (<siddheshwar.more@clogeny.com>)
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,20 +24,19 @@ class Chef
           includer.class_eval do
 
             option :chef_data,
-              :long => "--chef-data",
-              :boolean => true,
-              :default => false,
-              :description => "Display chef node data which include chef node name, environment name, fqdn, platform, runlist and tags."
+              long: "--chef-data",
+              boolean: true,
+              default: false,
+              description: "Display chef node data which include chef node name, environment name, fqdn, platform, runlist and tags."
 
             option :chef_node_attribute,
-              :long => "--chef-node-attribute CHEF_NODE_ATTRIBUTE_NAME",
-              :description => "Used with --chef-data option. It display node attributes details by adding new column in server list display.",
-              :proc => Proc.new { |i| Chef::Config[:knife][:chef_node_attribute] = i }
-              
+              long: "--chef-node-attribute CHEF_NODE_ATTRIBUTE_NAME",
+              description: "Used with --chef-data option. It display node attributes details by adding new column in server list display.",
+              proc: Proc.new { |i| Chef::Config[:knife][:chef_node_attribute] = i }
+
           end
         end
       end
     end
   end
 end
-

data/lib/chef/knife/cloud/server/options.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Kaustubh Deorukhkar (<kaustubh@clogeny.com>)
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -23,14 +23,14 @@ class Chef
         def self.included(includer)
           includer.class_eval do
             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."
 
             option :custom_attributes,
-              :long => "--custom-attributes CUSTOM_ATTRIBUTES",
-              :description => "Custom attributes to be passed to Fog.",
-              :proc => Proc.new {|args| Chef::Config[:knife][:custom_attributes] =  args.split(';').map{|keys| keys.split('=')}.map{|j| Hash[*j.map{|k| k.strip}]}}  
+              long: "--custom-attributes CUSTOM_ATTRIBUTES",
+              description: "Custom attributes to be passed to Fog.",
+              proc: Proc.new { |args| Chef::Config[:knife][:custom_attributes] = args.split(";").map { |keys| keys.split("=") }.map { |j| Hash[*j.map { |k| k.strip }] } }
           end
         end
       end

data/lib/chef/knife/cloud/server/show_command.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +15,15 @@
 # limitations under the License.
 #
 
-require 'chef/knife/cloud/command'
-require 'chef/knife/cloud/exceptions'
+require "chef/knife/cloud/command"
+require "chef/knife/cloud/exceptions"
 
 class Chef
   class Knife
     class Cloud
       class ServerShowCommand < Command
 
-        def initialize(argv=[])
+        def initialize(argv = [])
           super argv
           # columns_with_info is array of hash with label, key and attribute extraction callback, ex [{:label => "Label text", :key => 'key', value_callback => callback_method to extract/format the required value}, ...]
           @columns_with_info = []
@@ -36,7 +36,7 @@ class Chef
             errors << "You must provide a valid Instance Id"
           end
           error_message = ""
-          raise CloudExceptions::ValidationError, error_message if errors.each{|e| ui.error(e); error_message = "#{error_message} #{e}."}.any?
+          raise CloudExceptions::ValidationError, error_message if errors.each { |e| ui.error(e); error_message = "#{error_message} #{e}." }.any?
         end
 
         def execute_command

data/lib/chef/knife/cloud/server/show_options.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -23,14 +23,13 @@ class Chef
           includer.class_eval do
 
             option :instance_id,
-              :long => "--instance-id INSTANCE_ID",
-              :description => "Required. Instance Id of Server",
-              :proc => Proc.new { |i| Chef::Config[:knife][:instance_id] = i }
-              
+              long: "--instance-id INSTANCE_ID",
+              description: "Required. Instance Id of Server",
+              proc: Proc.new { |i| Chef::Config[:knife][:instance_id] = i }
+
           end
         end
       end
     end
   end
 end
-

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

@@ -1,6 +1,6 @@
 #
 # Author:: Kaustubh Deorukhkar (<kaustubh@clogeny.com>)
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Copyright:: Copyright (c) 2013-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/cloud/exceptions'
+require "chef/knife/cloud/exceptions"
 require "chef/knife/cloud/helpers"
 
 class Chef
@@ -32,7 +32,7 @@ class Chef
 
         def connection
           # Fog or cloud specific connection object must be created in derived.
-          raise Chef::Exceptions::Override, "You must override connection in #{self.to_s}"
+          raise Chef::Exceptions::Override, "You must override connection in #{self}"
         end
 
         # override in cloud specific derived classes
@@ -48,44 +48,43 @@ class Chef
         end
 
         def delete_server_on_failure(server = nil)
-          raise Chef::Exceptions::Override, "You must override delete_server_on_failure in #{self.to_s} to delete server"
+          raise Chef::Exceptions::Override, "You must override delete_server_on_failure in #{self} to delete server"
         end
 
         # cloud server specific implementation methods for commands.
         def create_server(options = {})
-          raise Chef::Exceptions::Override, "You must override create_server in #{self.to_s}"
+          raise Chef::Exceptions::Override, "You must override create_server in #{self}"
         end
 
         def delete_server(server_name)
-          raise Chef::Exceptions::Override, "You must override delete_server in #{self.to_s}"
+          raise Chef::Exceptions::Override, "You must override delete_server in #{self}"
         end
 
         def list_servers
-          raise Chef::Exceptions::Override, "You must override list_servers in #{self.to_s}"
+          raise Chef::Exceptions::Override, "You must override list_servers in #{self}"
         end
 
         def list_images(image_filters)
-          raise Chef::Exceptions::Override, "You must override list_images in #{self.to_s}"
+          raise Chef::Exceptions::Override, "You must override list_images in #{self}"
         end
 
         def list_resource_configurations
-          raise Chef::Exceptions::Override, "You must override list_resource_configurations in #{self.to_s}"
+          raise Chef::Exceptions::Override, "You must override list_resource_configurations in #{self}"
         end
 
         def get_server(server_name)
-          raise Chef::Exceptions::Override, "You must override get_server in #{self.to_s}"
+          raise Chef::Exceptions::Override, "You must override get_server in #{self}"
         end
 
         def server_summary(server, columns_with_info = [])
-          raise Chef::Exceptions::Override, "You must override server_summary in #{self.to_s}"
+          raise Chef::Exceptions::Override, "You must override server_summary in #{self}"
         end
 
         def add_custom_attributes(server_def)
-          Chef::Config[:knife][:custom_attributes].map{|args| args.map{|k,v| server_def.merge!(k.to_sym => v)}} unless Chef::Config[:knife][:custom_attributes].nil?
+          Chef::Config[:knife][:custom_attributes].map { |args| args.map { |k, v| server_def.merge!(k.to_sym => v) } } unless Chef::Config[:knife][:custom_attributes].nil?
         end
 
       end # class service
     end
   end
 end
-

data/lib/knife-cloud/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Cloud
-    VERSION = "1.2.1"
-    MAJOR, MINOR, TINY = VERSION.split('.')
+    VERSION = "1.2.3".freeze
+    MAJOR, MINOR, TINY = VERSION.split(".")
   end
 end

data/lib/test/fixtures/knife.rb

@@ -4,6 +4,6 @@ client_key               "#{current_dir}/validation.pem"
 validation_client_name   "validation"
 validation_key           "#{current_dir}/validation.pem"
 chef_server_url          "http://localhost:8889"
-cache_type               'BasicFile'
-cache_options( :path => "#{ENV['HOME']}/.chef/checksums" )
-cookbook_path            ["#{current_dir}/chef-repo/cookbooks"]
+cache_type               "BasicFile"
+cache_options( path: "#{ENV['HOME']}/.chef/checksums" )
+cookbook_path ["#{current_dir}/chef-repo/cookbooks"]

data/lib/test/fixtures/validation.pem

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEogIBAAKCAQEA7TfhToresZudM5gaBfzM/eHrGuJtN8uMaG51fLk9rNVwOxIw
+eb9AmWJSQgftRj4AJSnt8Jv+QyAafjg79rEmCpd2K+toN1fXiVsf/ld/VdMI5vCd
+usJc8aC4OFIVrLetm9eq+joXiCSLfEYP1w4d1gc9wqr54rnGVgQdWv31NhqXX7Tl
+2bHRoEsfIFM7Vr5zC9Rv6XEtrwezSpzQ+ru707UOCOHNnH1TDxNDz+L71xJnGXD6
+uh596hVm2GiXJ8lyCVJTs/RZ+HKtRuxYOJztdCQAXbd6DDjTBax/cCEzzoxK/LMc
+1K/zWCKN8yM/XpiFqNuBB0yrqS5Y4zlROY0ssQIDAQABAoIBAQDmC1HYvD1YGePq
+O+/IrK8S6jr4WGq4OBIS2EPhTzbrXBU5g9s0xe7ckIfa9xr4CnpTkATqWCzMZd6r
+Vtd31bVhgh6cWu829F3WG2O8YJfg4AX7B46+pWxC+qyMGbZhR8L5pb1ualWVtnL6
+cms8D7mJbH5NQUeRwrz/f4AEVNGuw165PhglXnRq3zxs97jdNH6av0na1VLAmUeR
+vmYToLoIsK5yLeNzMfRRrQkq4ndUvad2ahqsz+p/xUjfYneBz4uujE/PcCgi423Q
+FMH1NtPpzmuZuABU53wUMW4BXsSGv+34UMhRTazcBPRBYjKT6l6F7Tt9wPFxrtVn
+KYI9dI0tAoGBAPzBwLsUuyEJtSd2zW63f7EhhG/2rSBm1g9Bcs1sHZtXIX3JN51X
+hd+ckXQcLgQYn8syGW1+WcuaHGyp7v3G0yr6b38FWwEnmD85Mq5da1dyio2udBdK
+Xm8MfY94yP8qSH3bUDKEl+cV9X5rtzbQAorMXb/Qkc4vErWfABVBKeLPAoGBAPBD
+FjGxER9YU4hFV2vn5qElfxa799Vl0uSvao0lSkTpA/sHFxAkRQc/mo1PBClaH0ba
+Hqr141o5pGUDgLqpO3kEY5vYBOaFXLFdFCcL+1YUR6t0bX+WCHuq21Cs6Gu4+qNA
+D4dpsSPDXfatyXWM5PF2d4FwO2XnL25Yt+rg6dh/AoGAbEfk9UCQWjr6bImswH3E
+KnIddonK6VKk6aw0LmTe2imdo3GMbc+M/prohUF9RSv3aOlxk0LJ3TuMadDzHa0L
+0iGvmk8FCZ2Yz50FZUWIMtJTIRdXjJLDmfdT4x7vnMDUhXZrCPlcyhbSMPKcbtL2
+A9hBYWdMz3PDJCOVuYVNGGkCgYEAhSxKUwTYfs1Qj8oPqOoDdfL4vLs3pfsoqEVr
+BA1VW1jlMfE+IV5ZPKlOm2De56TijT09nnloqYwlyS/l3JENPAjoxWs5XCUzucPj
+9bi4eYAIMcr5Hq0kypdrtQ4CTiNcGbzaXq6A11fk72RotFWCWSzXFNIGuncoXTuj
+xfcg5zUCf3TQrwpcBB1Hf9hm6lUVpptvUZJAQtkWoaWXUPRY0CjcVdDc5ak4xqL2
+FcAuJwV95b3qLyPESJ8zUBLOg3DcT1X9mrvRuKgC/Ie6k4R+oxU/nXi4vsPXlvg4
+yap6MUYSjPOa7eCrhg2zFZiqO6VLEogPc1nsjb9Zl2UWLLYyCVz=
+-----END RSA PRIVATE KEY-----

data/lib/test/knife-utils/helper.rb

@@ -1,8 +1,8 @@
 require "securerandom"
-require 'tmpdir'
-require 'fileutils'
-require File.expand_path(File.dirname(__FILE__) + '/knife_test_utils')
-require File.expand_path(File.dirname(__FILE__) + '/matchers')
+require "tmpdir"
+require "fileutils"
+require File.expand_path(File.dirname(__FILE__) + "/knife_test_utils")
+require File.expand_path(File.dirname(__FILE__) + "/matchers")
 
 module KnifeTestHelper
   extend RSpec::KnifeTestUtils
@@ -12,28 +12,28 @@ module KnifeTestHelper
 
   def match_status(test_run_expect)
     if "#{test_run_expect}" == "should fail"
-      should_not have_outcome :status => 0
+      should_not have_outcome status: 0
     elsif "#{test_run_expect}" == "should succeed"
-      should have_outcome :status => 0
+      should have_outcome status: 0
     elsif "#{test_run_expect}" == "should return empty list"
-      should have_outcome :status => 0
+      should have_outcome status: 0
     else
-      should have_outcome :status => 0
+      should have_outcome status: 0
     end
   end
 
   def match_stdout(test_run_expect)
-    should have_outcome :stdout => test_run_expect
+    should have_outcome stdout: test_run_expect
   end
 
   def create_file(file_dir, file_name, data_to_write_file_path)
     puts "Creating: #{file_name}"
     begin
       data_to_write = File.read(File.expand_path("#{data_to_write_file_path}", __FILE__))
-      File.open("#{file_dir}/#{file_name}", 'w') {|f| f.write(data_to_write)}
+      File.open("#{file_dir}/#{file_name}", "w") { |f| f.write(data_to_write) }
     rescue
       puts "Error while creating file - #{file_name}"
     end
   end
-  
+
 end

data/lib/test/knife-utils/knife_test_utils.rb

@@ -1,4 +1,4 @@
-require 'mixlib/shellout'
+require "mixlib/shellout"
 
 module RSpec
   module KnifeTestUtils
@@ -7,11 +7,11 @@ module RSpec
       base.class_eval do
         subject { knife_run }
         let(:knife_run) { run command }
-        let(:command)   { fail 'Define let(:command) in the spec' }
+        let(:command)   { raise "Define let(:command) in the spec" }
         let(:cmd_output) { @op }
       end
     end
-    
+
     # Convenience method for actually running a knife command in our
     # testing repository.  Returns the Mixlib::Shellout object ready for
     # inspection.
@@ -20,7 +20,7 @@ module RSpec
       shell_out.timeout = 3000
       shell_out.tap(&:run_command)
       @op = shell_out.exitstatus == 1 ? shell_out.stderr : shell_out.stdout
-      return shell_out
+      shell_out
     end
 
     def knife(knife_command)

data/lib/test/knife-utils/matchers.rb

@@ -1,9 +1,9 @@
-require 'rspec'
-require File.expand_path(File.dirname(__FILE__) +'/knife_test_utils')
+require "rspec"
+require File.expand_path(File.dirname(__FILE__) + "/knife_test_utils")
 
 RSpec::Matchers.define :have_outcome do |outcome_spec|
   match do |executed_shellout_command|
-    valid_keys =  [:status, :stdout, :stderr]
+    valid_keys = [:status, :stdout, :stderr]
     if outcome_spec.keys & valid_keys == []
       throw "You did not specify values for any of #{valid_keys}!"
     end

data/lib/test/knife-utils/test_bed.rb

@@ -1,4 +1,4 @@
-# Copyright: Copyright (c) 2012 Opscode, Inc.
+# Copyright: Copyright (c) 2012-2016 Chef Software, Inc.
 # License: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,42 +15,42 @@
 
 # Author:: Ameya Varade (<ameya.varade@clogeny.com>)
 
-require File.expand_path(File.dirname(__FILE__) + '/helper')
+require File.expand_path(File.dirname(__FILE__) + "/helper")
 
 module KnifeTestBed
-	include KnifeTestHelper
-	def init_test
-	  puts "\nCreating Test Data\n"
-	  create_file("#{temp_dir}", "validation.pem", "../../fixtures/validation.pem" )
-	  create_file("#{temp_dir}", "knife.rb", "../../fixtures/knife.rb")
-	  create_file("#{temp_dir}", "chef-full-chef-zero.erb", "../../templates/chef-full-chef-zero.erb")
-	  create_file("#{temp_dir}", "windows-chef-client-msi.erb", "../../templates/windows-chef-client-msi.erb")
-	  create_file("#{temp_dir}", "windows-shell.erb", "../../templates/windows-shell.erb")
-	end
-
-	def cleanup_test_data
-	  puts "\nCleaning Test Data\n"
-	  FileUtils.rm_rf("#{temp_dir}")
-	  puts "\nDone\n"
-	end
-
-	def get_knife_rb_path
-		"#{temp_dir}/" + "knife.rb"
-	end
-
-	def get_validation_pem_path
-		"#{temp_dir}/" + "validation.pem"
-	end
-
-	def get_linux_template_file_path
-		"#{temp_dir}/" + "chef-full-chef-zero.erb"
-	end
-
-	def get_windows_msi_template_file_path
-		"#{temp_dir}/" + "windows-chef-client-msi.erb"
-	end
-
-	def get_windows_shell_template_file_path
-		"#{temp_dir}/" + "windows-shell.erb"
-	end
-end 
+  include KnifeTestHelper
+  def init_test
+    puts "\nCreating Test Data\n"
+    create_file("#{temp_dir}", "validation.pem", "../../fixtures/validation.pem" )
+    create_file("#{temp_dir}", "knife.rb", "../../fixtures/knife.rb")
+    create_file("#{temp_dir}", "chef-full-chef-zero.erb", "../../templates/chef-full-chef-zero.erb")
+    create_file("#{temp_dir}", "windows-chef-client-msi.erb", "../../templates/windows-chef-client-msi.erb")
+    create_file("#{temp_dir}", "windows-shell.erb", "../../templates/windows-shell.erb")
+  end
+
+  def cleanup_test_data
+    puts "\nCleaning Test Data\n"
+    FileUtils.rm_rf("#{temp_dir}")
+    puts "\nDone\n"
+  end
+
+  def get_knife_rb_path
+    "#{temp_dir}/" + "knife.rb"
+  end
+
+  def get_validation_pem_path
+    "#{temp_dir}/" + "validation.pem"
+  end
+
+  def get_linux_template_file_path
+    "#{temp_dir}/" + "chef-full-chef-zero.erb"
+  end
+
+  def get_windows_msi_template_file_path
+    "#{temp_dir}/" + "windows-chef-client-msi.erb"
+  end
+
+  def get_windows_shell_template_file_path
+    "#{temp_dir}/" + "windows-shell.erb"
+  end
+end

data/lib/test/templates/windows-chef-client-msi.erb

@@ -1,6 +1,6 @@
 @rem
-@rem Author:: Seth Chisamore (<schisamo@opscode.com>)
-@rem Copyright:: Copyright (c) 2011 Opscode, Inc.
+@rem Author:: Seth Chisamore (<schisamo@chef.io>)
+@rem Copyright:: Copyright (c) 2011-2016 Chef Software, Inc.
 @rem License:: Apache License, Version 2.0
 @rem
 @rem Licensed under the Apache License, Version 2.0 (the "License");
@@ -107,7 +107,7 @@ goto install
 :install
 @rem Install Chef using chef-client MSI installer
 
-<% url="https://www.opscode.com/chef/download?p=windows&pv=%MACHINE_OS%&m=%MACHINE_ARCH%" -%>
+<% url="https://www.chef.io/chef/download?p=windows&pv=%MACHINE_OS%&m=%MACHINE_ARCH%" -%>
 <% url += "&v=#{@config[:bootstrap_version]}" if @config.key? :bootstrap_version -%>
 @set "REMOTE_SOURCE_MSI_URL=<%= url %>"
 @set "LOCAL_DESTINATION_MSI_PATH=<%= local_download_path %>"
@@ -228,4 +228,3 @@ C:\opscode\chef\embedded\bin\ruby C:\chef_zero_startup.rb
 
 @echo Starting chef to bootstrap the node...
 <%= start_chef %>
-