chef 10.34.6-x86-mingw32 → 11.6.2-x86-mingw32

data/spec/unit/knife/index_rebuild_spec.rb

@@ -19,47 +19,110 @@
 require 'spec_helper'
 
 describe Chef::Knife::IndexRebuild do
-  before do
-    Chef::Config[:node_name]  = "webmonkey.example.com"
-    @knife = Chef::Knife::IndexRebuild.new
-    @rest_client = mock("Chef::REST (mock)", :post_rest => { :result => :true })
-    @knife.ui.stub!(:output)
-    @knife.stub!(:rest).and_return(@rest_client)
-
-    @out = StringIO.new
-    @knife.ui.stub!(:stdout).and_return(@out)
-  end
 
-  it "asks a yes/no confirmation and aborts on 'no'" do
-    @knife.ui.stub!(:stdin).and_return(StringIO.new("NO\n"))
-    @knife.should_receive(:puts)
-    @knife.should_receive(:exit).with(7)
-    @knife.run
-    @out.string.should match(/yes\/no/)
+  let(:knife){Chef::Knife::IndexRebuild.new}
+  let(:rest_client){mock(Chef::REST)}
+
+  let(:stub_rest!) do
+    knife.should_receive(:rest).and_return(rest_client)
   end
 
-  it "asks a confirmation and continues on 'yes'" do
-    @knife.ui.stub!(:stdin).and_return(StringIO.new("yes\n"))
-    @knife.should_not_receive(:exit)
-    @knife.run
-    @out.string.should match(/yes\/no/)
+  before :each do
+    # This keeps the test output clean
+    knife.ui.stub!(:stdout).and_return(StringIO.new)
   end
 
