chef 12.6.0 → 12.7.2

data/spec/unit/policy_builder/policyfile_spec.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Daniel DeLeo (<dan@getchef.com>)
-# Copyright:: Copyright 2014 Chef Software, Inc.
+# Author:: Daniel DeLeo (<dan@chef.io>)
+# Copyright:: Copyright 2014-2016, Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,14 +16,14 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'chef/policy_builder'
+require "spec_helper"
+require "chef/policy_builder"
 
 describe Chef::PolicyBuilder::Policyfile do
 
   let(:node_name) { "joe_node" }
-  let(:ohai_data) { {"platform" => "ubuntu", "platform_version" => "13.04", "fqdn" => "joenode.example.com"} }
-  let(:json_attribs) { {"custom_attr" => "custom_attr_value"} }
+  let(:ohai_data) { { "platform" => "ubuntu", "platform_version" => "13.04", "fqdn" => "joenode.example.com" } }
+  let(:json_attribs) { { "custom_attr" => "custom_attr_value" } }
   let(:override_runlist) { nil }
   let(:events) { Chef::EventDispatch::Dispatcher.new }
   let(:policy_builder) { Chef::PolicyBuilder::Policyfile.new(node_name, ohai_data, json_attribs, override_runlist, events) }
@@ -40,11 +40,10 @@ describe Chef::PolicyBuilder::Policyfile do
     major = sha1_id[0...14]
     minor = sha1_id[14...28]
     patch = sha1_id[28..40]
-    decimal_integers =[major, minor, patch].map {|hex| hex.to_i(16) }
+    decimal_integers = [major, minor, patch].map { |hex| hex.to_i(16) }
     decimal_integers.join(".")
   end
 
-
   let(:example1_lock_data) do
     # based on https://github.com/danielsdeleo/chef-workflow2-prototype/blob/master/skeletons/basic_policy/Policyfile.lock.json
     {
@@ -53,11 +52,11 @@ describe Chef::PolicyBuilder::Policyfile do
       # NOTE: for compatibility mode we include the dotted id in the policyfile to enhance discoverability.
       "dotted_decimal_identifier" => id_to_dotted("168d2102fb11c9617cd8a981166c8adc30a6e915"),
       "source" => { "path" => "./cookbooks/demo" },
-      "scm_identifier"=> {
-        "vcs"=> "git",
-        "rev_id"=> "9d5b09026470c322c3cb5ca8a4157c4d2f16cef3",
-        "remote"=> nil
-      }
+      "scm_identifier" => {
+        "vcs" => "git",
+        "rev_id" => "9d5b09026470c322c3cb5ca8a4157c4d2f16cef3",
+        "remote" => nil,
+      },
     }
   end
 
@@ -67,12 +66,12 @@ describe Chef::PolicyBuilder::Policyfile do
       "version" => "4.2.0",
       # NOTE: for compatibility mode we include the dotted id in the policyfile to enhance discoverability.
       "dotted_decimal_identifier" => id_to_dotted("feab40e1fca77c7360ccca1481bb8ba5f919ce3a"),
-      "source" => { "api" => "https://community.getchef.com/api/v1/cookbooks/example2" }
+      "source" => { "api" => "https://community.getchef.com/api/v1/cookbooks/example2" },
     }
   end
 
-  let(:policyfile_default_attributes) { {"policyfile_default_attr" => "policyfile_default_value"} }
-  let(:policyfile_override_attributes) { {"policyfile_override_attr" => "policyfile_override_value"} }
+  let(:policyfile_default_attributes) { { "policyfile_default_attr" => "policyfile_default_value" } }
+  let(:policyfile_override_attributes) { { "policyfile_override_attr" => "policyfile_override_value" } }
 
   let(:policyfile_run_list) { ["recipe[example1::default]", "recipe[example2::server]"] }
 
@@ -85,11 +84,11 @@ describe Chef::PolicyBuilder::Policyfile do
 
       "cookbook_locks" => {
         "example1" => example1_lock_data,
-        "example2" => example2_lock_data
+        "example2" => example2_lock_data,
       },
 
       "default_attributes" => policyfile_default_attributes,
-      "override_attributes" => policyfile_override_attributes
+      "override_attributes" => policyfile_override_attributes,
     }
   end
 
