chef 11.6.2 → 11.8.0.rc.1

data/spec/support/shared/unit/windows_script_resource.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.
@@ -29,10 +29,10 @@ shared_examples_for "a Windows script resource" do
     node.default["kernel"][:machine] = :x86_64.to_s
 
     run_context = Chef::RunContext.new(node, nil, nil)
-    
+
     @resource = resource_instance
 
-  end  
+  end
 
   it "should be a kind of Chef::Resource::WindowsScript" do
     @resource.should be_a_kind_of(Chef::Resource)
@@ -40,9 +40,9 @@ shared_examples_for "a Windows script resource" do
   end
 
   context "script" do
-    let(:script_resource) { resource_instance }    
-    it_should_behave_like "a script resource"  
+    let(:script_resource) { resource_instance }
+    it_should_behave_like "a script resource"
   end
-  
+
 end
 

data/spec/tiny_server.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/api_client/registration_spec.rb

@@ -57,7 +57,7 @@ describe Chef::ApiClient::Registration do
     end
 
     it "creates a new ApiClient on the server using the validator identity" do
-      response = {"uri" => "https://chef.local/clients/silent-bob", 
+      response = {"uri" => "https://chef.local/clients/silent-bob",
                   "private_key" => "--begin rsa key etc--"}
       http_mock.should_receive(:post).
         with("clients", :name => 'silent-bob', :admin => false).

data/spec/unit/api_client_spec.rb

@@ -53,6 +53,19 @@ describe Chef::ApiClient do
     lambda { @client.admin(Hash.new) }.should raise_error(ArgumentError)
   end
 
+  it "has a 'validator' flag attribute" do
+    @client.validator(true)
+    @client.validator.should be_true
+  end
+
+  it "defaults to non-validator" do
+    @client.validator.should be_false
+  end
+
+  it "allows only boolean values for the 'validator' flag" do
+    lambda { @client.validator(false) }.should_not raise_error
+    lambda { @client.validator(Hash.new) }.should raise_error(ArgumentError)
+  end
 
   it "has a public key attribute" do
     @client.public_key("super public")
@@ -98,6 +111,10 @@ describe Chef::ApiClient do
       @json.should include(%q{"admin":false})
     end
 
+    it "includes the 'validator' flag" do
+      @json.should include(%q{"validator":false})
+    end
+
     it "includes the private key when present" do
       @client.private_key("monkeypants")
       @client.to_json.should include(%q{"private_key":"monkeypants"})
@@ -115,6 +132,7 @@ describe Chef::ApiClient do
       "public_key" => "crowes",
       "private_key" => "monkeypants",
       "admin" => true,
+      "validator" => true,
       "json_class" => "Chef::ApiClient"
       }
       @client = Chef::JSONCompat.from_json(client.to_json)
@@ -136,6 +154,10 @@ describe Chef::ApiClient do
       @client.admin.should be_true
     end
 
+    it "preserves the 'validator' status" do
+      @client.validator.should be_true
+    end
+
     it "includes the private key if present" do
       @client.private_key.should == "monkeypants"
     end
@@ -198,7 +220,7 @@ describe Chef::ApiClient do
           @api_client_with_key.name("lost-my-key")
           @api_client_with_key.private_key("the new private key")
           @http_client.should_receive(:put).
-            with("clients/lost-my-key", :name => "lost-my-key", :admin => false, :private_key => true).
+            with("clients/lost-my-key", :name => "lost-my-key", :admin => false, :validator => false, :private_key => true).
             and_return(@api_client_with_key)
         end
 
@@ -216,7 +238,7 @@ describe Chef::ApiClient do
         before do
           @api_client_with_key = {"name" => "lost-my-key", "private_key" => "the new private key"}
           @http_client.should_receive(:put).
-            with("clients/lost-my-key", :name => "lost-my-key", :admin => false, :private_key => true).
+            with("clients/lost-my-key", :name => "lost-my-key", :admin => false, :validator => false, :private_key => true).
             and_return(@api_client_with_key)
         end
 
