chef 12.2.1 → 12.3.0.rc.0

data/spec/unit/provider_resolver_spec.rb

@@ -18,6 +18,7 @@
 
 require 'spec_helper'
 require 'chef/mixin/convert_to_class_name'
+require 'chef/provider_resolver'
 
 include Chef::Mixin::ConvertToClassName
 

data/spec/unit/recipe_spec.rb

@@ -20,6 +20,7 @@
 #
 
 require 'spec_helper'
+require 'chef/platform/resource_priority_map'
 
 describe Chef::Recipe do
 
@@ -136,6 +137,44 @@ describe Chef::Recipe do
           res.kind_of?(YourMom)
         end
 
+        describe "when there is more than one resource that resolves on a node" do
+          before do
+            node.automatic[:platform] = "nbc_sports"
+            Sounders = Class.new(Chef::Resource)
+            Sounders.provides :football, platform: "nbc_sports"
+            TottenhamHotspur = Class.new(Chef::Resource)
+            TottenhamHotspur.provides :football, platform: "nbc_sports"
+          end
+
+          after do
+            Object.send(:remove_const, :Sounders)
+            Object.send(:remove_const, :TottenhamHotspur)
+          end
+
+          it "warns if resolution of the two resources is ambiguous" do
+            expect(Chef::Log).to receive(:warn).at_least(:once).with(/Ambiguous resource precedence/)
+            res1 = recipe.football "club world cup"
+            expect(res1.name).to eql("club world cup")
+            # the class of res1 is not defined.
+          end
+
+          it "selects one if it is given priority" do
+            expect(Chef::Log).not_to receive(:warn)
+            Chef::Platform::ResourcePriorityMap.instance.send(:priority, :football, TottenhamHotspur, platform: "nbc_sports")
+            res1 = recipe.football "club world cup"
+            expect(res1.name).to eql("club world cup")
+            expect(res1).to be_a_kind_of(TottenhamHotspur)
+          end
+
+          it "selects the other one if it is given priority" do
+            expect(Chef::Log).not_to receive(:warn)
+            Chef::Platform::ResourcePriorityMap.instance.send(:priority, :football, Sounders, platform: "nbc_sports")
+            res1 = recipe.football "club world cup"
+            expect(res1.name).to eql("club world cup")
+            expect(res1).to be_a_kind_of(Sounders)
+          end
+        end
+
       end
     end
 
@@ -237,8 +276,17 @@ describe Chef::Recipe do
           action :nothing
         end
       end
+
+      it "validating resources via build_resource" do
+        expect {recipe.build_resource(:remote_file, "klopp") do
+          source Chef::DelayedEvaluator.new {"http://chef.io"}
+        end}.to_not raise_error
+      end
+
     end
 
+
+
     describe "creating resources via declare_resource" do
       let(:zm_resource) do
         recipe.declare_resource(:zen_master, "klopp") do

data/spec/unit/resource/link_spec.rb

@@ -53,6 +53,21 @@ describe Chef::Resource::Link do
     expect(@resource.target_file).to eql("fakey_fakerton")
   end
 
+  it "should accept a delayed evaluator as the target path" do
+    @resource.target_file Chef::DelayedEvaluator.new { "my_lazy_name" }
+    expect(@resource.target_file).to eql("my_lazy_name")
+  end
+
+  it "should accept a delayed evaluator when accessing via 'path'" do
+    @resource.target_file Chef::DelayedEvaluator.new { "my_lazy_name" }
+    expect(@resource.path).to eql("my_lazy_name")
+  end
+
+  it "should accept a delayed evaluator via 'to'" do
+    @resource.to Chef::DelayedEvaluator.new { "my_lazy_name" }
+    expect(@resource.to).to eql("my_lazy_name")
+  end
+
   it "should accept a string as the link source via 'to'" do
     expect { @resource.to "/tmp" }.not_to raise_error
   end

data/spec/unit/resource_spec.rb

@@ -709,22 +709,22 @@ describe Chef::Resource do
     end
 
     it 'adds mappings for a single platform' do
