chef 12.6.0 → 12.7.2

data/spec/unit/knife/environment_list_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Stephen Delano (<stephen@ospcode.com>)
-# Copyright:: Copyright (c) 2010 Opscode, Inc.
+# Copyright:: Copyright 2010-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 'spec_helper'
+require "spec_helper"
 
 describe Chef::Knife::EnvironmentList do
   before(:each) do
@@ -28,7 +28,7 @@ describe Chef::Knife::EnvironmentList do
     @environments = {
       "production" => "http://localhost:4000/environments/production",
       "development" => "http://localhost:4000/environments/development",
-      "testing" => "http://localhost:4000/environments/testing"
+      "testing" => "http://localhost:4000/environments/testing",
     }
     allow(Chef::Environment).to receive(:list).and_return @environments
   end
@@ -39,7 +39,7 @@ describe Chef::Knife::EnvironmentList do
   end
 
   it "should print the environment names in a sorted list" do
-    names = @environments.keys.sort { |a,b| a <=> b }
+    names = @environments.keys.sort { |a, b| a <=> b }
     expect(@knife).to receive(:output).with(names)
     @knife.run
   end

data/spec/unit/knife/environment_show_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Stephen Delano (<stephen@ospcode.com>)
-# Copyright:: Copyright (c) 2010 Opscode, Inc.
+# Copyright:: Copyright 2010-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 'spec_helper'
+require "spec_helper"
 
 describe Chef::Knife::EnvironmentShow do
   before(:each) do

data/spec/unit/knife/index_rebuild_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Daniel DeLeo (<dan@kallistec.com>)
-# Copyright:: Copyright (c) 2009 Daniel DeLeo
+# Copyright:: Copyright 2009-2016, Daniel DeLeo
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,12 +16,12 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
+require "spec_helper"
 
 describe Chef::Knife::IndexRebuild do
 
-  let(:knife){Chef::Knife::IndexRebuild.new}
-  let(:rest_client){double(Chef::REST)}
+  let(:knife) { Chef::Knife::IndexRebuild.new }
+  let(:rest_client) { double(Chef::ServerAPI) }
 
   let(:stub_rest!) do
     expect(knife).to receive(:rest).and_return(rest_client)
@@ -45,18 +45,18 @@ describe Chef::Knife::IndexRebuild do
 
     before(:each) do
       stub_rest!
-      allow(rest_client).to receive(:get_rest).and_raise(http_server_exception)
+      allow(rest_client).to receive(:get).and_raise(http_server_exception)
     end
 
     context "against a Chef 11 server" do
-      let(:api_header_value){"flavor=osc;version=11.0.0;erchef=1.2.3"}
+      let(:api_header_value) { "flavor=osc;version=11.0.0;erchef=1.2.3" }
       it "retrieves API information" do
-        expect(knife.grab_api_info).to eq({"flavor" => "osc", "version" => "11.0.0", "erchef" => "1.2.3"})
+        expect(knife.grab_api_info).to eq({ "flavor" => "osc", "version" => "11.0.0", "erchef" => "1.2.3" })
       end
     end # Chef 11
 
     context "against a Chef 10 server" do
-      let(:api_header_value){nil}
+      let(:api_header_value) { nil }
       it "finds no API information" do
         expect(knife.grab_api_info).to eq({})
       end
@@ -66,11 +66,11 @@ describe Chef::Knife::IndexRebuild do
   context "#unsupported_version?" do
     context "with Chef 11 API metadata" do
       it "is unsupported" do
-        expect(knife.unsupported_version?({"version" => "11.0.0", "flavor" => "osc", "erchef" => "1.2.3"})).to be_truthy
+        expect(knife.unsupported_version?({ "version" => "11.0.0", "flavor" => "osc", "erchef" => "1.2.3" })).to be_truthy
       end
 
       it "only truly relies on the version being non-nil" do