@@ -98,10 +97,10 @@ describe Chef::PolicyBuilder::Policyfile do
   let(:err_namespace) { Chef::PolicyBuilder::Policyfile }
 
   it "configures a Chef HTTP API client" do
-    http = double("Chef::REST")
+    http = double("Chef::ServerAPI")
     server_url = "https://api.opscode.com/organizations/example"
     Chef::Config[:chef_server_url] = server_url
-    expect(Chef::REST).to receive(:new).with(server_url).and_return(http)
+    expect(Chef::ServerAPI).to receive(:new).with(server_url).and_return(http)
     expect(policy_builder.http_api).to eq(http)
   end
 
@@ -132,7 +131,7 @@ describe Chef::PolicyBuilder::Policyfile do
     end
 
     context "when json_attribs contains a run_list" do
-      let(:json_attribs) { {"run_list" => []} }
+      let(:json_attribs) { { "run_list" => [] } }
 
       it "errors on create" do
         expect { initialize_pb }.to raise_error(err_namespace::UnsupportedFeature)
@@ -151,15 +150,15 @@ describe Chef::PolicyBuilder::Policyfile do
 
   describe "loading policy data" do
 
-    let(:http_api) { double("Chef::REST") }
+    let(:http_api) { double("Chef::ServerAPI") }
 
     let(:configured_environment) { nil }
 
     let(:override_runlist) { nil }
     let(:primary_runlist) { nil }
 
-    let(:original_default_attrs) { {"default_key" => "default_value"} }
-    let(:original_override_attrs) { {"override_key" => "override_value"} }
+    let(:original_default_attrs) { { "default_key" => "default_value" } }
+    let(:original_override_attrs) { { "override_key" => "override_value" } }
 
     let(:node) do
       node = Chef::Node.new
@@ -268,7 +267,6 @@ describe Chef::PolicyBuilder::Policyfile do
 
     end
 
-
     describe "building policy from the policyfile" do
 
       before do
@@ -286,7 +284,7 @@ describe Chef::PolicyBuilder::Policyfile do
       it "extracts the cookbooks and versions for display from the policyfile" do
         expected = [
           "example1::default@2.3.5 (168d210)",
-          "example2::server@4.2.0 (feab40e)"
+          "example2::server@4.2.0 (feab40e)",
         ]
 
         expect(policy_builder.run_list_with_versions_for_display).to eq(expected)
@@ -304,7 +302,6 @@ describe Chef::PolicyBuilder::Policyfile do
         expect(policy_builder.expand_run_list.roles).to eq([])
       end
 
-
       describe "validating the Policyfile.lock" do
 
         it "errors if the policyfile json contains any non-recipe items" do
@@ -357,7 +354,7 @@ describe Chef::PolicyBuilder::Policyfile do
             let(:json_attribs) do
               {
                 "policy_name" => "policy_name_from_node_json",
-                "policy_group" => "policy_group_from_node_json"
+                "policy_group" => "policy_group_from_node_json",
               }
             end
 
@@ -378,7 +375,7 @@ describe Chef::PolicyBuilder::Policyfile do
             let(:extra_chef_config) do
               {
                 policy_name: "policy_name_from_config",
-                policy_group: "policy_group_from_config"
+                policy_group: "policy_group_from_config",
               }
             end
 
@@ -419,7 +416,7 @@ describe Chef::PolicyBuilder::Policyfile do
             let(:extra_chef_config) do
               {
                 policy_name: "policy_name_from_config",
-                policy_group: "policy_group_from_config"
+                policy_group: "policy_group_from_config",
               }
             end
 
@@ -435,7 +432,7 @@ describe Chef::PolicyBuilder::Policyfile do
             let(:json_attribs) do
               {
                 "policy_name" => "policy_name_from_node_json",
-                "policy_group" => "policy_group_from_node_json"
+                "policy_group" => "policy_group_from_node_json",
               }
             end
 
@@ -447,7 +444,6 @@ describe Chef::PolicyBuilder::Policyfile do
               node
             end
 
-
             it "prefers the policy_name and policy_group from the node json" do
               expect(policy_builder.policy_name).to eq("policy_name_from_node_json")
               expect(policy_builder.policy_group).to eq("policy_group_from_node_json")
