chef 12.4.0.rc.2-universal-mingw32 → 12.4.0-universal-mingw32

data/spec/unit/provider_resolver_spec.rb

@@ -482,7 +482,6 @@ describe Chef::ProviderResolver do
     python: Chef::Provider::Script,
     remote_directory: Chef::Provider::RemoteDirectory,
     route: Chef::Provider::Route,
-    rpm_package: Chef::Provider::Package::Rpm,
     ruby: Chef::Provider::Script,
     ruby_block: Chef::Provider::RubyBlock,
     script: Chef::Provider::Script,

data/spec/unit/recipe_spec.rb

@@ -121,6 +121,7 @@ describe Chef::Recipe do
 
         it "locate resource for particular platform" do
           ShaunTheSheep = Class.new(Chef::Resource)
+          ShaunTheSheep.resource_name :shaun_the_sheep
           ShaunTheSheep.provides :laughter, :platform => ["television"]
           node.automatic[:platform] = "television"
           node.automatic[:platform_version] = "123"
@@ -131,6 +132,7 @@ describe Chef::Recipe do
 
         it "locate a resource for all platforms" do
           YourMom = Class.new(Chef::Resource)
+          YourMom.resource_name :your_mom
           YourMom.provides :love_and_caring
           res = recipe.love_and_caring "mommy"
           expect(res.name).to eql("mommy")
@@ -141,7 +143,9 @@ describe Chef::Recipe do
           before do
             node.automatic[:platform] = "nbc_sports"
             Sounders = Class.new(Chef::Resource)
+            Sounders.resource_name :sounders
             TottenhamHotspur = Class.new(Chef::Resource)
+            TottenhamHotspur.resource_name :tottenham_hotspur
           end
 
           after do
@@ -149,24 +153,24 @@ describe Chef::Recipe do
             Object.send(:remove_const, :TottenhamHotspur)
           end
 
-          it "selects one if it is the last declared" do
-            expect(Chef::Log).not_to receive(:warn)
+          it "selects the first one alphabetically" do
+            expect(Chef::Log).to receive(:warn).with("You declared a new resource TottenhamHotspur for resource football, but it comes alphabetically after Sounders and has the same filters ({:platform=>\"nbc_sports\"}), so it will not be used. Use override: true if you want to use it for football.")
 
             Sounders.provides :football, platform: "nbc_sports"
             TottenhamHotspur.provides :football, 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)
+            expect(res1).to be_a_kind_of(Sounders)
           end
 
-          it "selects the other one if it is given priority" do
-            expect(Chef::Log).not_to receive(:warn)
+          it "selects the first one alphabetically even if the declaration order is reversed" do
+            expect(Chef::Log).to receive(:warn).with("You are overriding football2 on {:platform=>\"nbc_sports\"} with Sounders: used to be TottenhamHotspur. Use override: true if this is what you intended.")
 
-            TottenhamHotspur.provides :football, platform: "nbc_sports"
-            Sounders.provides :football, platform: "nbc_sports"
+            TottenhamHotspur.provides :football2, platform: "nbc_sports"
+            Sounders.provides :football2, platform: "nbc_sports"
 
-            res1 = recipe.football "club world cup"
+            res1 = recipe.football2 "club world cup"
             expect(res1.name).to eql("club world cup")
             expect(res1).to be_a_kind_of(Sounders)
           end

data/spec/unit/resource_collection_spec.rb

@@ -252,7 +252,7 @@ describe Chef::ResourceCollection do
       expect(json).to match(/instance_vars/)
     end
 
-    include_examples "to_json equalivent to Chef::JSONCompat.to_json" do
+    include_examples "to_json equivalent to Chef::JSONCompat.to_json" do
       let(:jsonable) { rc }
     end
   end

data/spec/unit/resource_resolver_spec.rb

@@ -0,0 +1,49 @@
+#
+# Author:: Ranjib Dey
+# Copyright:: Copyright (c) 2015 Ranjib Dey <ranjib@linux.com>.
+# 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/resource_resolver'
+
+
+describe Chef::ResourceResolver do
+  it '#resolve' do
+    expect(described_class.resolve(:execute)).to eq(Chef::Resource::Execute)
+  end
+
+  it '#list' do
+    expect(described_class.list(:package)).to_not be_empty
+  end
+
+  context 'instance methods' do
+    let(:resolver) do
+      described_class.new(Chef::Node.new, 'execute[echo]')
+    end
+
+    it '#resolve' do
+      expect(resolver.resolve).to be_nil
+    end
+
+    it '#list' do
+      expect(resolver.list).to be_empty
+    end
+
+    it '#provided_by?' do
+      expect(resolver.provided_by?(Chef::Resource::Execute)).to be_truthy
+    end
+  end
+end

