chef 11.6.2-x86-mingw32 → 11.8.0.rc.1-x86-mingw32

data/spec/unit/checksum/storage/filesystem_spec.rb

@@ -27,16 +27,17 @@ describe Chef::Checksum::Storage::Filesystem do
     @now = Time.now
 
     Time.stub!(:now).and_return(@now)
+    Chef::Config.stub!(:checksum_path).and_return("/var/chef/checksums")
 
     @checksum_of_the_file = "3fafecfb15585ede6b840158cbc2f399"
-    @storage = Chef::Checksum::Storage::Filesystem.new(Chef::Config.checksum_path, @checksum_of_the_file)
+    @storage = Chef::Checksum::Storage::Filesystem.new("/not/used/path", @checksum_of_the_file)
   end
 
   it "has the path to the file in the checksum repo" do
     @storage.file_location.should == "/var/chef/checksums/3f/3fafecfb15585ede6b840158cbc2f399"
   end
 
-  it "has the path the the file's subdirectory in the checksum repo" do
+  it "has the path the file's subdirectory in the checksum repo" do
     @storage.checksum_repo_directory.should == "/var/chef/checksums/3f"
   end
 

data/spec/unit/chef_fs/file_system/operation_failed_error_spec.rb

@@ -0,0 +1,47 @@
+#
+# Author:: John Keiser (<jkeiser@opscode.com>)
+# Copyright:: Copyright (c) 2012 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 'chef/chef_fs/file_system/operation_failed_error'
+
+describe Chef::ChefFS::FileSystem::OperationFailedError do
+  context 'message' do
+    let(:error_message) { 'HTTP error writing: 400 "Bad Request"' }
+
+    context 'has a cause attribute and HTTP result code is 400' do
+      it 'include error cause' do
+        allow_message_expectations_on_nil
+        response_body = '{"error":["Invalid key test in request body"]}'
+        @response.stub(:code).and_return("400")
+        @response.stub(:body).and_return(response_body)
+        exception = Net::HTTPServerException.new("(exception) unauthorized", @response)
+        proc {
+          raise Chef::ChefFS::FileSystem::OperationFailedError.new(:write, self, exception), error_message
+        }.should raise_error(Chef::ChefFS::FileSystem::OperationFailedError, "#{error_message} cause: #{response_body}")
+      end
+    end
+
+    context 'does not have a cause attribute' do
+      it 'does not include error cause' do
+        proc {
+          raise Chef::ChefFS::FileSystem::OperationFailedError.new(:write, self), error_message
+        }.should raise_error(Chef::ChefFS::FileSystem::OperationFailedError, error_message)
+      end
+    end
+  end
+end

data/spec/unit/chef_spec.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.

data/spec/unit/client_spec.rb

@@ -74,23 +74,13 @@ shared_examples_for Chef::Client do
   end
 
   describe "configuring output formatters" do
-    before do
-      @original_config = Chef::Config.configuration
-    end
-
-    after do
-      Chef::Config.configuration.replace(@original_config)
-    end
     context "when no formatter has been configured" do
       before do
-        Chef::Config.formatters.clear
         @client = Chef::Client.new
       end
 
       context "and STDOUT is a TTY" do
         before do
-          Chef::Config[:force_formatter] = false
-          Chef::Config[:force_logger] = false
           STDOUT.stub!(:tty?).and_return(true)
         end
 
@@ -114,7 +104,6 @@ shared_examples_for Chef::Client do
 
       context "and STDOUT is not a TTY" do
         before do
-          Chef::Config[:force_formatter] = false
           STDOUT.stub!(:tty?).and_return(false)
         end
 
@@ -137,7 +126,6 @@ shared_examples_for Chef::Client do
     context "when a formatter is configured" do
       context "with no output path" do
         before do
-          Chef::Config.formatters.clear
           @client = Chef::Client.new
           Chef::Config.add_formatter(:min)
         end
@@ -156,7 +144,6 @@ shared_examples_for Chef::Client do
 
       context "with an output path" do
         before do
