chef 11.4.4 → 11.6.0.hotfix.1

data/spec/support/shared/unit/windows_script_resource.rb

@@ -0,0 +1,48 @@
+#
+# Author:: Adam Edwards (<adamed@opscode.com>)
+# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# 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'
+
+require 'support/shared/unit/execute_resource'
+require 'support/shared/unit/script_resource'
+
+shared_examples_for "a Windows script resource" do
+  before(:each) do
+    node = Chef::Node.new
+
+    node.default["kernel"] = Hash.new
+    node.default["kernel"][:machine] = :x86_64.to_s
+
+    run_context = Chef::RunContext.new(node, nil, nil)
+    
+    @resource = resource_instance
+
+  end  
+
+  it "should be a kind of Chef::Resource::WindowsScript" do
+    @resource.should be_a_kind_of(Chef::Resource)
+    @resource.should be_a_kind_of(Chef::Resource::WindowsScript)
+  end
+
+  context "script" do
+    let(:script_resource) { resource_instance }    
+    it_should_behave_like "a script resource"  
+  end
+  
+end
+

data/spec/tiny_server.rb

@@ -18,6 +18,7 @@
 
 require 'rubygems'
 require 'webrick'
+require 'webrick/https'
 require 'rack'
 #require 'thin'
 require 'singleton'
@@ -90,7 +91,7 @@ module TinyServer
       true
     rescue OpenURI::HTTPError
       true
-    rescue Errno::ECONNREFUSED => e
+    rescue Errno::ECONNREFUSED, EOFError, Errno::ECONNRESET => e
       sleep 0.1
       # If the host has ":::1 localhost" in its hosts file and if IPv6
       # is not enabled we can get NetworkUnreachable exception...
@@ -127,20 +128,20 @@ module TinyServer
       @routes = {GET => [], PUT => [], POST => [], DELETE => []}
     end
 
-    def get(path, response_code, data=nil, &block)
-      @routes[GET] << Route.new(path, Response.new(response_code,data, &block))
+    def get(path, response_code, data=nil, headers=nil, &block)
+      @routes[GET] << Route.new(path, Response.new(response_code, data, headers, &block))
     end
 
-    def put(path, response_code, data=nil, &block)
-      @routes[PUT] << Route.new(path, Response.new(response_code,data, &block))
+    def put(path, response_code, data=nil, headers=nil, &block)
+      @routes[PUT] << Route.new(path, Response.new(response_code, data, headers, &block))
     end
 
-    def post(path, response_code, data=nil, &block)
-      @routes[POST] << Route.new(path, Response.new(response_code,data, &block))
+    def post(path, response_code, data=nil, headers=nil, &block)
+      @routes[POST] << Route.new(path, Response.new(response_code, data, headers, &block))
     end
 
-    def delete(path, response_code, data=nil, &block)
-      @routes[DELETE] << Route.new(path, Response.new(response_code,data, &block))
+    def delete(path, response_code, data=nil, headers=nil, &block)
+      @routes[DELETE] << Route.new(path, Response.new(response_code, data, headers, &block))
     end
 
     def call(env)
@@ -183,14 +184,15 @@ module TinyServer
   class Response
     HEADERS = {'Content-Type' => 'application/json'}
 
-    def initialize(response_code=200,data=nil, &block)
+    def initialize(response_code=200, data=nil, headers=nil, &block)
       @response_code, @data = response_code, data
+      @response_headers = headers ? HEADERS.merge(headers) : HEADERS
       @block = block_given? ? block : nil
     end
 
     def call
       data = @data || @block.call
-      [@response_code, HEADERS, Array(data)]
+      [@response_code, @response_headers, Array(data)]
     end
 
     def to_s

data/spec/unit/application/client_spec.rb

@@ -19,7 +19,7 @@ require 'spec_helper'
 
 describe Chef::Application::Client, "reconfigure" do
   before do
-    @original_config = Chef::Config.configuration
+    @original_config = Chef::Config.configuration.dup
 
     @app = Chef::Application::Client.new
     @app.stub!(:configure_opt_parser).and_return(true)