-        expect(knife.unsupported_version?({"version" => "1", "flavor" => "osc", "erchef" => "1.2.3"})).to be_truthy
+        expect(knife.unsupported_version?({ "version" => "1", "flavor" => "osc", "erchef" => "1.2.3" })).to be_truthy
       end
     end
 
@@ -91,9 +91,9 @@ describe Chef::Knife::IndexRebuild do
 
     context "against a Chef 11 server" do
       let(:api_info) do
-        {"flavor" => "osc",
+        { "flavor" => "osc",
           "version" => "11.0.0",
-          "erchef" => "1.2.3"
+          "erchef" => "1.2.3",
         }
       end
       let(:server_specific_stubs!) do
@@ -107,10 +107,10 @@ describe Chef::Knife::IndexRebuild do
     end
 
     context "against a Chef 10 server" do
-      let(:api_info){ {} }
+      let(:api_info) { {} }
       let(:server_specific_stubs!) do
         stub_rest!
-        expect(rest_client).to receive(:post_rest).with("/search/reindex", {}).and_return("representative output")
+        expect(rest_client).to receive(:post).with("/search/reindex", {}).and_return("representative output")
         expect(knife).not_to receive(:unsupported_server_message)
         expect(knife).to receive(:deprecated_server_message)
         expect(knife).to receive(:nag)
@@ -123,6 +123,3 @@ describe Chef::Knife::IndexRebuild do
   end
 
 end
-
-
-

data/spec/unit/knife/key_create_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Tyler Cloke (<tyler@chef.io>)
-# Copyright:: Copyright (c) 2015 Chef Software, Inc.
+# Copyright:: Copyright 2015-2016, Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,11 +16,11 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'chef/knife/user_key_create'
-require 'chef/knife/client_key_create'
-require 'chef/knife/key_create'
-require 'chef/key'
+require "spec_helper"
+require "chef/knife/user_key_create"
+require "chef/knife/client_key_create"
+require "chef/knife/key_create"
+require "chef/key"
 
 describe "key create commands that inherit knife" do
   shared_examples_for "a key create command" do
@@ -95,7 +95,7 @@ Tfuc9dUYsFjptWYrV6pfEQ+bgo1OGBXORBFcFL+2D7u9JYquKrMgosznHoEkQNLo
 
     context "when public_key and key_name weren't passed" do
       it "raises a Chef::Exceptions::KeyCommandInputError with the proper error message" do
-        expect{ key_create_object.run }.to raise_error(Chef::Exceptions::KeyCommandInputError, key_create_object.public_key_or_key_name_error_msg)
+        expect { key_create_object.run }.to raise_error(Chef::Exceptions::KeyCommandInputError, key_create_object.public_key_or_key_name_error_msg)
       end
     end
 
@@ -125,7 +125,7 @@ Tfuc9dUYsFjptWYrV6pfEQ+bgo1OGBXORBFcFL+2D7u9JYquKrMgosznHoEkQNLo
             actor_field_name => "charmander",
             "public_key" => public_key,
             "expiration_date" => valid_expiration_date,
-            "key_name" => key_name
+            "key_name" => key_name,
           }
         }
         before do
@@ -144,7 +144,7 @@ Tfuc9dUYsFjptWYrV6pfEQ+bgo1OGBXORBFcFL+2D7u9JYquKrMgosznHoEkQNLo
         let(:expected_hash) {
           {
             actor_field_name => "charmander",
-            "public_key" => public_key
+            "public_key" => public_key,
           }
         }
         before do
@@ -162,7 +162,7 @@ Tfuc9dUYsFjptWYrV6pfEQ+bgo1OGBXORBFcFL+2D7u9JYquKrMgosznHoEkQNLo
           {
             actor_field_name => "charmander",
             "name" => "charmander-key",
-            "create_key" => true
+            "create_key" => true,
           }
         }
         before do
@@ -180,7 +180,7 @@ Tfuc9dUYsFjptWYrV6pfEQ+bgo1OGBXORBFcFL+2D7u9JYquKrMgosznHoEkQNLo
           {
             actor_field_name => "charmander",
             "public_key" => public_key,
-            "private_key" => "super_private"
+            "private_key" => "super_private",
           }
         }
 