@@ -227,6 +249,7 @@ describe Chef::ApiClient do
           response.private_key.should == "the new private key"
           response.name.should == "lost-my-key"
           response.admin.should be_false
+          response.validator.should be_false
         end
       end
 

data/spec/unit/application/apply.rb

@@ -20,20 +20,12 @@ require 'spec_helper'
 describe Chef::Application::Apply do
 
   before do
-    @original_config = Chef::Config.configuration
     @app = Chef::Application::Recipe.new
     @app.stub!(:configure_logging).and_return(true)
     @recipe_text = "package 'nyancat'"
     Chef::Config[:solo] = true
   end
 
-  after do
-    Chef::Config[:solo] = nil
-    Chef::Config.configuration.replace(@original_config)
-    Chef::Config[:solo] = false
-  end
-
-
   describe "configuring the application" do
     it "should set solo mode to true" do
       @app.reconfigure
@@ -68,7 +60,7 @@ describe Chef::Application::Apply do
   describe "temp_recipe_file" do
     before do
       @app.instance_variable_set(:@recipe_text, @recipe_text)
-      @app.temp_recipe_file      
+      @app.temp_recipe_file
       @recipe_fh = @app.instance_variable_get(:@recipe_fh)
     end
     it "should open a tempfile" do

data/spec/unit/application/client_spec.rb

@@ -19,21 +19,20 @@ require 'spec_helper'
 
 describe Chef::Application::Client, "reconfigure" do
   before do
-    @original_config = Chef::Config.configuration.dup
+    @original_argv = ARGV.dup
+    ARGV.clear
 
     @app = Chef::Application::Client.new
     @app.stub!(:configure_opt_parser).and_return(true)
     @app.stub!(:configure_chef).and_return(true)
     @app.stub!(:configure_logging).and_return(true)
-    Chef::Config[:json_attribs] = nil
     Chef::Config[:interval] = 10
-    Chef::Config[:splay] = nil
 
     Chef::Config[:once] = false
   end
 
   after do
-    Chef::Config.configuration.replace(@original_config)
+    ARGV.replace(@original_argv)
   end
 
   describe "when in daemonized mode and no interval has been set" do
@@ -70,49 +69,19 @@ describe Chef::Application::Client, "reconfigure" do
 
   describe "when the json_attribs configuration option is specified" do
 
-    describe "and the json_attribs matches a HTTP regex" do
-      before do
-        @json = StringIO.new({:a=>"b"}.to_json)
-        @json_tempfile = mock("Tempfile for remote JSON", :open => @json)
-        @rest = mock("Chef::REST", :get_rest => @json_tempfile)
-
-        Chef::Config[:json_attribs] = "https://foo.com/foo.json"
-        Chef::REST.stub!(:new).with("https://foo.com/foo.json", nil, nil).and_return(@rest)
-        @app.stub!(:open).with("/etc/chef/dna.json").and_return(@json)
-      end
-
-      it "should perform a RESTful GET on the supplied URL" do
-        @app.reconfigure
-        @app.chef_client_json.should == {"a" => "b"}
-      end
-    end
+    let(:json_attribs) { {"a" => "b"} }
+    let(:config_fetcher) { double(Chef::ConfigFetcher, :fetch_json => json_attribs) }
+    let(:json_source) { "https://foo.com/foo.json" }
 
-    describe "and the json_attribs does not match the HTTP regex" do
-      before do
-        Chef::Config[:json_attribs] = "/etc/chef/dna.json"
-        @json = StringIO.new({:a=>"b"}.to_json)
-        @app.stub!(:open).with("/etc/chef/dna.json").and_return(@json)
-      end
-
-      it "should parse the json out of the file" do
-        @app.reconfigure
-        @app.chef_client_json.should == {"a" => "b"}
-      end
+    before do
+      Chef::Config[:json_attribs] = json_source
+      Chef::ConfigFetcher.should_receive(:new).with(json_source).
+        and_return(config_fetcher)
     end
 