@@ -465,7 +461,7 @@ describe Chef::PolicyBuilder::Policyfile do
             let(:json_attribs) do
               {
                 "policy_name" => "policy_name_from_node_json",
-                "policy_group" => "policy_group_from_node_json"
+                "policy_group" => "policy_group_from_node_json",
               }
             end
 
@@ -480,7 +476,7 @@ describe Chef::PolicyBuilder::Policyfile do
             let(:extra_chef_config) do
               {
                 policy_name: "policy_name_from_config",
-                policy_group: "policy_group_from_config"
+                policy_group: "policy_group_from_config",
               }
             end
 
@@ -592,7 +588,6 @@ describe Chef::PolicyBuilder::Policyfile do
         end
       end
 
-
       describe "fetching the desired cookbook set" do
 
         let(:example1_cookbook_data) { double("CookbookVersion Hash for example1 cookbook") }
@@ -716,7 +711,6 @@ describe Chef::PolicyBuilder::Policyfile do
             include_examples "fetching cookbooks when they don't exist"
           end
 
-
           context "when the cookbooks exist on the server" do
 
             before do
@@ -735,7 +729,6 @@ describe Chef::PolicyBuilder::Policyfile do
 
           end
 
-
         end
 
       end

data/spec/unit/policy_builder_spec.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Daniel DeLeo (<dan@getchef.com>)
-# Copyright:: Copyright 2014 Chef Software, Inc.
+# Author:: Daniel DeLeo (<dan@chef.io>)
+# Copyright:: Copyright 2014-2016, Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,8 +16,8 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'chef/policy_builder'
+require "spec_helper"
+require "chef/policy_builder"
 
 describe Chef::PolicyBuilder do
 

data/spec/unit/property/state_spec.rb

@@ -1,4 +1,4 @@
-require 'support/shared/integration/integration_helper'
+require "support/shared/integration/integration_helper"
 
 describe "Chef::Resource#identity and #state" do
   include IntegrationSupport
@@ -26,15 +26,15 @@ describe "Chef::Resource#identity and #state" do
   end
 
   def self.english_join(values)
-    return '<nothing>' if values.size == 0
+    return "<nothing>" if values.size == 0
     return values[0].inspect if values.size == 1
     "#{values[0..-2].map { |v| v.inspect }.join(", ")} and #{values[-1].inspect}"
   end
 
   def self.with_property(*properties, &block)
-    tags_index = properties.find_index { |p| !p.is_a?(String)}
+    tags_index = properties.find_index { |p| !p.is_a?(String) }
     if tags_index
-      properties, tags = properties[0..tags_index-1], properties[tags_index..-1]
+      properties, tags = properties[0..tags_index - 1], properties[tags_index..-1]
     else
       tags = []
     end
@@ -55,8 +55,8 @@ describe "Chef::Resource#identity and #state" do
       it "name is the default identity" do
         expect(resource_class.identity_properties).to eq [ Chef::Resource.properties[:name] ]
         expect(Chef::Resource.properties[:name].identity?).to be_falsey
-        expect(resource.name).to eq 'blah'
-        expect(resource.identity).to eq 'blah'
+        expect(resource.name).to eq "blah"
+        expect(resource.identity).to eq "blah"
       end
 
       it "identity_properties :x changes the identity" do
@@ -65,11 +65,11 @@ describe "Chef::Resource#identity and #state" do
         expect(Chef::Resource.properties[:name].identity?).to be_falsey
         expect(resource_class.properties[:x].identity?).to be_truthy
 
-        expect(resource.x 'woo').to eq 'woo'
-        expect(resource.x).to eq 'woo'
+        expect(resource.x "woo").to eq "woo"
+        expect(resource.x).to eq "woo"
 
-        expect(resource.name).to eq 'blah'
-        expect(resource.identity).to eq 'woo'
+        expect(resource.name).to eq "blah"
+        expect(resource.identity).to eq "woo"
       end
 
       with_property ":y, identity: true" do
@@ -81,19 +81,19 @@ describe "Chef::Resource#identity and #state" do
           end
 
           it "only returns :x as identity" do
-            resource.x 'foo'
-            resource.y 'bar'
+            resource.x "foo"
+            resource.y "bar"
             expect(resource_class.identity_properties).to eq [ resource_class.properties[:x] ]