@@ -221,4 +221,3 @@ Tfuc9dUYsFjptWYrV6pfEQ+bgo1OGBXORBFcFL+2D7u9JYquKrMgosznHoEkQNLo
     end
   end
 end
-

data/spec/unit/knife/key_delete_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Tyler Cloke (<tyler@chef.io>)
-# Copyright:: Copyright (c) 2015 Chef Software, Inc.
+# Copyright:: Copyright 2015-2016, Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,11 +16,11 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'chef/knife/user_key_delete'
-require 'chef/knife/client_key_delete'
-require 'chef/knife/key_delete'
-require 'chef/key'
+require "spec_helper"
+require "chef/knife/user_key_delete"
+require "chef/knife/client_key_delete"
+require "chef/knife/key_delete"
+require "chef/key"
 
 describe "key delete commands that inherit knife" do
   shared_examples_for "a key delete command" do
@@ -45,8 +45,8 @@ describe "key delete commands that inherit knife" do
       context "when the service object is called" do
         it "creates a new instance of Chef::Knife::KeyDelete with the correct args" do
           expect(Chef::Knife::KeyDelete).to receive(:new).
-                                             with("charmander-key", "charmander", command.actor_field_name, command.ui).
-                                             and_return(service_object)
+            with("charmander-key", "charmander", command.actor_field_name, command.ui).
+            and_return(service_object)
           command.service_object
         end
       end # when the service object is called
@@ -117,7 +117,6 @@ describe Chef::Knife::KeyDelete do
       end
     end # when the command is run
 
-
   end # key delete run command
 
   context "when actor_field_name is 'user'" do
@@ -132,4 +131,3 @@ describe Chef::Knife::KeyDelete do
     end
   end
 end
-

data/spec/unit/knife/key_edit_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Tyler Cloke (<tyler@chef.io>)
-# Copyright:: Copyright (c) 2015 Chef Software, Inc.
+# Copyright:: Copyright 2015-2016, Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,11 +16,11 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'chef/knife/user_key_edit'
-require 'chef/knife/client_key_edit'
-require 'chef/knife/key_edit'
-require 'chef/key'
+require "spec_helper"
+require "chef/knife/user_key_edit"
+require "chef/knife/client_key_edit"
+require "chef/knife/key_edit"
+require "chef/key"
 
 describe "key edit commands that inherit knife" do
   shared_examples_for "a key edit command" do
@@ -45,8 +45,8 @@ describe "key edit commands that inherit knife" do
       context "when the service object is called" do
         it "creates a new instance of Chef::Knife::KeyEdit with the correct args" do
           expect(Chef::Knife::KeyEdit).to receive(:new).
-                                             with("charmander-key", "charmander", command.actor_field_name, command.ui, command.config).
-                                             and_return(service_object)
+            with("charmander-key", "charmander", command.actor_field_name, command.ui, command.config).
+            and_return(service_object)
           command.service_object
         end
       end # when the service object is called
@@ -114,7 +114,6 @@ Tfuc9dUYsFjptWYrV6pfEQ+bgo1OGBXORBFcFL+2D7u9JYquKrMgosznHoEkQNLo
         allow(key_edit_object).to receive(:display_info)
       end
 
-
       context "when public_key and create_key are passed" do
         before do
           key_edit_object.config[:public_key] = "public_key_path"
@@ -122,7 +121,7 @@ Tfuc9dUYsFjptWYrV6pfEQ+bgo1OGBXORBFcFL+2D7u9JYquKrMgosznHoEkQNLo
         end
 
         it "raises a Chef::Exceptions::KeyCommandInputError with the proper error message" do
-          expect{ key_edit_object.run }.to raise_error(Chef::Exceptions::KeyCommandInputError, key_edit_object.public_key_and_create_key_error_msg)
+          expect { key_edit_object.run }.to raise_error(Chef::Exceptions::KeyCommandInputError, key_edit_object.public_key_and_create_key_error_msg)
         end
       end
 