-    describe "when parsing fails" do
-      before do
-        Chef::Config[:json_attribs] = "/etc/chef/dna.json"
-        @json = mock("Tempfile", :read => {:a=>"b"}.to_json)
-        @app.stub!(:open).with("/etc/chef/dna.json").and_return(@json)
-        Chef::JSONCompat.stub!(:from_json).with(@json.read).and_raise(JSON::ParserError)
-        Chef::Application.stub!(:fatal!).and_return(true)
-      end
-
-      it "should hard fail the application" do
-        Chef::Application.should_receive(:fatal!).with("Could not parse the provided JSON file (/etc/chef/dna.json)!: JSON::ParserError", 2).and_return(true)
-        @app.reconfigure
-      end
+    it "reads the JSON attributes from the specified source" do
+      @app.reconfigure
+      @app.chef_client_json.should == json_attribs
     end
   end
 end
@@ -137,10 +106,16 @@ end
 
 describe Chef::Application::Client, "configure_chef" do
   before do
+    @original_argv = ARGV.dup
+    ARGV.clear
     @app = Chef::Application::Client.new
     @app.configure_chef
   end
 
+  after do
+    ARGV.replace(@original_argv)
+  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

data/spec/unit/application/solo_spec.rb

@@ -19,25 +19,15 @@ require 'spec_helper'
 
 describe Chef::Application::Solo do
   before do
-    @original_config = Chef::Config.configuration
-
-
     @app = Chef::Application::Solo.new
     @app.stub!(:configure_opt_parser).and_return(true)
     @app.stub!(:configure_chef).and_return(true)
     @app.stub!(:configure_logging).and_return(true)
     Chef::Config[:recipe_url] = false
     Chef::Config[:json_attribs] = false
-    Chef::Config[:splay] = nil
     Chef::Config[:solo] = true
   end
 
-  after do
-    Chef::Config[:solo] = nil
-    Chef::Config.configuration.replace(@original_config)
-    Chef::Config[:solo] = false
-  end
-
   describe "configuring the application" do
     it "should set solo mode to true" do
       @app.reconfigure
@@ -58,49 +48,19 @@ describe Chef::Application::Solo do
 
     describe "when the json_attribs configuration option is specified" do
 
-      describe "and the json_attribs matches a HTTP regex" do
-        before do
-          @json = StringIO.new({:a=>"b"}.to_json)
-          @json_tempfile = mock("Tempfile (mock)", :open => @json)
-          @rest = mock("Chef::REST", :get_rest => @json_tempfile)
-
-          Chef::Config[:json_attribs] = "https://foo.com/foo.json"
-          Chef::REST.stub!(:new).with("https://foo.com/foo.json", nil, nil).and_return(@rest)
-          @app.stub!(:open).with("/etc/chef/dna.json").and_return(@json)
-        end
-
-        it "should perform a RESTful GET on the supplied URL" do
-          @app.reconfigure
-          @app.instance_variable_get(:@chef_client_json).should == {"a" => "b"}
-        end
-      end
+      let(:json_attribs) { {"a" => "b"} }
+      let(:config_fetcher) { double(Chef::ConfigFetcher, :fetch_json => json_attribs) }
+      let(:json_source) { "https://foo.com/foo.json" }
 
-      describe "and the json_attribs does not match the HTTP regex" do
-        before do
-          Chef::Config[:json_attribs] = "/etc/chef/dna.json"
-          @json = StringIO.new({:a=>"b"}.to_json)
-          @app.stub!(:open).with("/etc/chef/dna.json").and_return(@json)
-        end
-
-        it "should parse the json out of the file" do
-          @app.reconfigure
-          @app.instance_variable_get(:@chef_client_json).should == {"a" => "b"}
-        end
+      before do
+        Chef::Config[:json_attribs] = json_source
+        Chef::ConfigFetcher.should_receive(:new).with(json_source).
+          and_return(config_fetcher)
       end
 