-  describe "after confirming the operation" do
-    before do
-      @knife.ui.stub!(:print)
-      @knife.ui.stub!(:puts)
-      @knife.stub!(:nag)
-      @knife.ui.stub!(:output)
+  context "#grab_api_info" do
+    let(:http_not_found_response) do
+      e = Net::HTTPNotFound.new("1.1", 404, "blah")
+      e.stub(:[]).with("x-ops-api-info").and_return(api_header_value)
+      e
+    end
+
+    let(:http_server_exception) do
+      Net::HTTPServerException.new("404: Not Found", http_not_found_response)
+    end
+
+    before(:each) do
+      stub_rest!
+      rest_client.stub(:get_rest).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"}
+      it "retrieves API information" do
+        knife.grab_api_info.should == {"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}
+      it "finds no API information" do
+        knife.grab_api_info.should == {}
+      end
+    end # Chef 10
+  end # grab_api_info
+
+  context "#unsupported_version?" do
+    context "with Chef 11 API metadata" do
+      it "is unsupported" do
+        knife.unsupported_version?({"version" => "11.0.0", "flavor" => "osc", "erchef" => "1.2.3"}).should be_true
+      end
+
+      it "only truly relies on the version being non-nil" do
+        knife.unsupported_version?({"version" => "1", "flavor" => "osc", "erchef" => "1.2.3"}).should be_true
+      end
     end
 
-    it "POSTs to /search/reindex and displays the result" do
-      @rest_client = mock("Chef::REST")
-      @knife.stub!(:rest).and_return(@rest_client)
-      @rest_client.should_receive(:post_rest).with("/search/reindex", {}).and_return("monkey")
-      @knife.should_receive(:output).with("monkey")
-      @knife.run
+    context "with Chef 10 API metadata" do
+      it "is supported" do
+        # Chef 10 will have no metadata
+        knife.unsupported_version?({}).should be_false
+      end
+    end
+  end # unsupported_version?
+
+  context "Simulating a 'knife index rebuild' run" do
+
+    before :each do
+      knife.should_receive(:grab_api_info).and_return(api_info)
+      server_specific_stubs!
+    end
+
+    context "against a Chef 11 server" do
+      let(:api_info) do
+        {"flavor" => "osc", 
+          "version" => "11.0.0",
+          "erchef" => "1.2.3"
+        }
+      end
+      let(:server_specific_stubs!) do
+        knife.should_receive(:unsupported_server_message).with(api_info)
+        knife.should_receive(:exit).with(1)
+      end
+
+      it "should not be allowed" do
+        knife.run
+      end
+    end
+
+    context "against a Chef 10 server" do
+      let(:api_info){ {} }
+      let(:server_specific_stubs!) do
+        stub_rest!
+        rest_client.should_receive(:post_rest).with("/search/reindex", {}).and_return("representative output")
+        knife.should_not_receive(:unsupported_server_message)
+        knife.should_receive(:deprecated_server_message)
+        knife.should_receive(:nag)
+        knife.should_receive(:output).with("representative output")
+      end
+      it "should be allowed" do
+        knife.run
+      end
     end
   end
 
 end
+
+
+

data/spec/unit/knife/knife_help.rb

@@ -6,9 +6,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,7 +21,7 @@ require 'spec_helper'
 describe Chef::Knife::Help do
   before(:each) do
     # Perilously use the build in list even though it is dynamic so we don't get warnings about the constant
-    # HELP_TOPICS = [ "foo", "bar", "knife-kittens", "ceiling-cat", "shef" ]
+    # HELP_TOPICS = [ "foo", "bar", "knife-kittens", "ceiling-cat", "shell" ]
     @knife = Chef::Knife::Help.new
   end
 
@@ -30,8 +30,8 @@ describe Chef::Knife::Help do
   end
 
   it "should run man for you" do
-    @knife.name_args = [ "shef" ]
-    @knife.should_receive(:exec).with(/^man \/.*\/shef.1$/)
+    @knife.name_args = [ "shell" ]
+    @knife.should_receive(:exec).with(/^man \/.*\/shell.1$/)
     @knife.run
   end
 
@@ -47,9 +47,9 @@ describe Chef::Knife::Help do
 
   describe "find_manpage_path" do
     it "should find the man page in the gem" do
-      @knife.find_manpage_path("shef").should =~ /distro\/common\/man\/man1\/shef.1$/
+      @knife.find_manpage_path("shell").should =~ /distro\/common\/man\/man1\/chef-shell.1$/
     end
-  
+
     it "should provide the man page name if not in the gem" do
       @knife.find_manpage_path("foo").should == "foo"
     end

data/spec/unit/knife/node_edit_spec.rb

@@ -20,12 +20,6 @@ require 'spec_helper'
 Chef::Knife::NodeEdit.load_deps
 
 describe Chef::Knife::NodeEdit do
-
-  # helper to convert the view from Chef objects into Ruby objects representing JSON
-  def deserialized_json_view
-    actual = Chef::JSONCompat.from_json(Chef::JSONCompat.to_json_pretty(@knife.node_editor.send(:view)))
-  end
-
   before(:each) do
     Chef::Config[:node_name]  = "webmonkey.example.com"
     @knife = Chef::Knife::NodeEdit.new
@@ -55,7 +49,7 @@ describe Chef::Knife::NodeEdit do
     end
 
     it "creates a view of the node without attributes from roles or ohai" do
-      actual = deserialized_json_view
+      actual = Chef::JSONCompat.from_json(@knife.node_editor.view)
       actual.should_not have_key("automatic")
       actual.should_not have_key("override")
       actual.should_not have_key("default")
@@ -67,7 +61,7 @@ describe Chef::Knife::NodeEdit do
     it "shows the extra attributes when given the --all option" do
       @knife.config[:all_attributes] = true
 
-      actual = deserialized_json_view
+      actual = Chef::JSONCompat.from_json(@knife.node_editor.view)
       actual["automatic"].should == {"go" => "away"}
       actual["override"].should == {"dont" => "show"}
       actual["default"].should == {"hide" => "me"}
@@ -77,39 +71,18 @@ describe Chef::Knife::NodeEdit do
     end
 
     it "does not consider unedited data updated" do
-      view = deserialized_json_view
-      @knife.node_editor.send(:apply_updates, view)
+      view = Chef::JSONCompat.from_json( @knife.node_editor.view )
+      @knife.node_editor.apply_updates(view)
       @knife.node_editor.should_not be_updated
     end
 
     it "considers edited data updated" do
-      view = deserialized_json_view
+      view = Chef::JSONCompat.from_json( @knife.node_editor.view )
       view["run_list"] << "role[fuuu]"
-      @knife.node_editor.send(:apply_updates, view)
+      @knife.node_editor.apply_updates(view)
       @knife.node_editor.should be_updated
     end
 
   end
-
-  describe "edit_node" do
-
-    before do
-      @knife.stub!(:node).and_return(@node)
-    end
-
-    let(:subject) { @knife.node_editor.edit_node }
-
-    it "raises an exception when editing is disabled" do
-      @knife.config[:disable_editing] = true
-      expect{ subject }.to raise_error(SystemExit)
-    end
-
-    it "raises an exception when the editor is not set" do
-      @knife.config[:editor] = nil
-      expect{ subject }.to raise_error(SystemExit)
-    end
-
-  end
-
 end
 

data/spec/unit/knife/node_run_list_remove_spec.rb

@@ -25,6 +25,7 @@ describe Chef::Knife::NodeRunListRemove do
     @knife.config[:print_after] = nil
     @knife.name_args = [ "adam", "role[monkey]" ]
     @node = Chef::Node.new()
+    @node.name("knifetest-node")
     @node.run_list << "role[monkey]"
     @node.stub!(:save).and_return(true)
 
@@ -52,7 +53,7 @@ describe Chef::Knife::NodeRunListRemove do
 
     it "should print the run list" do
       @knife.config[:print_after] = true
-      @knife.ui.should_receive(:output).with({ 'run_list' => [] })
+      @knife.ui.should_receive(:output).with({ "knifetest-node" => { 'run_list' => [] } })
       @knife.run
     end
 

data/spec/unit/knife/node_run_list_set_spec.rb

@@ -0,0 +1,140 @@
+#
+# Author:: Mike Fiedler (<miketheman@gmail.com>)
+# Copyright:: Copyright (c) 2013 Mike Fiedler
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'spec_helper'
+
+describe Chef::Knife::NodeRunListSet do
+  before(:each) do
+    Chef::Config[:node_name]  = "webmonkey.example.com"
+    @knife = Chef::Knife::NodeRunListSet.new
+    @knife.config = {}
+    @knife.name_args = [ "adam", "role[monkey]" ]
+    @knife.stub!(:output).and_return(true)
+    @node = Chef::Node.new()
+    @node.stub!(:save).and_return(true)
+    Chef::Node.stub!(:load).and_return(@node)
+  end
+
+  describe "run" do
+    it "should load the node" do
+      Chef::Node.should_receive(:load).with("adam")
+      @knife.run
+    end
+
+    it "should set the run list" do
+      @knife.run
+      @node.run_list[0].should == 'role[monkey]'
+    end
+
+    it "should save the node" do
+      @node.should_receive(:save)
+      @knife.run
+    end
+
+    it "should print the run list" do
+      @knife.should_receive(:output).and_return(true)
+      @knife.run
+    end
+
+    describe "with more than one role or recipe" do
+      it "should set the run list to all the entries" do
+        @knife.name_args = [ "adam", "role[monkey],role[duck]" ]
+        @knife.run
+        @node.run_list[0].should == "role[monkey]"
+        @node.run_list[1].should == "role[duck]"
+      end
+    end
+
+    describe "with more than one role or recipe with space between items" do
+      it "should set the run list to all the entries" do
+        @knife.name_args = [ "adam", "role[monkey], role[duck]" ]
+        @knife.run
+        @node.run_list[0].should == "role[monkey]"
+        @node.run_list[1].should == "role[duck]"
+      end
+    end
+
+    describe "with more than one role or recipe as different arguments" do
+      it "should set the run list to all the entries" do
+        @knife.name_args = [ "adam", "role[monkey]", "role[duck]" ]
+        @knife.run
+        @node.run_list[0].should == "role[monkey]"
+        @node.run_list[1].should == "role[duck]"
+      end
+    end
+
+    describe "with more than one role or recipe as different arguments and list separated by comas" do
+      it "should add to the run list all the entries" do
+        @knife.name_args = [ "adam", "role[monkey]", "role[duck],recipe[bird::fly]" ]
+        @knife.run
+        @node.run_list[0].should == "role[monkey]"
+        @node.run_list[1].should == "role[duck]"
+      end
+    end
+
+    describe "with one role or recipe but with an extraneous comma" do
+      it "should add to the run list one item" do
+        @knife.name_args = [ "adam", "role[monkey]," ]
+        @knife.run
+        @node.run_list[0].should == "role[monkey]"
+      end
+    end
+
+    describe "with an existing run list" do
+      it "should overwrite any existing run list items" do
+        @node.run_list << "role[acorns]"
+        @node.run_list << "role[zebras]"
+        @node.run_list[0].should == "role[acorns]"
+        @node.run_list[1].should == "role[zebras]"
+        @node.run_list.run_list_items.size.should == 2
+
+        @knife.name_args = [ "adam", "role[monkey]", "role[duck]" ]
+        @knife.run
+        @node.run_list[0].should == "role[monkey]"
+        @node.run_list[1].should == "role[duck]"
+        @node.run_list.run_list_items.size.should == 2
+      end
+    end
+
+    describe "with no role or recipe" do
+      # Set up outputs for inspection later
+      before(:each) do
+        @stdout = StringIO.new
+        @stderr = StringIO.new
+
+        @knife.ui.stub!(:stdout).and_return(@stdout)
+        @knife.ui.stub!(:stderr).and_return(@stderr)
+      end
+
+      it "should exit" do
+        @knife.name_args = [ "adam" ]
+        lambda { @knife.run }.should raise_error SystemExit
+      end
+
+      it "should show the user" do
+        @knife.name_args = [ "adam" ]
+
+        begin ; @knife.run ; rescue SystemExit ; end
+
+        @stdout.string.should eq "USAGE: knife node run_list set NODE ENTRIES (options)\n"
+        @stderr.string.should eq "FATAL: You must supply both a node name and a run list.\n"
+      end
+    end
+
+  end
+end

data/spec/unit/knife/ssh_spec.rb

@@ -34,14 +34,14 @@ describe Chef::Knife::Ssh do
 
   before do
     @knife = Chef::Knife::Ssh.new
-    @knife.config = {}
+    @knife.merge_configs
     @knife.config[:attribute] = "fqdn"
-    @node_foo = Chef::Node.new('foo')
-    @node_foo[:fqdn] = "foo.example.org"
-    @node_foo[:ipaddress] = "10.0.0.1"
-    @node_bar = Chef::Node.new('bar')
-    @node_bar[:fqdn] = "bar.example.org"
-    @node_bar[:ipaddress] = "10.0.0.2"
+    @node_foo = Chef::Node.new
+    @node_foo.automatic_attrs[:fqdn] = "foo.example.org"
+    @node_foo.automatic_attrs[:ipaddress] = "10.0.0.1"
+    @node_bar = Chef::Node.new
+    @node_bar.automatic_attrs[:fqdn] = "bar.example.org"
+    @node_bar.automatic_attrs[:ipaddress] = "10.0.0.2"
   end
 
   describe "#configure_session" do
@@ -64,7 +64,7 @@ describe Chef::Knife::Ssh do
           @knife.should_receive(:session_from_list).with(['10.0.0.1', '10.0.0.2'])
           @knife.configure_session
         end
-        
+
         it "returns an array of the attributes specified on the command line even when a config value is set" do
           @knife.config[:attribute] = "config_file" # this value will be the config file
           @knife.config[:override_attribute] = "ipaddress" # this is the value of the command line via #configure_attribute
@@ -84,10 +84,8 @@ describe Chef::Knife::Ssh do
 
       context "when cloud hostnames are available" do
         before do
-          @node_foo[:cloud] = Mash.new
-          @node_bar[:cloud] = Mash.new
-          @node_foo[:cloud][:public_hostname] = "ec2-10-0-0-1.compute-1.amazonaws.com"
-          @node_bar[:cloud][:public_hostname] = "ec2-10-0-0-2.compute-1.amazonaws.com"
+          @node_foo.automatic_attrs[:cloud][:public_hostname] = "ec2-10-0-0-1.compute-1.amazonaws.com"
+          @node_bar.automatic_attrs[:cloud][:public_hostname] = "ec2-10-0-0-2.compute-1.amazonaws.com"
         end
 
         it "returns an array of cloud public hostnames" do
@@ -109,8 +107,8 @@ describe Chef::Knife::Ssh do
       context "when there are some hosts found but they do not have an attribute to connect with" do
         before do
           @query.stub!(:search).and_return([[@node_foo, @node_bar]])
-          @node_foo[:fqdn] = nil
-          @node_bar[:fqdn] = nil
+          @node_foo.automatic_attrs[:fqdn] = nil
+          @node_bar.automatic_attrs[:fqdn] = nil
           Chef::Search::Query.stub!(:new).and_return(@query)
         end
 
@@ -269,7 +267,6 @@ describe Chef::Knife::Ssh do
       Chef::Search::Query.stub!(:new).and_return(@query)
       @knife.stub(:ssh_command).and_return(exit_code)
       @knife.name_args = ['*:*', 'false']
-      @knife.config[:manual] = false
     end
 
     context "with an error" do