@@ -130,7 +129,7 @@ Tfuc9dUYsFjptWYrV6pfEQ+bgo1OGBXORBFcFL+2D7u9JYquKrMgosznHoEkQNLo
         let(:expected_hash) {
           {
             actor_field_name => "charmander",
-            "name" => new_keyname
+            "name" => new_keyname,
           }
         }
         before do
@@ -161,7 +160,7 @@ Tfuc9dUYsFjptWYrV6pfEQ+bgo1OGBXORBFcFL+2D7u9JYquKrMgosznHoEkQNLo
             actor_field_name => "charmander",
             "public_key" => public_key,
             "name" => new_keyname,
-            "expiration_date" => "infinity"
+            "expiration_date" => "infinity",
           }
         }
         before do
@@ -181,7 +180,7 @@ Tfuc9dUYsFjptWYrV6pfEQ+bgo1OGBXORBFcFL+2D7u9JYquKrMgosznHoEkQNLo
         let(:expected_hash) {
           {
             actor_field_name => "charmander",
-            "create_key" => true
+            "create_key" => true,
           }
         }
 
@@ -200,7 +199,7 @@ Tfuc9dUYsFjptWYrV6pfEQ+bgo1OGBXORBFcFL+2D7u9JYquKrMgosznHoEkQNLo
         let(:expected_hash) {
           {
             actor_field_name => "charmander",
-            "public_key" => public_key
+            "public_key" => public_key,
           }
         }
         before do
@@ -219,7 +218,7 @@ Tfuc9dUYsFjptWYrV6pfEQ+bgo1OGBXORBFcFL+2D7u9JYquKrMgosznHoEkQNLo
           {
             actor_field_name => "charmander",
             "public_key" => public_key,
-            "private_key" => "super_private"
+            "private_key" => "super_private",
           }
         }
 
@@ -249,8 +248,6 @@ Tfuc9dUYsFjptWYrV6pfEQ+bgo1OGBXORBFcFL+2D7u9JYquKrMgosznHoEkQNLo
 
     end # when the command is run
 
-
-
   end # key edit run command
 
   context "when actor_field_name is 'user'" do

data/spec/unit/knife/key_helper.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Tyler Cloke (<tyler@chef.io>)
-# Copyright:: Copyright (c) 2015 Chef Software, Inc.
+# Copyright:: Copyright 2015-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 'spec_helper'
+require "spec_helper"
 
 shared_examples_for "a knife key command" do
   let(:stderr) { StringIO.new }

data/spec/unit/knife/key_list_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Tyler Cloke (<tyler@chef.io>)
-# Copyright:: Copyright (c) 2015 Chef Software, Inc.
+# Copyright:: Copyright 2015-2016, Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,11 +16,11 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'chef/knife/user_key_list'
-require 'chef/knife/client_key_list'
-require 'chef/knife/key_list'
-require 'chef/key'
+require "spec_helper"
+require "chef/knife/user_key_list"
+require "chef/knife/client_key_list"
+require "chef/knife/key_list"
+require "chef/key"
 
 describe "key list commands that inherit knife" do
   shared_examples_for "a key list command" do
@@ -98,7 +98,7 @@ describe Chef::Knife::KeyList do
       end
 
       it "raises a Chef::Exceptions::KeyCommandInputError with the proper error message" do
-        expect{ key_list_object.run }.to raise_error(Chef::Exceptions::KeyCommandInputError, key_list_object.expired_and_non_expired_msg)
+        expect { key_list_object.run }.to raise_error(Chef::Exceptions::KeyCommandInputError, key_list_object.expired_and_non_expired_msg)
       end
     end
 
