chef 11.12.8-x86-mingw32 → 11.14.0.alpha.2-x86-mingw32

data/spec/unit/formatters/error_inspectors/compile_error_inspector_spec.rb

@@ -42,8 +42,8 @@ describe Chef::Formatters::ErrorInspectors::CompileErrorInspector do
     @description = Chef::Formatters::ErrorDescription.new("Error Evaluating File:")
     @exception = NoMethodError.new("undefined method `this_is_not_a_valid_method' for Chef::Resource::File")
 
-    @outputter = Chef::Formatters::Outputter.new(StringIO.new, STDERR)
-    #@outputter = Chef::Formatters::Outputter.new(STDOUT, STDERR)
+    @outputter = Chef::Formatters::IndentableOutputStream.new(StringIO.new, STDERR)
+    #@outputter = Chef::Formatters::IndentableOutputStream.new(STDOUT, STDERR)
   end
 
   describe "when scrubbing backtraces" do

data/spec/unit/formatters/error_inspectors/cookbook_resolve_error_inspector_spec.rb

@@ -25,8 +25,8 @@ describe Chef::Formatters::ErrorInspectors::CookbookResolveErrorInspector do
 
     @description = Chef::Formatters::ErrorDescription.new("Error Resolving Cookbooks for Run List:")
     @outputter_output = StringIO.new
-    @outputter = Chef::Formatters::Outputter.new(@outputter_output, STDERR)
-    # @outputter = Chef::Formatters::Outputter.new(STDOUT, STDERR)
+    @outputter = Chef::Formatters::IndentableOutputStream.new(@outputter_output, STDERR)
+    # @outputter = Chef::Formatters::IndentableOutputStream.new(STDOUT, STDERR)
   end
 
   describe "when explaining a 403 error" do

data/spec/unit/formatters/error_inspectors/cookbook_sync_error_inspector_spec.rb

@@ -21,8 +21,8 @@ require 'spec_helper'
 describe Chef::Formatters::ErrorInspectors::CookbookSyncErrorInspector do
   before do
     @description = Chef::Formatters::ErrorDescription.new("Error Expanding RunList:")
-    @outputter = Chef::Formatters::Outputter.new(StringIO.new, STDERR)
-    #@outputter = Chef::Formatters::Outputter.new(STDOUT, STDERR)
+    @outputter = Chef::Formatters::IndentableOutputStream.new(StringIO.new, STDERR)
+    #@outputter = Chef::Formatters::IndentableOutputStream.new(STDOUT, STDERR)
   end
 
   describe "when explaining a 502 error" do

data/spec/unit/formatters/error_inspectors/resource_failure_inspector_spec.rb

@@ -39,8 +39,8 @@ describe Chef::Formatters::ErrorInspectors::ResourceFailureInspector do
   before do
     @description = Chef::Formatters::ErrorDescription.new("Error Converging Resource:")
     @stdout = StringIO.new
-    @outputter = Chef::Formatters::Outputter.new(@stdout, STDERR)
-    #@outputter = Chef::Formatters::Outputter.new(STDOUT, STDERR)
+    @outputter = Chef::Formatters::IndentableOutputStream.new(@stdout, STDERR)
+    #@outputter = Chef::Formatters::IndentableOutputStream.new(STDOUT, STDERR)
 
     Chef::Config.stub(:cookbook_path).and_return([ "/var/chef/cache" ])
   end

data/spec/unit/formatters/error_inspectors/run_list_expansion_error_inspector_spec.rb

@@ -26,8 +26,8 @@ describe Chef::Formatters::ErrorInspectors::RunListExpansionErrorInspector do
     end
 
     @description = Chef::Formatters::ErrorDescription.new("Error Expanding RunList:")
-    @outputter = Chef::Formatters::Outputter.new(StringIO.new, STDERR)
-    #@outputter = Chef::Formatters::Outputter.new(STDOUT, STDERR)
+    @outputter = Chef::Formatters::IndentableOutputStream.new(StringIO.new, STDERR)
+    #@outputter = Chef::Formatters::IndentableOutputStream.new(STDOUT, STDERR)
   end
 
   describe "when explaining a missing role error" do