-      expect(Chef::Resource.node_map).to receive(:set).with(
-        :dinobot, Chef::Resource::Klz, { platform: ['autobots'] }
+      expect(Chef::Resource::Klz.node_map).to receive(:set).with(
+        :dinobot, true, { platform: ['autobots'] }
       )
       klz.provides :dinobot, platform: ['autobots']
     end
 
     it 'adds mappings for multiple platforms' do
-      expect(Chef::Resource.node_map).to receive(:set).with(
-        :energy, Chef::Resource::Klz, { platform: ['autobots', 'decepticons']}
+      expect(Chef::Resource::Klz.node_map).to receive(:set).with(
+        :energy, true, { platform: ['autobots', 'decepticons']}
       )
       klz.provides :energy, platform: ['autobots', 'decepticons']
     end
 
     it 'adds mappings for all platforms' do
-      expect(Chef::Resource.node_map).to receive(:set).with(
-        :tape_deck, Chef::Resource::Klz, {}
+      expect(Chef::Resource::Klz.node_map).to receive(:set).with(
+        :tape_deck, true, {}
       )
       klz.provides :tape_deck
     end

data/spec/unit/rest_spec.rb

@@ -92,6 +92,15 @@ describe Chef::REST do
     Chef::REST.new(base_url, nil, nil, options)
   end
 
+  context 'when created with a chef zero URL' do
+
+    let(:url) { "chefzero://localhost:1" }
+
+    it "does not load the signing key" do
+      expect { Chef::REST.new(url) }.to_not raise_error
+    end
+  end
+
   describe "calling an HTTP verb on a path or absolute URL" do
     it "adds a relative URL to the base url it was initialized with" do
       expect(rest.create_url("foo/bar/baz")).to eq(URI.parse(base_url + "/foo/bar/baz"))

data/spec/unit/search/query_spec.rb

@@ -81,6 +81,9 @@ describe Chef::Search::Query do
   end
 
   describe "search" do
+    let(:query_string) { "search/node?q=platform:rhel&sort=X_CHEF_id_CHEF_X%20asc&start=0" }
+    let(:query_string_continue) { "search/node?q=platform:rhel&sort=X_CHEF_id_CHEF_X%20asc&start=4" }
+
     let(:response) { {
       "rows" => [
         { "name" => "my-name-is-node",
@@ -140,6 +143,19 @@ describe Chef::Search::Query do
       "total" => 4
     } }
 
+    let(:big_response) {
+      r = response.dup
+      r["total"] = 8
+      r
+    }
+
+    let(:big_response_end) {
+      r = response.dup
+      r["start"] = 4
+      r["total"] = 8
+      r
+    }
+
     it "accepts a type as the first argument" do
       expect { query.search("node") }.not_to raise_error
       expect { query.search(:node) }.not_to raise_error
@@ -195,6 +211,14 @@ describe Chef::Search::Query do
       query.search(:node, "*:*", sort: nil, start: 0, rows: 1) { |r| @call_me.do(r) }
     end
 
+    it "sends multiple API requests when the server indicates there is more data" do
+      expect(rest).to receive(:get_rest).with(query_string).and_return(big_response)
+      expect(rest).to receive(:get_rest).with(query_string_continue).and_return(big_response_end)
+      query.search(:node, "platform:rhel") do |r|
+        nil
+      end
+    end
+
     context "when :filter_result is provided as a result" do
       include_context "filtered search" do
         let(:filter_key) { :filter_result }

data/spec/unit/shell_spec.rb

@@ -43,6 +43,8 @@ describe Shell do
   before do
     Shell.irb_conf = {}
     allow(Shell::ShellSession.instance).to receive(:reset!)
+    allow(Chef::Platform).to receive(:windows?).and_return(false)
+    allow(Chef::Util::PathHelper).to receive(:home).and_return('/home/foo')
   end
 
   describe "reporting its status" do
@@ -56,7 +58,7 @@ describe Shell do
   describe "configuring IRB" do
     it "configures irb history" do
       Shell.configure_irb
-      expect(Shell.irb_conf[:HISTORY_FILE]).to eq("#{ENV['HOME']}/.chef/chef_shell_history")
+      expect(Shell.irb_conf[:HISTORY_FILE]).to eq(Chef::Util::PathHelper.home('.chef', 'chef_shell_history'))
       expect(Shell.irb_conf[:SAVE_HISTORY]).to eq(1000)
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef
 version: !ruby/object:Gem::Version
-  version: 12.2.1
+  version: 12.3.0.rc.0
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-30 00:00:00.000000000 Z
+date: 2015-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-config
@@ -208,14 +208,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -559,6 +559,7 @@ files:
 - lib/chef/audit/control_group_data.rb
 - lib/chef/audit/rspec_formatter.rb
 - lib/chef/audit/runner.rb
+- lib/chef/chef_class.rb
 - lib/chef/chef_fs.rb
 - lib/chef/chef_fs/chef_fs_data_store.rb
 - lib/chef/chef_fs/command_line.rb
@@ -727,6 +728,7 @@ files:
 - lib/chef/http/json_to_model_output.rb
 - lib/chef/http/remote_request_id.rb
 - lib/chef/http/simple.rb
+- lib/chef/http/socketless_chef_zero_client.rb
 - lib/chef/http/ssl_policies.rb
 - lib/chef/http/validate_content_length.rb
 - lib/chef/json_compat.rb
@@ -870,6 +872,7 @@ files:
 - lib/chef/mixin/params_validate.rb
 - lib/chef/mixin/path_sanity.rb
 - lib/chef/mixin/powershell_type_coercions.rb
+- lib/chef/mixin/provides.rb
 - lib/chef/mixin/recipe_definition_dsl_core.rb
 - lib/chef/mixin/securable.rb
 - lib/chef/mixin/shell_out.rb
@@ -896,6 +899,7 @@ files:
 - lib/chef/platform/provider_priority_map.rb
 - lib/chef/platform/query_helpers.rb
 - lib/chef/platform/rebooter.rb
+- lib/chef/platform/resource_priority_map.rb
 - lib/chef/platform/service_helpers.rb
 - lib/chef/policy_builder.rb
 - lib/chef/policy_builder/expand_node_object.rb
@@ -1058,6 +1062,7 @@ files:
 - lib/chef/resource/link.rb
 - lib/chef/resource/log.rb
 - lib/chef/resource/lwrp_base.rb
+- lib/chef/resource/macosx_service.rb
 - lib/chef/resource/macports_package.rb
 - lib/chef/resource/mdadm.rb
 - lib/chef/resource/mount.rb
@@ -1102,6 +1107,7 @@ files:
 - lib/chef/resource_definition.rb
 - lib/chef/resource_definition_list.rb
 - lib/chef/resource_reporter.rb
+- lib/chef/resource_resolver.rb
 - lib/chef/resources.rb
 - lib/chef/rest.rb
 - lib/chef/role.rb
@@ -1221,8 +1227,6 @@ files:
 - spec/data/apt/var/www/apt/pool/main/c/chef-integration-test/chef-integration-test_1.0-1_amd64.deb
 - spec/data/apt/var/www/apt/pool/main/c/chef-integration-test/chef-integration-test_1.1-1_amd64.deb
 - spec/data/bad-config.rb
-- spec/data/big_json.json
-- spec/data/big_json_plus_one.json
 - spec/data/bootstrap/encrypted_data_bag_secret
 - spec/data/bootstrap/no_proxy.erb
 - spec/data/bootstrap/secret.erb
@@ -1362,6 +1366,7 @@ files:
 - spec/data/mac_users/10.9.plist.xml
 - spec/data/mac_users/10.9.shadow.xml
 - spec/data/metadata/quick_start/metadata.rb
+- spec/data/nested.json
 - spec/data/nodes/default.rb
 - spec/data/nodes/test.example.com.rb
 - spec/data/nodes/test.rb
@@ -1616,6 +1621,7 @@ files:
 - spec/unit/audit/control_group_data_spec.rb
 - spec/unit/audit/rspec_formatter_spec.rb
 - spec/unit/audit/runner_spec.rb
+- spec/unit/chef_class_spec.rb
 - spec/unit/chef_fs/config_spec.rb
 - spec/unit/chef_fs/data_handler/group_handler_spec.rb
 - spec/unit/chef_fs/diff_spec.rb
@@ -1676,6 +1682,7 @@ files:
 - spec/unit/http/http_request_spec.rb
 - spec/unit/http/json_input_spec.rb
 - spec/unit/http/simple_spec.rb
+- spec/unit/http/socketless_chef_zero_client_spec.rb
 - spec/unit/http/ssl_policies_spec.rb
 - spec/unit/http/validate_content_length_spec.rb
 - spec/unit/http_spec.rb
@@ -2033,12 +2040,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A systems integration framework, built to bring the benefits of configuration

data/spec/data/big_json_plus_one.json

@@ -1,2 +0,0 @@
-{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":{"key":"test"
-}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}