@@ -193,9 +193,9 @@ describe Chef::Knife::KeyList do
       let(:list_method) { :list_by_user }
       let(:http_response) {
         [
-          {"uri"=>"https://api.opscode.piab/users/charmander/keys/non-expired1", "name"=>"non-expired1", "expired"=>false},
-          {"uri"=>"https://api.opscode.piab/users/charmander/keys/non-expired2", "name"=>"non-expired2", "expired"=>false},
-          {"uri"=>"https://api.opscode.piab/users/mary/keys/out-of-date",        "name"=>"out-of-date", "expired"=>true}
+          { "uri" => "https://api.opscode.piab/users/charmander/keys/non-expired1", "name" => "non-expired1", "expired" => false },
+          { "uri" => "https://api.opscode.piab/users/charmander/keys/non-expired2", "name" => "non-expired2", "expired" => false },
+          { "uri" => "https://api.opscode.piab/users/mary/keys/out-of-date",        "name" => "out-of-date", "expired" => true },
         ]
       }
     end
@@ -206,9 +206,9 @@ describe Chef::Knife::KeyList do
       let(:list_method) { :list_by_client }
       let(:http_response) {
         [
-          {"uri"=>"https://api.opscode.piab/organizations/pokemon/clients/charmander/keys/non-expired1", "name"=>"non-expired1", "expired"=>false},
-          {"uri"=>"https://api.opscode.piab/organizations/pokemon/clients/charmander/keys/non-expired2", "name"=>"non-expired2", "expired"=>false},
-          {"uri"=>"https://api.opscode.piab/organizations/pokemon/clients/mary/keys/out-of-date",        "name"=>"out-of-date", "expired"=>true}
+          { "uri" => "https://api.opscode.piab/organizations/pokemon/clients/charmander/keys/non-expired1", "name" => "non-expired1", "expired" => false },
+          { "uri" => "https://api.opscode.piab/organizations/pokemon/clients/charmander/keys/non-expired2", "name" => "non-expired2", "expired" => false },
+          { "uri" => "https://api.opscode.piab/organizations/pokemon/clients/mary/keys/out-of-date",        "name" => "out-of-date", "expired" => true },
         ]
       }
     end

data/spec/unit/knife/key_show_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Tyler Cloke (<tyler@chef.io>)
-# Copyright:: Copyright (c) 2015 Chef Software, Inc.
+# Copyright:: Copyright 2015-2016, Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,11 +16,11 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'chef/knife/user_key_show'
-require 'chef/knife/client_key_show'
-require 'chef/knife/key_show'
-require 'chef/key'
+require "spec_helper"
+require "chef/knife/user_key_show"
+require "chef/knife/client_key_show"
+require "chef/knife/key_show"
+require "chef/key"
 
 describe "key show commands that inherit knife" do
   shared_examples_for "a key show command" do
@@ -45,8 +45,8 @@ describe "key show commands that inherit knife" do
       context "when the service object is called" do
         it "creates a new instance of Chef::Knife::KeyShow with the correct args" do
           expect(Chef::Knife::KeyShow).to receive(:new).
-                                           with("charmander-key", "charmander", command.load_method, command.ui).
-                                           and_return(service_object)
+            with("charmander-key", "charmander", command.load_method, command.ui).
+            and_return(service_object)
           command.service_object
         end
       end # when the service object is called
@@ -83,7 +83,7 @@ describe Chef::Knife::KeyShow do
       actor_field_name => "charmander",
       "name" => "charmander-key",
       "public_key" => "some-public-key",
-      "expiration_date" => "infinity"
+      "expiration_date" => "infinity",
     }
   }
 
@@ -113,14 +113,14 @@ describe Chef::Knife::KeyShow do
   context "when load_method is :load_by_user" do
     it_should_behave_like "key show run command" do
       let(:load_method) { :load_by_user }
-      let(:actor_field_name) { 'user' }
+      let(:actor_field_name) { "user" }
     end
   end
 
   context "when load_method is :load_by_client" do
     it_should_behave_like "key show run command" do
       let(:load_method) { :load_by_client }
-      let(:actor_field_name) { 'user' }
+      let(:actor_field_name) { "user" }
     end
   end
 end