@@ -134,3 +134,41 @@ describe Chef::Application::Client, "setup_application" do
     Chef::Config[:solo] = false
   end
 end
+
+describe Chef::Application::Client, "configure_chef" do
+  before do
+    @app = Chef::Application::Client.new
+    @app.configure_chef
+  end
+
+  it "should set the colored output to false by default on windows and true otherwise" do
+    if windows?
+      Chef::Config[:color].should be_false
+    else
+      Chef::Config[:color].should be_true
+    end
+  end
+end
+
+describe Chef::Application::Client, "run_application", :unix_only do
+  before do
+    @pipe = IO.pipe
+    @app = Chef::Application::Client.new
+    @app.stub(:run_chef_client) do
+      @pipe[1].puts 'started'
+      sleep 1
+      @pipe[1].puts 'finished'
+    end
+  end
+
+  it "should exit gracefully when sent SIGTERM" do
+    pid = fork do
+      @app.run_application
+    end
+    @pipe[0].gets.should == "started\n"
+    Process.kill("TERM", pid)
+    Process.wait
+    IO.select([@pipe[0]], nil, nil, 0).should_not be_nil
+    @pipe[0].gets.should == "finished\n"
+  end
+end

data/spec/unit/application/knife_spec.rb

@@ -61,6 +61,18 @@ describe Chef::Application::Knife do
     end
   end
 
+  it "should set the colored output to false by default on windows and true otherwise" do
+    with_argv(*%w{noop knife command}) do
+      @knife.should_receive(:exit).with(0)
+      @knife.run
+    end
+    if windows?
+      Chef::Config[:color].should be_false
+    else
+      Chef::Config[:color].should be_true
+    end
+  end
+
   describe "when given a path to the client key" do
     it "expands a relative path relative to the CWD" do
       relative_path = '.chef/client.pem'

data/spec/unit/application/solo_spec.rb

@@ -136,7 +136,7 @@ describe Chef::Application::Solo do
       end
 
       it "should untar the target file to the parent of the cookbook path" do
-        Chef::Mixin::Command.should_receive(:run_command).with({:command => "tar zxvfC #{Dir.tmpdir}/chef-solo/recipes.tgz #{Dir.tmpdir}/chef-solo"}).and_return(true)
+        Chef::Mixin::Command.should_receive(:run_command).with({:command => "tar zxvf #{Dir.tmpdir}/chef-solo/recipes.tgz -C #{Dir.tmpdir}/chef-solo"}).and_return(true)
         @app.reconfigure
       end
     end

data/spec/unit/application_spec.rb

@@ -183,7 +183,9 @@ describe Chef::Application do
 
     it "should initialise the chef logger" do
       Chef::Log.stub!(:level=)
-      Chef::Log.should_receive(:init).with(Chef::Config[:log_location]).and_return(true)
+      @monologger = mock("Monologger")
+      MonoLogger.should_receive(:new).with(Chef::Config[:log_location]).and_return(@monologger)
+      Chef::Log.should_receive(:init).with(@monologger)
       @app.configure_logging
     end
 
@@ -240,7 +242,6 @@ describe Chef::Application do
         end
       end
 
-
     end
   end
 
@@ -291,4 +292,58 @@ describe Chef::Application do
       lambda { @app.run_application }.should raise_error(Chef::Exceptions::Application)
     end
   end