-            expect(resource.identity).to eq 'foo'
+            expect(resource.identity).to eq "foo"
           end
           it "does not flip y.desired_state off" do
-            resource.x 'foo'
-            resource.y 'bar'
+            resource.x "foo"
+            resource.y "bar"
             expect(resource_class.state_properties).to eq [
               resource_class.properties[:x],
-              resource_class.properties[:y]
+              resource_class.properties[:y],
             ]
-            expect(resource.state_for_resource_reporter).to eq(x: 'foo', y: 'bar')
+            expect(resource.state_for_resource_reporter).to eq(x: "foo", y: "bar")
           end
         end
       end
@@ -106,14 +106,14 @@ describe "Chef::Resource#identity and #state" do
           end
         end
         let(:subresource) do
-          subresource_class.new('sub')
+          subresource_class.new("sub")
         end
 
         it "name is the default identity on the subclass" do
           expect(subresource_class.identity_properties).to eq [ Chef::Resource.properties[:name] ]
           expect(Chef::Resource.properties[:name].identity?).to be_falsey
-          expect(subresource.name).to eq 'sub'
-          expect(subresource.identity).to eq 'sub'
+          expect(subresource.name).to eq "sub"
+          expect(subresource.identity).to eq "sub"
         end
 
         context "With identity_properties :x on the superclass" do
@@ -128,8 +128,8 @@ describe "Chef::Resource#identity and #state" do
             expect(Chef::Resource.properties[:name].identity?).to be_falsey
             expect(subresource_class.properties[:x].identity?).to be_truthy
 
-            subresource.x 'foo'
-            expect(subresource.identity).to eq 'foo'
+            subresource.x "foo"
+            expect(subresource.identity).to eq "foo"
           end
 
           context "With property :y, identity: true on the subclass" do
@@ -141,11 +141,11 @@ describe "Chef::Resource#identity and #state" do
             it "The subclass's identity includes both x and y" do
               expect(subresource_class.identity_properties).to eq [
                 subresource_class.properties[:x],
-                subresource_class.properties[:y]
+                subresource_class.properties[:y],
               ]
-              subresource.x 'foo'
-              subresource.y 'bar'
-              expect(subresource.identity).to eq(x: 'foo', y: 'bar')
+              subresource.x "foo"
+              subresource.y "bar"
+              expect(subresource.identity).to eq(x: "foo", y: "bar")
             end
           end
 
@@ -157,19 +157,19 @@ describe "Chef::Resource#identity and #state" do
                 end
               end
               it "y is part of state" do
-                subresource.x 'foo'
-                subresource.y 'bar'
-                expect(subresource.state_for_resource_reporter).to eq(x: 'foo', y: 'bar')
+                subresource.x "foo"
+                subresource.y "bar"
+                expect(subresource.state_for_resource_reporter).to eq(x: "foo", y: "bar")
                 expect(subresource_class.state_properties).to eq [
                   subresource_class.properties[:x],
-                  subresource_class.properties[:y]
+                  subresource_class.properties[:y],
                 ]
               end
               it "y is the identity" do
                 expect(subresource_class.identity_properties).to eq [ subresource_class.properties[:y] ]
-                subresource.x 'foo'
-                subresource.y 'bar'
-                expect(subresource.identity).to eq 'bar'
+                subresource.x "foo"
+                subresource.y "bar"
+                expect(subresource.identity).to eq "bar"
               end
               it "y still has validation" do
                 expect { subresource.y 12 }.to raise_error Chef::Exceptions::ValidationFailed
@@ -191,8 +191,8 @@ describe "Chef::Resource#identity and #state" do
     with_property ":x, desired_state: false" do
       it "identity_properties does not change desired_state" do
         resource_class.identity_properties :x
-        resource.x 'hi'
-        expect(resource.identity).to eq 'hi'
+        resource.x "hi"
+        expect(resource.identity).to eq "hi"
         expect(resource_class.properties[:x].desired_state?).to be_falsey
         expect(resource_class.state_properties).to eq []
         expect(resource.state_for_resource_reporter).to eq({})
@@ -203,10 +203,11 @@ describe "Chef::Resource#identity and #state" do
       before do
         resource_class.class_eval do
           def custom_property