data/spec/unit/resource_spec.rb

@@ -344,6 +344,7 @@ describe Chef::Resource do
         expect(r.resource_name).to be_nil
         expect(r.declared_type).to eq :d
       end
+
       it "and there are no provides lines, @resource_name is used" do
         c = Class.new(Chef::Resource) do
           def initialize(*args, &block)
@@ -358,6 +359,20 @@ describe Chef::Resource do
         expect(r.resource_name).to eq :blah
         expect(r.declared_type).to eq :d
       end
+
+      it "and the resource class gets a late-bound name, resource_name is nil" do
+        c = Class.new(Chef::Resource) do
+          def self.name
+            "ResourceSpecNameTest"
+          end
+        end
+
+        r = c.new('hi')
+        r.declared_type = :d
+        expect(c.resource_name).to be_nil
+        expect(r.resource_name).to be_nil
+        expect(r.declared_type).to eq :d
+      end
     end
 
     it "resource_name without provides is honored" do
@@ -416,7 +431,7 @@ describe Chef::Resource do
       expect(json).to match(/instance_vars/)
     end
 
-    include_examples "to_json equalivent to Chef::JSONCompat.to_json" do
+    include_examples "to_json equivalent to Chef::JSONCompat.to_json" do
       let(:jsonable) { @resource }
     end
   end
@@ -795,21 +810,21 @@ describe Chef::Resource do
     end
 
     it 'adds mappings for a single platform' do