+
+  describe "configuration errors" do
+    before do
+      Process.stub!(:exit).and_return(true)
+    end
+
+    def raises_informative_fatals_on_configure_chef
+      config_file_regexp = Regexp.new @app.config[:config_file]
+      Chef::Log.should_receive(:fatal).with(config_file_regexp).and_return(true)
+      @app.configure_chef
+    end
+
+    def warns_informatively_on_configure_chef
+      config_file_regexp = Regexp.new @app.config[:config_file]
+      Chef::Log.should_receive(:warn).at_least(:once).with(config_file_regexp).and_return(true)
+      Chef::Log.should_receive(:warn).any_number_of_times.and_return(true)
+      @app.configure_chef
+    end
+
+    it "should warn for bad config file path" do
+      @app.config[:config_file] = "/tmp/non-existing-dir/file"
+      warns_informatively_on_configure_chef
+    end
+
+    it "should raise informative fatals for bad config file url" do
+      non_existing_url = "http://its-stubbed.com/foo.rb"
+      @app.config[:config_file] = non_existing_url
+      Chef::REST.any_instance.stub(:fetch).with(non_existing_url).and_raise(SocketError)
+      raises_informative_fatals_on_configure_chef
+    end
+
+    describe "when config file exists but contains errors" do
+      def create_config_file(text)
+        @config_file = Tempfile.new("rspec-chef-config")
+        @config_file.write(text)
+        @config_file.close
+        @app.config[:config_file] = @config_file.path
+      end
+
+      after(:each) do
+        @config_file.unlink
+      end
+
+      it "should raise informative fatals for missing log file dir" do
+        create_config_file('log_location "/tmp/non-existing-dir/logfile"')
+        raises_informative_fatals_on_configure_chef
+      end
+
+      it "should raise informative fatals for badly written config" do
+        create_config_file("text that should break the config parsing")
+        raises_informative_fatals_on_configure_chef
+      end
+    end
+  end
 end

data/spec/unit/chef_fs/diff_spec.rb

@@ -17,7 +17,6 @@
 #
 
 require 'spec_helper'
-require 'support/shared/unit/file_system_support'
 require 'chef/chef_fs/file_pattern'
 require 'chef/chef_fs/command_line'
 
@@ -87,9 +86,9 @@ describe 'diff', :uses_diff => true do
         :file_in_a_dir_in_b => {}
       }, /cannot_be_in_b/)
     }
-    it 'Chef::ChefFS::CommandLine.diff(/)' do
+    it 'Chef::ChefFS::CommandLine.diff_print(/)' do
       results = []