-      describe "when parsing fails" do
-        before do
-          Chef::Config[:json_attribs] = "/etc/chef/dna.json"
-          @json = mock("Tempfile", :read => {:a=>"b"}.to_json)
-          @app.stub!(:open).with("/etc/chef/dna.json").and_return(@json)
-          Chef::JSONCompat.stub!(:from_json).with(@json.read).and_raise(JSON::ParserError)
-          Chef::Application.stub!(:fatal!).and_return(true)
-        end
-
-        it "should hard fail the application" do
-          Chef::Application.should_receive(:fatal!).with("Could not parse the provided JSON file (/etc/chef/dna.json)!: JSON::ParserError", 2).and_return(true)
-          @app.reconfigure
-        end
+      it "reads the JSON attributes from the specified source" do
+        @app.reconfigure
+        @app.chef_solo_json.should == json_attribs
       end
     end
 

data/spec/unit/application_spec.rb

@@ -20,15 +20,17 @@ require 'spec_helper'
 
 describe Chef::Application do
   before do
-    @original_conf = Chef::Config.configuration
+    @original_argv = ARGV.dup
+    ARGV.clear
     Chef::Log.logger = Logger.new(StringIO.new)
     @app = Chef::Application.new
     Dir.stub!(:chdir).and_return(0)
     @app.stub!(:reconfigure)
+    Chef::Log.init(STDERR)
   end
 
   after do
-    Chef::Config.configuration.replace(@original_conf)
+    ARGV.replace(@original_argv)
   end
 
   describe "reconfigure" do
@@ -94,28 +96,30 @@ describe Chef::Application do
     end
 
     describe "when a config_file is present" do
-      before do
-        Chef::Config.configuration.delete('rspec_ran')
-
-        @config_file = Tempfile.new("rspec-chef-config")
-        @config_file.puts("rspec_ran('true')")
-        @config_file.close
+      let(:config_content) { "rspec_ran('true')" }
+      let(:config_location) { "/etc/chef/default.rb" }
 
-        @app.config[:config_file] = "/etc/chef/default.rb"
+      let(:config_location_pathname) do
+        p = Pathname.new(config_location)
+        p.stub(:realpath).and_return(config_location)
+        p
       end
 
-      after do
-        @config_file.unlink
+      before do
+        @app.config[:config_file] = config_location
+        Pathname.stub(:new).with(config_location).and_return(config_location_pathname)
+        File.should_receive(:read).
+          with(config_location).
+          and_return(config_content)
       end
 
       it "should configure chef::config from a file" do
-        File.should_receive(:open).with("/etc/chef/default.rb").and_yield(@config_file)
-        Chef::Config.should_receive(:from_file).with(@config_file.path)
+        Chef::Config.should_receive(:from_string).with(config_content, config_location)
         @app.configure_chef
       end
 
       it "should merge the local config hash into chef::config" do
-        File.should_receive(:open).with("/etc/chef/default.rb").and_yield(@config_file)
+        #File.should_receive(:open).with("/etc/chef/default.rb").and_yield(@config_file)
         @app.configure_chef
         Chef::Config.rspec_ran.should == "true"
       end
@@ -127,9 +131,9 @@ describe Chef::Application do
         @app.config[:config_file] = nil
       end
 
-      it "should raise a fatal" do
+      it "should emit a warning" do
         Chef::Config.should_not_receive(:from_file).with("/etc/chef/default.rb")
-        Chef::Application.should_receive(:fatal!)
+        Chef::Log.should_receive(:warn).with("No config file found or specified on command line, using command line options.")
         @app.configure_chef
       end
     end
@@ -143,36 +147,6 @@ describe Chef::Application do
         @app.configure_chef
       end
     end