-      expect(Chef).to receive(:set_resource_priority_array).with(
+      expect(Chef.resource_priority_map).to receive(:set).with(
         :dinobot, Chef::Resource::Klz, { platform: ['autobots'] }
       )
       klz.provides :dinobot, platform: ['autobots']
     end
 
     it 'adds mappings for multiple platforms' do
-      expect(Chef).to receive(:set_resource_priority_array).with(
+      expect(Chef.resource_priority_map).to receive(:set).with(
         :energy, Chef::Resource::Klz, { platform: ['autobots', 'decepticons']}
       )
       klz.provides :energy, platform: ['autobots', 'decepticons']
     end
 
     it 'adds mappings for all platforms' do
-      expect(Chef).to receive(:set_resource_priority_array).with(
+      expect(Chef.resource_priority_map).to receive(:set).with(
         :tape_deck, Chef::Resource::Klz, {}
       )
       klz.provides :tape_deck

data/spec/unit/role_spec.rb

@@ -217,7 +217,7 @@ describe Chef::Role do
 
     end
 
-    include_examples "to_json equalivent to Chef::JSONCompat.to_json" do
+    include_examples "to_json equivalent to Chef::JSONCompat.to_json" do
       let(:jsonable) { @role }
     end
   end

data/spec/unit/run_list_spec.rb

@@ -307,7 +307,7 @@ describe Chef::RunList do
       expect(Chef::JSONCompat.to_json(@run_list)).to eq(Chef::JSONCompat.to_json(["recipe[nagios::client]", "role[production]", "recipe[apache2]"]))
     end
 
-    include_examples "to_json equalivent to Chef::JSONCompat.to_json" do
+    include_examples "to_json equivalent to Chef::JSONCompat.to_json" do
       let(:jsonable) { @run_list }
     end
 

data/spec/unit/runner_spec.rb

@@ -273,8 +273,8 @@ describe Chef::Runner do
 
       expected_message =<<-E
 Multiple failures occurred:
-* FailureProvider::ChefClientFail occurred in delayed notification: failure_resource[explode] (dynamically defined) had an error: FailureProvider::ChefClientFail: chef had an error of some sort
-* FailureProvider::ChefClientFail occurred in delayed notification: failure_resource[explode again] (dynamically defined) had an error: FailureProvider::ChefClientFail: chef had an error of some sort
+* FailureProvider::ChefClientFail occurred in delayed notification: [explode] (dynamically defined) had an error: FailureProvider::ChefClientFail: chef had an error of some sort
+* FailureProvider::ChefClientFail occurred in delayed notification: [explode again] (dynamically defined) had an error: FailureProvider::ChefClientFail: chef had an error of some sort
       E
       expect(exception.message).to eq(expected_message)
 

data/spec/unit/user_spec.rb

@@ -244,7 +244,7 @@ describe Chef::User do
       expect(@json).not_to include("password")
     end
 
-    include_examples "to_json equalivent to Chef::JSONCompat.to_json" do
+    include_examples "to_json equivalent to Chef::JSONCompat.to_json" do
       let(:jsonable) { @user }
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef
 version: !ruby/object:Gem::Version
-  version: 12.4.0.rc.2
+  version: 12.4.0
 platform: universal-mingw32
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-10 00:00:00.000000000 Z
+date: 2015-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-config
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 12.4.0.rc.2
+        version: 12.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 12.4.0.rc.2
+        version: 12.4.0
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
   requirement: !ruby/object:Gem::Requirement
@@ -744,6 +744,7 @@ files:
 - distro/common/markdown/man8/chef-server.mkd
 - distro/common/markdown/man8/chef-solo.mkd
 - distro/common/markdown/man8/chef-solr.mkd
+- distro/powershell/chef/chef.psm1
 - ext/win32-eventlog/Rakefile
 - ext/win32-eventlog/chef-log.man
 - lib/chef.rb
@@ -1134,6 +1135,7 @@ files:
 - lib/chef/org.rb
 - lib/chef/osc_user.rb
 - lib/chef/platform.rb
+- lib/chef/platform/priority_map.rb
 - lib/chef/platform/provider_mapping.rb
 - lib/chef/platform/provider_priority_map.rb
 - lib/chef/platform/query_helpers.rb
@@ -1826,7 +1828,6 @@ files:
 - spec/support/mock/constant.rb
 - spec/support/mock/platform.rb
 - spec/support/pedant/Gemfile
-- spec/support/pedant/Gemfile.lock
 - spec/support/pedant/pedant_config.rb
 - spec/support/pedant/run_pedant.rb
 - spec/support/pedant/stickywicket.pem
@@ -2268,6 +2269,7 @@ files:
 - spec/unit/resource_collection_spec.rb
 - spec/unit/resource_definition_spec.rb
 - spec/unit/resource_reporter_spec.rb
+- spec/unit/resource_resolver_spec.rb
 - spec/unit/resource_spec.rb
 - spec/unit/rest/auth_credentials_spec.rb
 - spec/unit/rest_spec.rb
@@ -2325,12 +2327,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: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: A systems integration framework, built to bring the benefits of configuration

data/spec/support/pedant/Gemfile.lock

@@ -1,67 +0,0 @@
-GIT
-  remote: git://github.com/opscode/chef-pedant.git
-  revision: ddb71c24b33340c3f61fa7df7bc9adf85275d229
-  ref: server-cli-option
-  specs:
-    chef-pedant (1.0.30)
-      activesupport (~> 3.2.8)
-      erubis (~> 2.7.0)
-      mixlib-authentication (~> 1.3.0)
-      mixlib-config (~> 2.0)
-      mixlib-shellout (>= 1.1)
-      net-http-spy (~> 0.2.1)
-      rest-client (>= 1.6.7)
-      rspec (~> 2.11)
-      rspec-rerun (= 0.1.1)
-      rspec_junit_formatter (~> 0.1.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (3.2.21)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    builder (3.2.2)
-    diff-lcs (1.2.5)
-    domain_name (0.5.24)
-      unf (>= 0.0.5, < 1.0.0)
-    erubis (2.7.0)
-    http-cookie (1.0.2)
-      domain_name (~> 0.5)
-    i18n (0.7.0)
-    mime-types (2.5)
-    mixlib-authentication (1.3.0)
-      mixlib-log
-    mixlib-config (2.2.1)
-    mixlib-log (1.6.0)
-    mixlib-shellout (2.1.0)
-    multi_json (1.11.0)
-    net-http-spy (0.2.1)
-    netrc (0.10.3)
-    rest-client (1.8.0)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
-    rspec (2.99.0)
-      rspec-core (~> 2.99.0)
-      rspec-expectations (~> 2.99.0)
-      rspec-mocks (~> 2.99.0)
-    rspec-core (2.99.2)
-    rspec-expectations (2.99.2)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.99.3)
-    rspec-rerun (0.1.1)
-      rspec (>= 2.11.0)
-    rspec_junit_formatter (0.1.6)
-      builder
-      rspec (~> 2.0)
-      rspec-core (!= 2.12.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  chef-pedant!