-            @blarghle ? @blarghle*3 : nil
+            @blarghle ? @blarghle * 3 : nil
           end
+
           def custom_property=(x)
-            @blarghle = x*2
+            @blarghle = x * 2
           end
         end
       end
@@ -247,8 +248,8 @@ describe "Chef::Resource#identity and #state" do
     with_property ":x, identity: true" do
       it "name is only part of the identity if an identity attribute is defined" do
         expect(resource_class.identity_properties).to eq [ resource_class.properties[:x] ]
-        resource.x 'woo'
-        expect(resource.identity).to eq 'woo'
+        resource.x "woo"
+        expect(resource.identity).to eq "woo"
       end
     end
 
@@ -262,29 +263,29 @@ describe "Chef::Resource#identity and #state" do
         expect { resource_class.identity_attr }.to raise_error Chef::Exceptions::MultipleIdentityError
       end
       it "identity returns all identity values in a hash if multiple are defined" do
-        resource.x 'foo'
-        resource.y 'bar'
-        resource.z 'baz'
-        expect(resource.identity).to eq(x: 'foo', y: 'bar', z: 'baz')
+        resource.x "foo"
+        resource.y "bar"
+        resource.z "baz"
+        expect(resource.identity).to eq(x: "foo", y: "bar", z: "baz")
       end
       it "identity returns all values whether any value is set or not" do
-        expect(resource.identity).to eq(x: 'xxx', y: 'yyy', z: 'zzz')
+        expect(resource.identity).to eq(x: "xxx", y: "yyy", z: "zzz")
       end
       it "identity_properties wipes out any other identity attributes if multiple are defined" do
         resource_class.identity_properties :y
-        resource.x 'foo'
-        resource.y 'bar'
-        resource.z 'baz'
-        expect(resource.identity).to eq 'bar'
+        resource.x "foo"
+        resource.y "bar"
+        resource.z "baz"
+        expect(resource.identity).to eq "bar"
       end
     end
 
     with_property ":x, identity: true, name_property: true" do
       it "identity when x is not defined returns the value of x" do
-        expect(resource.identity).to eq 'blah'
+        expect(resource.identity).to eq "blah"
       end
       it "state when x is not defined returns the value of x" do
-        expect(resource.state_for_resource_reporter).to eq(x: 'blah')
+        expect(resource.state_for_resource_reporter).to eq(x: "blah")
       end
     end
   end
@@ -304,7 +305,7 @@ describe "Chef::Resource#identity and #state" do
         expect(resource_class.state_properties).to eq [
           resource_class.properties[:x],
           resource_class.properties[:y],
-          resource_class.properties[:z]
+          resource_class.properties[:z],
         ]
         expect(resource.state_for_resource_reporter).to eq(x: 1, y: 2, z: 3)
       end
@@ -323,7 +324,7 @@ describe "Chef::Resource#identity and #state" do
         resource.z 3
         expect(resource_class.state_properties).to eq [
           resource_class.properties[:x],
-          resource_class.properties[:z]
+          resource_class.properties[:z],
         ]
         expect(resource.state_for_resource_reporter).to eq(x: 1, z: 3)
       end
@@ -353,10 +354,11 @@ describe "Chef::Resource#identity and #state" do
       before do
         resource_class.class_eval do
           def x
-            @blah*3
+            @blah * 3
           end
+
           def x=(value)
-            @blah = value*2
+            @blah = value * 2
           end
         end
       end
@@ -397,7 +399,7 @@ describe "Chef::Resource#identity and #state" do
       end
       it "state_properties(:x) does not turn off validation" do
         resource_class.state_properties(:x)
-        expect { resource.x 'ouch' }.to raise_error Chef::Exceptions::ValidationFailed
+        expect { resource.x "ouch" }.to raise_error Chef::Exceptions::ValidationFailed
       end
       it "state_properties(:x) does not turn off identity" do
         resource_class.state_properties(:x)
@@ -459,7 +461,7 @@ describe "Chef::Resource#identity and #state" do
           end
         end
         let(:subresource) do
-          subresource_class.new('blah')
+          subresource_class.new("blah")
         end
 
         it "state_properties(:x) adds x to desired state" do