-
-    describe "when the config_file is an URL" do
-      before do
-        Chef::Config.configuration.delete('rspec_ran')
-
-        @app.config[:config_file] = "http://example.com/foo.rb"
-
-        @config_file = Tempfile.new("rspec-chef-config")
-        @config_file.puts("rspec_ran('true')")
-        @config_file.close
-
-
-        @cf = mock("cf")
-        #@cf.stub!(:path).and_return("/tmp/some/path")
-        #@cf.stub!(:nil?).and_return(false)
-        @rest = mock("rest")
-        #@rest.stub!(:get_rest).and_return(@rest)
-        #@rest.stub!(:open).and_yield(@cf)
-        Chef::REST.stub!(:new).and_return(@rest)
-      end
-
-      after {@config_file.unlink}
-
-      it "should configure chef::config from an URL" do
-        Chef::REST.should_receive(:new).with("", nil, nil).at_least(1).times.and_return(@rest)
-        @rest.should_receive(:fetch).with("http://example.com/foo.rb").and_yield(@config_file)
-        @app.configure_chef
-        Chef::Config.rspec_ran.should == "true"
-      end
-    end
   end
 
   describe "when configuring the logger" do
@@ -189,17 +163,8 @@ describe Chef::Application do
       @app.configure_logging
     end
 
-    it "should initialise the chef logger level" do
-      Chef::Log.should_receive(:level=).with(Chef::Config[:log_level]).and_return(true)
-      @app.configure_logging
-    end
-
-    context "and log_level is :auto" do
-      before do
-        Chef::Config[:log_level] = :auto
-      end
-
-      context "and STDOUT is to a tty" do
+    shared_examples_for "log_level_is_auto" do
+      context "when STDOUT is to a tty" do
         before do
           STDOUT.stub!(:tty?).and_return(true)
         end
@@ -209,7 +174,7 @@ describe Chef::Application do
           Chef::Log.level.should == :warn
         end
 
-        context "and force_logger is configured" do
+        context "when force_logger is configured" do
           before do
             Chef::Config[:force_logger] = true
           end
@@ -221,7 +186,7 @@ describe Chef::Application do
         end
       end
 
-      context "and STDOUT is not to a tty" do
+      context "when STDOUT is not to a tty" do
         before do
           STDOUT.stub!(:tty?).and_return(false)
         end
@@ -231,7 +196,7 @@ describe Chef::Application do
           Chef::Log.level.should == :info
         end
 
-        context "and force_formatter is configured" do
+        context "when force_formatter is configured" do
           before do
             Chef::Config[:force_formatter] = true
           end
@@ -241,7 +206,18 @@ describe Chef::Application do
           end
         end
       end
+    end
+
+    context "when log_level is not set" do
+      it_behaves_like "log_level_is_auto"
+    end
+
+    context "when log_level is :auto" do
+      before do
+        Chef::Config[:log_level] = :auto
+      end
 
+      it_behaves_like "log_level_is_auto"
     end
   end
 
@@ -293,34 +269,29 @@ describe Chef::Application do
     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
+  context "when the config file is not available" do
+    it "should warn for bad config file path" do
+      @app.config[:config_file] = "/tmp/non-existing-dir/file"
       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
+  end
 
-    it "should warn for bad config file path" do
-      @app.config[:config_file] = "/tmp/non-existing-dir/file"
-      warns_informatively_on_configure_chef
+  describe "configuration errors" do
+    before do
+      Process.should_receive(:exit)
     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
+    def raises_informative_fatals_on_configure_chef
+      config_file_regexp = Regexp.new @app.config[:config_file]
+      Chef::Log.should_receive(:fatal).
+        with(/Configuration error/)
+      Chef::Log.should_receive(:fatal).
+        with(config_file_regexp).
+        at_least(1).times
+      @app.configure_chef
     end
 
     describe "when config file exists but contains errors" do