-      Chef::ChefFS::CommandLine.diff(pattern('/'), a, b, nil, nil) do |diff|
+      Chef::ChefFS::CommandLine.diff_print(pattern('/'), a, b, nil, nil) do |diff|
         results << remove_os_differences(diff)
       end
       results.should =~ [
@@ -118,8 +117,8 @@ deleted file
 +++ /dev/null DATE
 CONTEXT_LINE_NUMBERS
 -sub_a_only_file
-','File b/both_dirs/sub_dir_in_a_file_in_b is a directory while file b/both_dirs/sub_dir_in_a_file_in_b is a regular file
-','File a/both_dirs/sub_file_in_a_dir_in_b is a regular file while file a/both_dirs/sub_file_in_a_dir_in_b is a directory
+','File a/both_dirs/sub_dir_in_a_file_in_b is a directory while file b/both_dirs/sub_dir_in_a_file_in_b is a regular file
+','File a/both_dirs/sub_file_in_a_dir_in_b is a regular file while file b/both_dirs/sub_file_in_a_dir_in_b is a directory
 ','Only in b/both_dirs: sub_b_only_dir
 ','diff --knife a/both_dirs/sub_b_only_file b/both_dirs/sub_b_only_file
 new file
@@ -152,8 +151,8 @@ deleted file
 +++ /dev/null DATE
 CONTEXT_LINE_NUMBERS
 -a_only_file
-','File b/dir_in_a_file_in_b is a directory while file b/dir_in_a_file_in_b is a regular file
-','File a/file_in_a_dir_in_b is a regular file while file a/file_in_a_dir_in_b is a directory
+','File a/dir_in_a_file_in_b is a directory while file b/dir_in_a_file_in_b is a regular file
+','File a/file_in_a_dir_in_b is a regular file while file b/file_in_a_dir_in_b is a directory
 ','Only in b: b_only_dir
 ','diff --knife a/b_only_file b/b_only_file
 new file
@@ -163,9 +162,9 @@ CONTEXT_LINE_NUMBERS
 +b_only_file
 ' ]
     end
-    it 'Chef::ChefFS::CommandLine.diff(/both_dirs)' do
+    it 'Chef::ChefFS::CommandLine.diff_print(/both_dirs)' do
       results = []
-      Chef::ChefFS::CommandLine.diff(pattern('/both_dirs'), a, b, nil, nil) do |diff|
+      Chef::ChefFS::CommandLine.diff_print(pattern('/both_dirs'), a, b, nil, nil) do |diff|
         results << remove_os_differences(diff)
       end
       results.should =~ [
@@ -194,8 +193,8 @@ deleted file
 +++ /dev/null DATE
 CONTEXT_LINE_NUMBERS
 -sub_a_only_file
-','File b/both_dirs/sub_dir_in_a_file_in_b is a directory while file b/both_dirs/sub_dir_in_a_file_in_b is a regular file
-','File a/both_dirs/sub_file_in_a_dir_in_b is a regular file while file a/both_dirs/sub_file_in_a_dir_in_b is a directory
+','File a/both_dirs/sub_dir_in_a_file_in_b is a directory while file b/both_dirs/sub_dir_in_a_file_in_b is a regular file
+','File a/both_dirs/sub_file_in_a_dir_in_b is a regular file while file b/both_dirs/sub_file_in_a_dir_in_b is a directory
 ','Only in b/both_dirs: sub_b_only_dir
 ','diff --knife a/both_dirs/sub_b_only_file b/both_dirs/sub_b_only_file
 new file
@@ -205,22 +204,22 @@ CONTEXT_LINE_NUMBERS
 +sub_b_only_file
 ' ]
     end
-    it 'Chef::ChefFS::CommandLine.diff(/) with depth 1' do
+    it 'Chef::ChefFS::CommandLine.diff_print(/) with depth 1' do
       results = []
-      Chef::ChefFS::CommandLine.diff(pattern('/'), a, b, 1, nil) do |diff|
+      Chef::ChefFS::CommandLine.diff_print(pattern('/'), a, b, 1, nil) do |diff|
         results << remove_os_differences(diff)
       end
       results.should =~ [
-'Common subdirectories: /both_dirs
+'Common subdirectories: b/both_dirs
 ','diff --knife a/both_files_different b/both_files_different
 --- a/both_files_different DATE
 +++ b/both_files_different DATE
 CONTEXT_LINE_NUMBERS
 -a
 +b
-','Common subdirectories: /both_dirs_empty
-','Common subdirectories: /dirs_empty_in_b_filled_in_a
-','Common subdirectories: /dirs_empty_in_a_filled_in_b
+','Common subdirectories: b/both_dirs_empty
+','Common subdirectories: b/dirs_empty_in_b_filled_in_a
+','Common subdirectories: b/dirs_empty_in_a_filled_in_b
 ','Only in a: a_only_dir
 ','diff --knife a/a_only_file b/a_only_file
 deleted file
@@ -228,8 +227,8 @@ deleted file
 +++ /dev/null DATE
 CONTEXT_LINE_NUMBERS
 -a_only_file
-','File b/dir_in_a_file_in_b is a directory while file b/dir_in_a_file_in_b is a regular file
-','File a/file_in_a_dir_in_b is a regular file while file a/file_in_a_dir_in_b is a directory
+','File a/dir_in_a_file_in_b is a directory while file b/dir_in_a_file_in_b is a regular file
+','File a/file_in_a_dir_in_b is a regular file while file b/file_in_a_dir_in_b is a directory
 ','Only in b: b_only_dir
 ','diff --knife a/b_only_file b/b_only_file
 new file
@@ -239,22 +238,22 @@ CONTEXT_LINE_NUMBERS
 +b_only_file
 ' ]
     end
-    it 'Chef::ChefFS::CommandLine.diff(/*_*) with depth 0' do
+    it 'Chef::ChefFS::CommandLine.diff_print(/*_*) with depth 0' do
       results = []
-      Chef::ChefFS::CommandLine.diff(pattern('/*_*'), a, b, 0, nil) do |diff|
+      Chef::ChefFS::CommandLine.diff_print(pattern('/*_*'), a, b, 0, nil) do |diff|
         results << remove_os_differences(diff)
       end
       results.should =~ [
-'Common subdirectories: /both_dirs
+'Common subdirectories: b/both_dirs
 ','diff --knife a/both_files_different b/both_files_different
 --- a/both_files_different DATE
 +++ b/both_files_different DATE
 CONTEXT_LINE_NUMBERS
 -a
 +b
-','Common subdirectories: /both_dirs_empty
-','Common subdirectories: /dirs_empty_in_b_filled_in_a
-','Common subdirectories: /dirs_empty_in_a_filled_in_b
+','Common subdirectories: b/both_dirs_empty
+','Common subdirectories: b/dirs_empty_in_b_filled_in_a
+','Common subdirectories: b/dirs_empty_in_a_filled_in_b
 ','Only in a: a_only_dir
 ','diff --knife a/a_only_file b/a_only_file
 deleted file
@@ -262,8 +261,8 @@ deleted file
 +++ /dev/null DATE
 CONTEXT_LINE_NUMBERS
 -a_only_file
-','File b/dir_in_a_file_in_b is a directory while file b/dir_in_a_file_in_b is a regular file
-','File a/file_in_a_dir_in_b is a regular file while file a/file_in_a_dir_in_b is a directory
+','File a/dir_in_a_file_in_b is a directory while file b/dir_in_a_file_in_b is a regular file
+','File a/file_in_a_dir_in_b is a regular file while file b/file_in_a_dir_in_b is a directory
 ','Only in b: b_only_dir
 ','diff --knife a/b_only_file b/b_only_file
 new file
@@ -273,9 +272,9 @@ CONTEXT_LINE_NUMBERS
 +b_only_file
 ' ]
     end
-    it 'Chef::ChefFS::CommandLine.diff(/) in name-only mode' do
+    it 'Chef::ChefFS::CommandLine.diff_print(/) in name-only mode' do
       results = []
-      Chef::ChefFS::CommandLine.diff(pattern('/'), a, b, nil, :name_only) do |diff|
+      Chef::ChefFS::CommandLine.diff_print(pattern('/'), a, b, nil, :name_only) do |diff|
         results << remove_os_differences(diff)
       end
       results.should =~ [
@@ -299,9 +298,9 @@ CONTEXT_LINE_NUMBERS
           "b/file_in_a_dir_in_b\n"
       ]
     end
-    it 'Chef::ChefFS::CommandLine.diff(/) in name-status mode' do
+    it 'Chef::ChefFS::CommandLine.diff_print(/) in name-status mode' do
       results = []
-      Chef::ChefFS::CommandLine.diff(pattern('/'), a, b, nil, :name_status) do |diff|
+      Chef::ChefFS::CommandLine.diff_print(pattern('/'), a, b, nil, :name_status) do |diff|
         results << remove_os_differences(diff)
       end
       results.should =~ [

data/spec/unit/chef_fs/file_pattern_spec.rb

@@ -157,7 +157,7 @@ describe Chef::ChefFS::FilePattern do
     end
   end
 
-  context 'with simple pattern "a\*\b"' do
+  context 'with simple pattern "a\*\b"', :pending => (Chef::Platform.windows?) do
     let(:pattern) { Chef::ChefFS::FilePattern.new('a\*\b') }
     it 'match?' do
       pattern.match?('a*b').should be_true
@@ -264,7 +264,7 @@ describe Chef::ChefFS::FilePattern do
     end
   end
 
-  context 'with star pattern "/abc/d[a-z][0-9]f/ghi"' do
+  context 'with star pattern "/abc/d[a-z][0-9]f/ghi"', :pending => (Chef::Platform.windows?) do
     let(:pattern) { Chef::ChefFS::FilePattern.new('/abc/d[a-z][0-9]f/ghi') }
     it 'match?' do
       pattern.match?('/abc/de1f/ghi').should be_true