-          Chef::Config.formatters.clear
           @client = Chef::Client.new
           @tmpout = Tempfile.open("rspec-for-client-formatter-selection-#{Process.pid}")
           Chef::Config.add_formatter(:min, @tmpout.path)
@@ -226,6 +213,7 @@ shared_examples_for Chef::Client do
       mock_chef_rest_for_node_save.should_receive(:put_rest).with("nodes/#{@fqdn}", @node).and_return(true)
 
       Chef::RunLock.any_instance.should_receive(:acquire)
+      Chef::RunLock.any_instance.should_receive(:save_pid)
       Chef::RunLock.any_instance.should_receive(:release)
 
       # Post conditions: check that node has been filled in correctly
@@ -463,19 +451,15 @@ shared_examples_for Chef::Client do
 end
 
 describe Chef::Client do
+  Chef::Config[:client_fork] = false
   it_behaves_like Chef::Client
 end
 
 describe "Chef::Client Forked" do
   before do
-    @original_config = Chef::Config.configuration
     Chef::Config[:client_fork] = true
   end
 
-  after do
-    Chef::Config.configuration.replace(@original_config)
-  end
-
   it_behaves_like Chef::Client
 
 end

data/spec/unit/config_fetcher_spec.rb

@@ -0,0 +1,98 @@
+require 'spec_helper'
+require 'chef/config_fetcher'
+describe Chef::ConfigFetcher do
+  let(:valid_json) { {:a=>"b"}.to_json }
+  let(:invalid_json) { %q[{"syntax-error": "missing quote}] }
+  let(:http) { double("Chef::HTTP::Simple") }
+
+  let(:config_location_regex) { Regexp.escape(config_location) }
+  let(:invalid_json_error_regex) { %r[Could not parse the provided JSON file \(#{config_location_regex}\)] }
+
+  let(:config_jail_path) { nil }
+
+  let(:fetcher) { Chef::ConfigFetcher.new(config_location, config_jail_path) }
+
+  context "when loading a local file" do
+    let(:config_location) { "/etc/chef/client.rb" }
+    let(:config_content) { "# The client.rb content" }
+
+    it "reads the file from disk" do
+      ::File.should_receive(:read).
+        with(config_location).
+        and_return(config_content)
+      fetcher.read_config.should == config_content
+    end
+
+    context "and consuming JSON" do
+
+      let(:config_location) { "/etc/chef/first-boot.json" }
+
+
+      it "returns the parsed JSON" do
+        ::File.should_receive(:read).
+          with(config_location).
+          and_return(valid_json)
+
+        fetcher.fetch_json.should == {"a" => "b"}
+      end
+
+      context "and the JSON is invalid" do
+
+        it "reports the JSON error" do
+
+
+          ::File.should_receive(:read).
+            with(config_location).
+            and_return(invalid_json)
+
+          Chef::Application.should_receive(:fatal!).
+            with(invalid_json_error_regex, 2)
+          fetcher.fetch_json
+        end
+      end
+    end
+
+  end
+
+  context "when loading a file over HTTP" do
+
+    let(:config_location) { "https://example.com/client.rb" }
+    let(:config_content) { "# The client.rb content" }
+
+    before do
+      Chef::HTTP::Simple.should_receive(:new).
+        with(config_location).
+        and_return(http)
+    end
+
+    it "reads the file over HTTP" do
+        http.should_receive(:get).
+          with("").and_return(config_content)
+      fetcher.read_config.should == config_content
+    end
+
+    context "and consuming JSON" do
+      let(:config_location) { "https://example.com/foo.json" }
+
+      it "fetches the file and parses it" do
+        http.should_receive(:get).
+          with("").and_return(valid_json)
+        fetcher.fetch_json.should == {"a" => "b"}
+      end
+
+      context "and the JSON is invalid" do
+        it "reports the JSON error" do
+          http.should_receive(:get).
+            with("").and_return(invalid_json)
+
+          Chef::Application.should_receive(:fatal!).
+            with(invalid_json_error_regex, 2)
+          fetcher.fetch_json
+        end
+      end
+    end
+
+  end
+
+
+end

data/spec/unit/config_spec.rb

@@ -22,7 +22,6 @@ require 'chef/exceptions'
 
 describe Chef::Config do
   before(:all) do
-    @original_config = Chef::Config.hash_dup
     @original_env = { 'HOME' => ENV['HOME'], 'SYSTEMDRIVE' => ENV['SYSTEMDRIVE'], 'HOMEPATH' => ENV['HOMEPATH'], 'USERPROFILE' => ENV['USERPROFILE'] }
   end
 
@@ -82,22 +81,18 @@ describe Chef::Config do
       #   log_level = info or defualt
       # end
       #
-    before do
-      @config_class = Class.new(Chef::Config)
-    end
-
     it "has an empty list of formatters by default" do
-      @config_class.formatters.should == []
+      Chef::Config.formatters.should == []
     end
 
     it "configures a formatter with a short name" do
-      @config_class.add_formatter(:doc)
-      @config_class.formatters.should == [[:doc, nil]]
+      Chef::Config.add_formatter(:doc)
+      Chef::Config.formatters.should == [[:doc, nil]]
     end
 
     it "configures a formatter with a file output" do
-      @config_class.add_formatter(:doc, "/var/log/formatter.log")
-      @config_class.formatters.should == [[:doc, "/var/log/formatter.log"]]
+      Chef::Config.add_formatter(:doc, "/var/log/formatter.log")
+      Chef::Config.formatters.should == [[:doc, "/var/log/formatter.log"]]
     end
 
   end
@@ -142,10 +137,6 @@ describe Chef::Config do
           and_return(@mockfile)
       end
 
-      after do
-        Chef::Config.log_location = STDOUT
-      end
-
       it "should configure itself to use a File object based upon the String" do
         Chef::Config.log_location = "/var/log/chef/client.log"
         Chef::Config.log_location.path.should == "/var/log/chef/client.log"
@@ -174,15 +165,6 @@ describe Chef::Config do
   end
 
   describe "default values" do
-    before(:each) do
-      # reload Chef::Config to ensure defaults are truely active
-      load File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "lib", "chef", "config.rb"))
-    end
-
-    after(:each) do
-      # reload spec helper to re-set any spec specific Chef::Config values
-      load File.expand_path(File.join(File.dirname(__FILE__), "..", "spec_helper.rb"))
-    end
 
     it "Chef::Config[:file_backup_path] defaults to /var/chef/backup" do
       backup_path = if windows?
@@ -201,8 +183,14 @@ describe Chef::Config do
       Chef::Config[:ssl_ca_path].should be_nil
     end
 
-    it "Chef::Config[:ssl_ca_file] defaults to nil" do
-      Chef::Config[:ssl_ca_file].should be_nil
+    describe "when on UNIX" do
+      before do
+        Chef::Config.stub(:on_windows?).and_return(false)
+      end
+
+      it "Chef::Config[:ssl_ca_file] defaults to nil" do
+        Chef::Config[:ssl_ca_file].should be_nil
+      end
     end
 
     it "Chef::Config[:data_bag_path] defaults to /var/chef/data_bags" do
@@ -220,6 +208,100 @@ describe Chef::Config do
 
       Chef::Config[:environment_path].should == environment_path
     end
+
+    describe "joining platform specific paths" do
+
+      context "on UNIX" do
+        before do
+          Chef::Config.stub(:on_windows?).and_return(false)
+        end
+
+        it "joins components when some end with separators" do
+          Chef::Config.path_join("/foo/", "bar", "baz").should == "/foo/bar/baz"
+        end
+
+        it "joins components that don't end in separators" do
+          Chef::Config.path_join("/foo", "bar", "baz").should == "/foo/bar/baz"
+        end
+
+      end
+
+      context "on Windows" do
+        before do
+          Chef::Config.stub(:on_windows?).and_return(true)
+        end
+
+        it "joins components with the windows separator" do
+          Chef::Config.path_join('c:\\foo\\', 'bar', "baz").should == 'c:\\foo\\bar\\baz'
+        end
+      end
+    end
+
+    describe "setting the config dir" do
+
+      before do
+        Chef::Config.stub(:on_windows?).and_return(false)
+        Chef::Config.config_file = "/etc/chef/client.rb"
+      end
+
+      context "by default" do
+        it "is the parent dir of the config file" do
+          Chef::Config.config_dir.should == "/etc/chef"
+        end
+      end
+
+      context "when chef is running in local mode" do
+        before do
+          Chef::Config.local_mode = true
+          Chef::Config.user_home = "/home/charlie"
+        end
+
+        it "is in the user's home dir" do
+          Chef::Config.config_dir.should == "/home/charlie/.chef/"
+        end
+      end
+
+      context "when explicitly set" do
+        before do
+          Chef::Config.config_dir = "/other/config/dir/"
+        end
+
+        it "uses the explicit value" do
+          Chef::Config.config_dir.should == "/other/config/dir/"
+        end
+      end
+
+    end
+
+    describe "finding the windows embedded dir" do
+      let(:default_config_location) { "c:/opscode/chef/embedded/lib/ruby/gems/1.9.1/gems/chef-11.6.0/lib/chef/config.rb" }
+      let(:alternate_install_location) { "c:/my/alternate/install/place/chef/embedded/lib/ruby/gems/1.9.1/gems/chef-11.6.0/lib/chef/config.rb" }
+      let(:non_omnibus_location) { "c:/my/dev/stuff/lib/ruby/gems/1.9.1/gems/chef-11.6.0/lib/chef/config.rb" }
+
+      let(:default_ca_file) { "c:/opscode/chef/embedded/ssl/certs/cacert.pem" }
+
+      it "finds the embedded dir in the default location" do
+        Chef::Config.stub(:_this_file).and_return(default_config_location)
+        Chef::Config.embedded_dir.should == "c:/opscode/chef/embedded"
+      end
+
+      it "finds the embedded dir in a custom install location" do
+        Chef::Config.stub(:_this_file).and_return(alternate_install_location)
+        Chef::Config.embedded_dir.should == "c:/my/alternate/install/place/chef/embedded"
+      end
+
+      it "doesn't error when not in an omnibus install" do
+        Chef::Config.stub(:_this_file).and_return(non_omnibus_location)
+        Chef::Config.embedded_dir.should be_nil
+      end
+
+      it "sets the ssl_ca_cert path if the cert file is available" do
+        Chef::Config.stub(:_this_file).and_return(default_config_location)
+        Chef::Config.stub(:on_windows?).and_return(true)
+        File.stub(:exist?).with(default_ca_file).and_return(true)
+        Chef::Config.ssl_ca_file.should == default_ca_file
+      end
+    end
   end
 
   describe "Chef::Config[:user_home]" do
@@ -278,8 +360,4 @@ describe Chef::Config do
       expect{Chef::Config.log_location = missing_path}.to raise_error Chef::Exceptions::ConfigurationError
     end
   end
-
-  after(:each) do
-    Chef::Config.configuration = @original_config
-  end
 end

data/spec/unit/cookbook/metadata_spec.rb

@@ -7,9 +7,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.
@@ -20,7 +20,7 @@
 require 'spec_helper'
 require 'chef/cookbook/metadata'
 
-describe Chef::Cookbook::Metadata do 
+describe Chef::Cookbook::Metadata do
   before(:each) do
     @cookbook = Chef::CookbookVersion.new('test_cookbook')
     @meta = Chef::Cookbook::Metadata.new(@cookbook)
@@ -86,7 +86,7 @@ describe Chef::Cookbook::Metadata do
     it "should return a Chef::Cookbook::Metadata object" do
       @meta.should be_a_kind_of(Chef::Cookbook::Metadata)
     end
-    
+
     it "should allow a cookbook as the first argument" do
       lambda { Chef::Cookbook::Metadata.new(@cookbook) }.should_not raise_error
     end
@@ -96,7 +96,7 @@ describe Chef::Cookbook::Metadata do
     end
 
     it "should set the maintainer name from the second argument" do
-      md = Chef::Cookbook::Metadata.new(@cookbook, 'Bobo T. Clown') 
+      md = Chef::Cookbook::Metadata.new(@cookbook, 'Bobo T. Clown')
       md.maintainer.should == 'Bobo T. Clown'
     end
 
@@ -105,7 +105,7 @@ describe Chef::Cookbook::Metadata do
     end
 
     it "should set the maintainer email from the third argument" do
-      md = Chef::Cookbook::Metadata.new(@cookbook, 'Bobo T. Clown', 'bobo@clown.co') 
+      md = Chef::Cookbook::Metadata.new(@cookbook, 'Bobo T. Clown', 'bobo@clown.co')
       md.maintainer_email.should == 'bobo@clown.co'
     end
 
@@ -114,10 +114,10 @@ describe Chef::Cookbook::Metadata do
     end
 
     it "should set the license from the fourth argument" do
-      md = Chef::Cookbook::Metadata.new(@cookbook, 'Bobo T. Clown', 'bobo@clown.co', 'Clown License v1') 
+      md = Chef::Cookbook::Metadata.new(@cookbook, 'Bobo T. Clown', 'bobo@clown.co', 'Clown License v1')
       md.license.should == 'Clown License v1'
     end
-  end 
+  end
 
   describe "cookbook" do
     it "should return the cookbook we were initialized with" do
@@ -133,7 +133,7 @@ describe Chef::Cookbook::Metadata do
 
   describe "platforms" do
     it "should return the current platform hash" do
-      @meta.platforms.should be_a_kind_of(Hash)  
+      @meta.platforms.should be_a_kind_of(Hash)
     end
   end
 
@@ -235,7 +235,7 @@ describe Chef::Cookbook::Metadata do
       end
     end
   end
-  
+
   describe "attribute groupings" do
     it "should allow you set a grouping" do
       group = {
@@ -312,7 +312,7 @@ describe Chef::Cookbook::Metadata do
       @meta.attribute("db/mysql/databases", {})
       @meta.attributes["db/mysql/databases"][:choice].should == []
     end
-    
+
      it "should let calculated be true or false" do
        lambda {
          @meta.attribute("db/mysql/databases", :calculated => true)
@@ -324,7 +324,7 @@ describe Chef::Cookbook::Metadata do
          @meta.attribute("db/mysql/databases", :calculated => Hash.new)
        }.should raise_error(ArgumentError)
      end
- 
+
      it "should set calculated to false by default" do
        @meta.attribute("db/mysql/databases", {})
        @meta.attributes["db/mysql/databases"][:calculated].should == false
@@ -350,7 +350,7 @@ describe Chef::Cookbook::Metadata do
         @meta.attribute("db/mysql/databases", :type => "symbol")
       }.should_not raise_error(ArgumentError)
     end
-    
+
      it "should let type be hash (backwards compatability only)" do
       lambda {
         @meta.attribute("db/mysql/databases", :type => "hash")
@@ -375,7 +375,7 @@ describe Chef::Cookbook::Metadata do
       }.should_not raise_error(ArgumentError)
       #attrib = @meta.attributes["db/mysql/databases"][:required].should == "required"
     end
-    
+
     it "should convert required false to optional" do
       lambda {
         @meta.attribute("db/mysql/databases", :required => false)
@@ -387,7 +387,7 @@ describe Chef::Cookbook::Metadata do
       @meta.attribute("db/mysql/databases", {})
       @meta.attributes["db/mysql/databases"][:required].should == 'optional'
     end
-  
+
     it "should make sure recipes is an array" do
       lambda {
         @meta.attribute("db/mysql/databases", :recipes => [])
@@ -399,7 +399,7 @@ describe Chef::Cookbook::Metadata do
 
     it "should set recipes to an empty array by default" do
       @meta.attribute("db/mysql/databases", {})
-      @meta.attributes["db/mysql/databases"][:recipes].should == [] 
+      @meta.attributes["db/mysql/databases"][:recipes].should == []
     end
 
     it "should allow the default value to be a string, array, or hash" do
@@ -438,14 +438,14 @@ describe Chef::Cookbook::Metadata do
       lambda {
         attrs = {
           :choice => [ "a", "b", "c"],
-          :default => "b" 
+          :default => "b"
         }
         @meta.attribute("db/mysql/databases", attrs)
       }.should_not raise_error(ArgumentError)
       lambda {
         attrs = {
           :choice => [ "a", "b", "c", "d", "e"],
-          :default => ["b", "d"] 
+          :default => ["b", "d"]
         }
         @meta.attribute("db/mysql/databases", attrs)
       }.should_not raise_error(ArgumentError)
@@ -455,7 +455,7 @@ describe Chef::Cookbook::Metadata do
       lambda {
         attrs = {
           :choice => [ "a", "b", "c"],
-          :default => "d" 
+          :default => "d"
         }
         @meta.attribute("db/mysql/databases", attrs)
       }.should raise_error(ArgumentError)
@@ -470,11 +470,11 @@ describe Chef::Cookbook::Metadata do
   end
 
   describe "recipes" do
-    before(:each) do 
+    before(:each) do
       @cookbook.recipe_files = [ "default.rb", "enlighten.rb" ]
       @meta = Chef::Cookbook::Metadata.new(@cookbook)
     end
-    
+
     it "should have the names of the recipes" do
       @meta.recipes["test_cookbook"].should == ""
       @meta.recipes["test_cookbook::enlighten"].should == ""
@@ -493,7 +493,7 @@ describe Chef::Cookbook::Metadata do
   end
 
   describe "json" do
-    before(:each) do 
+    before(:each) do
       @cookbook.recipe_files = [ "default.rb", "enlighten.rb" ]
       @meta = Chef::Cookbook::Metadata.new(@cookbook)
       @meta.version "1.0"
@@ -509,8 +509,8 @@ describe Chef::Cookbook::Metadata do
       @meta.provides "foo(:bar, :baz)"
       @meta.replaces "snarkitron"
       @meta.recipe "test_cookbook::enlighten", "is your buddy"
-      @meta.attribute "bizspark/has_login", 
-        :display_name => "You have nothing" 
+      @meta.attribute "bizspark/has_login",
+        :display_name => "You have nothing"
       @meta.version "1.2.3"
     end
 
@@ -524,23 +524,23 @@ describe Chef::Cookbook::Metadata do
       end
 
       %w{
-        name 
-        description 
-        long_description 
-        maintainer 
-        maintainer_email 
+        name
+        description
+        long_description
+        maintainer
+        maintainer_email
         license
-        platforms 
-        dependencies 
-        suggestions 
-        recommendations 
-        conflicting 
+        platforms
+        dependencies
+        suggestions
+        recommendations
+        conflicting
         providing
-        replacing 
-        attributes 
+        replacing
+        attributes
         recipes
         version
-      }.each do |t| 
+      }.each do |t|
         it "should include '#{t}'" do
           @serial[t].should == @meta.send(t.to_sym)
         end
@@ -557,23 +557,23 @@ describe Chef::Cookbook::Metadata do
       end
 
       %w{
-        name 
-        description 
-        long_description 
-        maintainer 
-        maintainer_email 
+        name
+        description
+        long_description
+        maintainer
+        maintainer_email
         license
-        platforms 
-        dependencies 
-        suggestions 
-        recommendations 
-        conflicting 
+        platforms
+        dependencies
+        suggestions
+        recommendations
+        conflicting
         providing
-        replacing 
-        attributes 
+        replacing
+        attributes
         recipes
         version
-      }.each do |t| 
+      }.each do |t|
         it "should match '#{t}'" do
           @deserial.send(t.to_sym).should == @meta.send(t.to_sym)
         end