data/spec/unit/handler_spec.rb

@@ -107,7 +107,6 @@ describe Chef::Handler do
       $report_ran = false
       def @handler.report
         $report_ran = true
-        puts "I'm AOK here."
       end
       lambda {@handler.run_report_safely(@run_status)}.should_not raise_error
       $report_ran.should be_true

data/spec/unit/knife/client_bulk_delete_spec.rb

@@ -21,12 +21,15 @@ require 'spec_helper'
 describe Chef::Knife::ClientBulkDelete do
   let(:stdout_io) { StringIO.new }
   let(:stdout) {stdout_io.string}
+  let(:stderr_io) { StringIO.new }
+  let(:stderr) { stderr_io.string }
 
   let(:knife) {
     k = Chef::Knife::ClientBulkDelete.new
     k.name_args = name_args
     k.config = option_args
     k.ui.stub(:stdout).and_return(stdout_io)
+    k.ui.stub(:stderr).and_return(stderr_io)
     k.ui.stub(:confirm).and_return(knife_confirm)
     k.ui.stub(:confirm_without_exit).and_return(knife_confirm)
     k

data/spec/unit/knife/cookbook_bulk_delete_spec.rb

@@ -27,7 +27,9 @@ describe Chef::Knife::CookbookBulkDelete do
     @knife.config = {:print_after => nil}
     @knife.name_args = ["."]
     @stdout = StringIO.new
+    @stderr = StringIO.new
     @knife.ui.stub(:stdout).and_return(@stdout)
+    @knife.ui.stub(:stderr).and_return(@stderr)
     @knife.ui.stub(:confirm).and_return(true)
     @cookbooks = Hash.new
     %w{cheezburger pizza lasagna}.each do |cookbook_name|

data/spec/unit/knife/cookbook_metadata_spec.rb

@@ -51,9 +51,9 @@ describe Chef::Knife::CookbookMetadata do
     describe 'with -a or --all' do
       before(:each) do
         @knife.config[:all] = true
-        @foo = Chef::CookbookVersion.new('foo')
+        @foo = Chef::CookbookVersion.new('foo', '/tmp/blah')
         @foo.version = '1.0.0'
-        @bar = Chef::CookbookVersion.new('bar')
+        @bar = Chef::CookbookVersion.new('bar', '/tmp/blah')
         @bar.version = '2.0.0'
         @cookbook_loader = {
           "foo" => @foo,

data/spec/unit/knife/cookbook_site_install_spec.rb

@@ -21,7 +21,9 @@ require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "spec_hel
 describe Chef::Knife::CookbookSiteInstall do
   before(:each) do
     require 'chef/knife/core/cookbook_scm_repo'
+    @stdout = StringIO.new
     @knife = Chef::Knife::CookbookSiteInstall.new
+    @knife.ui.stub(:stdout).and_return(@stdout)
     @knife.config = {}
     if Chef::Platform.windows?
       @install_path = 'C:/tmp/chef'
@@ -52,7 +54,7 @@ describe Chef::Knife::CookbookSiteInstall do
     end
 
     #Stubs for CookbookSCMRepo
-    @repo = stub(:sanity_check => true, :reset_to_default_state => true,
+    @repo = double(:sanity_check => true, :reset_to_default_state => true,
                  :prepare_to_import => true, :finalize_updates_to => true,
                  :merge_updates_from => true)
     Chef::Knife::CookbookSCMRepo.stub(:new).and_return(@repo)

data/spec/unit/knife/cookbook_upload_spec.rb

@@ -23,7 +23,7 @@ require 'chef/cookbook_uploader'
 require 'timeout'
 
 describe Chef::Knife::CookbookUpload do
-  let(:cookbook) { Chef::CookbookVersion.new('test_cookbook') }
+  let(:cookbook) { Chef::CookbookVersion.new('test_cookbook', '/tmp/blah.txt') }
 
   let(:cookbooks_by_name) do
     {cookbook.name => cookbook}
@@ -39,7 +39,7 @@ describe Chef::Knife::CookbookUpload do
   let(:cookbook_uploader) { double(:upload_cookbooks => nil) }
 
   let(:output) { StringIO.new }
-  
+
   let(:name_args) { ['test_cookbook'] }
 
   let(:knife) do
@@ -58,7 +58,7 @@ describe Chef::Knife::CookbookUpload do
     it 'should upload cookbooks with predefined concurrency' do
       Chef::CookbookVersion.stub(:list_all_versions).and_return({})
       knife.config[:concurrency] = 3
-      test_cookbook = Chef::CookbookVersion.new('test_cookbook')
+      test_cookbook = Chef::CookbookVersion.new('test_cookbook', '/tmp/blah')
       cookbook_loader.stub(:each).and_yield("test_cookbook", test_cookbook)
       cookbook_loader.stub(:cookbook_names).and_return(["test_cookbook"])
       Chef::CookbookUploader.should_receive(:new).with( kind_of(Array),  kind_of(Array),
@@ -131,9 +131,9 @@ E
 
       let(:cookbooks_by_name) do
         {
-          'test_cookbook1' => Chef::CookbookVersion.new('test_cookbook1'),
-          'test_cookbook2' => Chef::CookbookVersion.new('test_cookbook2'),
-          'test_cookbook3' => Chef::CookbookVersion.new('test_cookbook3')
+          'test_cookbook1' => Chef::CookbookVersion.new('test_cookbook1', '/tmp/blah'),
+          'test_cookbook2' => Chef::CookbookVersion.new('test_cookbook2', '/tmp/blah'),
+          'test_cookbook3' => Chef::CookbookVersion.new('test_cookbook3', '/tmp/blah')
         }
       end
 
@@ -163,7 +163,7 @@ E
           "test_cookbook3" => test_cookbook3 }
       end
 
-      let(:test_cookbook1) { Chef::CookbookVersion.new('test_cookbook1') }
+      let(:test_cookbook1) { Chef::CookbookVersion.new('test_cookbook1', '/tmp/blah') }
 
       let(:test_cookbook2) do
         c = Chef::CookbookVersion.new('test_cookbook2')
@@ -191,7 +191,7 @@ E
     end
 
     describe 'when specifying a cookbook name with missing dependencies' do
-      let(:cookbook_dependency) { Chef::CookbookVersion.new('dependency') }
+      let(:cookbook_dependency) { Chef::CookbookVersion.new('dependency', '/tmp/blah') }
 
       before(:each) do
         cookbook.metadata.depends("dependency")
@@ -245,8 +245,8 @@ E
     describe 'with -a or --all' do
       before(:each) do
         knife.config[:all] = true
-        @test_cookbook1 = Chef::CookbookVersion.new('test_cookbook1')
-        @test_cookbook2 = Chef::CookbookVersion.new('test_cookbook2')
+        @test_cookbook1 = Chef::CookbookVersion.new('test_cookbook1', '/tmp/blah')
+        @test_cookbook2 = Chef::CookbookVersion.new('test_cookbook2', '/tmp/blah')
         cookbook_loader.stub(:each).and_yield("test_cookbook1", @test_cookbook1).and_yield("test_cookbook2", @test_cookbook2)
         cookbook_loader.stub(:cookbook_names).and_return(["test_cookbook1", "test_cookbook2"])
       end

data/spec/unit/knife/node_environment_set_spec.rb

@@ -0,0 +1,80 @@
+#
+# Author:: Jimmy McCrory (<jimmy.mccrory@gmail.com>)
+# Copyright:: Copyright (c) 2014 Jimmy McCrory
+# 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::NodeEnvironmentSet do
+  before(:each) do
+    Chef::Config[:node_name]  = "webmonkey.example.com"
+    @knife = Chef::Knife::NodeEnvironmentSet.new
+    @knife.name_args = [ "adam", "bar" ]
+    @knife.stub(:output).and_return(true)
+    @node = Chef::Node.new()
+    @node.name("knifetest-node")
+    @node.chef_environment << "foo"
+    @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 update the environment" do
+      @knife.run
+      @node.chef_environment.should == 'bar'
+    end
+
+    it "should save the node" do
+      @node.should_receive(:save)
+      @knife.run
+    end
+
+    it "should print the environment" do
+      @knife.should_receive(:output).and_return(true)
+      @knife.run
+    end
+
+    describe "with no environment" 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 the usage and an error" do
+        @knife.name_args = [ "adam" ]
+
+        begin ; @knife.run ; rescue SystemExit ; end
+
+        @stdout.string.should eq "USAGE: knife node environment set NODE ENVIRONMENT\n"
+        @stderr.string.should eq "FATAL: You must specify a node name and an environment.\n"
+      end
+    end
+  end
+end

data/spec/unit/knife/user_create_spec.rb

@@ -23,6 +23,12 @@ Chef::Knife::UserCreate.load_deps
 describe Chef::Knife::UserCreate do
   before(:each) do
     @knife = Chef::Knife::UserCreate.new
+
+    @stdout = StringIO.new
+    @stderr = StringIO.new
+    @knife.ui.stub(:stdout).and_return(@stdout)
+    @knife.ui.stub(:stderr).and_return(@stderr)
+
     @knife.name_args = [ 'a_user' ]
     @knife.config[:user_password] = "foobar"
     @user = Chef::User.new
@@ -34,10 +40,6 @@ describe Chef::Knife::UserCreate do
     Chef::User.stub(:new).and_return(@user)
     Chef::User.stub(:from_hash).and_return(@user)
     @knife.stub(:edit_data).and_return(@user.to_hash)
-    @stdout = StringIO.new
-    @stderr = StringIO.new
-    @knife.ui.stub(:stdout).and_return(@stdout)
-    @knife.ui.stub(:stderr).and_return(@stderr)
   end
 
   it "creates a new user" do

data/spec/unit/knife/user_edit_spec.rb

@@ -20,8 +20,13 @@ require 'spec_helper'
 
 describe Chef::Knife::UserEdit do
   before(:each) do
+    @stderr = StringIO.new
+    @stdout = StringIO.new
+
     Chef::Knife::UserEdit.load_deps
     @knife = Chef::Knife::UserEdit.new
+    @knife.ui.stub(:stderr).and_return(@stderr)
+    @knife.ui.stub(:stdout).and_return(@stdout)
     @knife.name_args = [ 'my_user' ]
     @knife.config[:disable_editing] = true
   end

data/spec/unit/knife_spec.rb

@@ -29,6 +29,9 @@ describe Chef::Knife do
     Chef::Log.logger = Logger.new(StringIO.new)
 
     Chef::Config[:node_name]  = "webmonkey.example.com"
+
+    # Prevent gratuitous code reloading:
+    Chef::Knife.stub(:load_commands)
     @knife = Chef::Knife.new
     @knife.ui.stub(:puts)
     @knife.ui.stub(:print)

data/spec/unit/mixin/securable_spec.rb

@@ -46,7 +46,6 @@ describe Chef::Mixin::Securable do
   describe "unix-specific behavior" do
     before(:each) do
       platform_mock :unix do
-        load File.join(File.dirname(__FILE__), "..", "..", "..", "lib", "chef", "config.rb")
         load File.join(File.dirname(__FILE__), "..", "..", "..", "lib", "chef", "mixin", "securable.rb")
         @securable = Object.new
         @securable.send(:extend, Chef::Mixin::Securable)
@@ -156,35 +155,34 @@ describe Chef::Mixin::Securable do
     end
 
     it "should accept a unix file mode in numeric form as a ruby-interpreted integer" do
-      lambda { @securable.mode 0 }.should_not raise_error
-      lambda { @securable.mode 0000 }.should_not raise_error
-      lambda { @securable.mode 444 }.should_not raise_error
-      lambda { @securable.mode 0444 }.should_not raise_error
-      lambda { @securable.mode 07777 }.should_not raise_error
-
-      lambda { @securable.mode 292 }.should_not raise_error
-      lambda { @securable.mode 4095 }.should_not raise_error
-
-      lambda { @securable.mode 0111 }.should_not raise_error
-      lambda { @securable.mode 73 }.should_not raise_error
-
-      lambda { @securable.mode -01 }.should raise_error(ArgumentError)
-      lambda { @securable.mode 010000 }.should raise_error(ArgumentError)
-      lambda { @securable.mode -1 }.should raise_error(ArgumentError)
-      lambda { @securable.mode 4096 }.should raise_error(ArgumentError)
+      lambda { @securable.mode(0) }.should_not raise_error
+      lambda { @securable.mode(0000) }.should_not raise_error
+      lambda { @securable.mode(444) }.should_not raise_error
+      lambda { @securable.mode(0444) }.should_not raise_error
+      lambda { @securable.mode(07777) }.should_not raise_error
+
+      lambda { @securable.mode(292) }.should_not raise_error
+      lambda { @securable.mode(4095) }.should_not raise_error
+
+      lambda { @securable.mode(0111) }.should_not raise_error
+      lambda { @securable.mode(73) }.should_not raise_error
+
+      lambda { @securable.mode(-01) }.should raise_error(ArgumentError)
+      lambda { @securable.mode(010000) }.should raise_error(ArgumentError)
+      lambda { @securable.mode(-1) }.should raise_error(ArgumentError)
+      lambda { @securable.mode(4096) }.should raise_error(ArgumentError)
     end
   end
 
   describe "windows-specific behavior" do
     before(:each) do
       platform_mock :windows do
-        load File.join(File.dirname(__FILE__), "..", "..", "..", "lib", "chef", "config.rb")
         load File.join(File.dirname(__FILE__), "..", "..", "..", "lib", "chef", "mixin", "securable.rb")
-        SECURABLE_CLASS = Class.new do
+        securable_class = Class.new do
           include Chef::Mixin::Securable
           include Chef::Mixin::ParamsValidate
         end
-        @securable = SECURABLE_CLASS.new
+        @securable = securable_class.new
       end
     end
 

data/spec/unit/node/attribute_spec.rb

@@ -890,6 +890,15 @@ describe Chef::Node::Attribute do
   end
 
   describe "index" do
+    # Hash#index is deprecated and triggers warnings.
+    def silence
+      old_verbose = $VERBOSE
+      $VERBOSE = nil
+      yield
+    ensure
+      $VERBOSE = old_verbose
+    end
+
     before do
       @attributes = Chef::Node::Attribute.new(
         {
@@ -914,13 +923,17 @@ describe Chef::Node::Attribute do
 
     describe "when the value is indexed" do
       it "should return the index" do
-        @attributes.index("six").should == "one"
+        silence do
+          @attributes.index("six").should == "one"
+        end
       end
     end
 
     describe "when the value is not indexed" do
       it "should return nil" do
-        @attributes.index("lolol").should == nil
+        silence do
+          @attributes.index("lolol").should == nil
+        end
       end
     end
 

data/spec/unit/node/immutable_collections_spec.rb

@@ -76,7 +76,7 @@ describe Chef::Node::ImmutableMash do
     end
 
     it 'should allow mutation' do
-      lambda { @copy['m'] = 'm' }.should_not raise_error(Chef::Exceptions::ImmutableAttributeModification)
+      lambda { @copy['m'] = 'm' }.should_not raise_error
     end
 
   end
@@ -97,7 +97,7 @@ describe Chef::Node::ImmutableMash do
     :shift
   ].each do |mutator|
     it "doesn't allow mutation via `#{mutator}'" do
-      lambda { @immutable_mash.send(mutator) }.should raise_error(Chef::Exceptions::ImmutableAttributeModification)
+      lambda { @immutable_mash.send(mutator) }.should raise_error
     end
   end
 
@@ -154,7 +154,7 @@ describe Chef::Node::ImmutableArray do
     :unshift
   ].each do |mutator|
     it "does not allow mutation via `#{mutator}" do
-      lambda { @immutable_array.send(mutator)}.should raise_error(Chef::Exceptions::ImmutableAttributeModification)
+      lambda { @immutable_array.send(mutator)}.should raise_error
     end
   end
 
@@ -190,7 +190,7 @@ describe Chef::Node::ImmutableArray do
     end
 
     it 'should allow mutation' do
-      lambda { @copy << 'm' }.should_not raise_error(Chef::Exceptions::ImmutableAttributeModification)
+      lambda { @copy << 'm' }.should_not raise_error
     end
   end