chef 12.6.0 → 12.7.2

data/spec/unit/mixin/shell_out_spec.rb

@@ -1,10 +1,10 @@
 #
-# Author:: Ho-Sheng Hsiao (hosh@opscode.com)
+# Author:: Ho-Sheng Hsiao (hosh@chef.io)
 # Code derived from spec/unit/mixin/command_spec.rb
 #
 # Original header:
 # Author:: Hongli Lai (hongli@phusion.nl)
-# Copyright:: Copyright (c) 2009 Phusion
+# Copyright:: Copyright 2009-2016, Phusion
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,7 +20,7 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
+require "spec_helper"
 
 describe Chef::Mixin::ShellOut do
   let(:shell_out_class) { Class.new { include Chef::Mixin::ShellOut } }
@@ -31,28 +31,28 @@ describe Chef::Mixin::ShellOut do
     let(:cmd) { "echo '#{rand(1000)}'" }
 
     let(:output) { StringIO.new }
-    let!(:capture_log_output) { Chef::Log.logger = Logger.new(output)  }
+    let!(:capture_log_output) { Chef::Log.logger = Logger.new(output) }
     let(:assume_deprecation_log_level) { allow(Chef::Log).to receive(:level).and_return(:warn) }
 
-    context 'without options' do
+    context "without options" do
       let(:command_args) { [ cmd ] }
 
-      it 'should not edit command args' do
+      it "should not edit command args" do
         is_expected.to eql(command_args)
       end
     end
 
-    context 'without deprecated options' do
+    context "without deprecated options" do
       let(:options) { { :environment => environment } }
-      let(:environment) { { 'LC_ALL' => 'C', 'LANG' => 'C', 'LANGUAGE' => 'C' } }
+      let(:environment) { { "LC_ALL" => "C", "LANG" => "C", "LANGUAGE" => "C" } }
 
-      it 'should not edit command args' do
+      it "should not edit command args" do
         is_expected.to eql(command_args)
       end
     end
 
     def self.should_emit_deprecation_warning_about(old_option, new_option)
-      it 'should emit a deprecation warning' do
+      it "should emit a deprecation warning" do
         assume_deprecation_log_level and capture_log_output
         subject
         expect(output.string).to match /DEPRECATION:/
@@ -61,22 +61,22 @@ describe Chef::Mixin::ShellOut do
       end
     end
 
-    context 'with :command_log_level option' do
+    context "with :command_log_level option" do
       let(:options) { { :command_log_level => command_log_level } }
       let(:command_log_level) { :warn }
 
-      it 'should convert :command_log_level to :log_level' do
+      it "should convert :command_log_level to :log_level" do
         is_expected.to eql [ cmd, { :log_level => command_log_level } ]
       end
 
       should_emit_deprecation_warning_about :command_log_level, :log_level
     end
 
-    context 'with :command_log_prepend option' do
+    context "with :command_log_prepend option" do
       let(:options) { { :command_log_prepend => command_log_prepend } }
-      let(:command_log_prepend) { 'PROVIDER:' }
+      let(:command_log_prepend) { "PROVIDER:" }
 
-      it 'should convert :command_log_prepend to :log_tag' do
+      it "should convert :command_log_prepend to :log_tag" do
         is_expected.to eql [ cmd, { :log_tag => command_log_prepend } ]
       end
 
@@ -84,7 +84,7 @@ describe Chef::Mixin::ShellOut do
     end
 
     context "with 'command_log_level' option" do
-      let(:options) { { 'command_log_level' => command_log_level } }
+      let(:options) { { "command_log_level" => command_log_level } }
       let(:command_log_level) { :warn }
 
       it "should convert 'command_log_level' to :log_level" do
@@ -95,8 +95,8 @@ describe Chef::Mixin::ShellOut do
     end
 
     context "with 'command_log_prepend' option" do
-      let(:options) { { 'command_log_prepend' => command_log_prepend } }
-      let(:command_log_prepend) { 'PROVIDER:' }
+      let(:options) { { "command_log_prepend" => command_log_prepend } }
+      let(:command_log_prepend) { "PROVIDER:" }
 
       it "should convert 'command_log_prepend' to :log_tag" do
         is_expected.to eql [ cmd, { :log_tag => command_log_prepend } ]
@@ -124,97 +124,97 @@ describe Chef::Mixin::ShellOut do
       describe "when the last argument is a Hash" do
         describe "and environment is an option" do
           it "should not change environment language settings when they are set to nil" do
-            options = { :environment => { 'LC_ALL' => nil, 'LANGUAGE' => nil, 'LANG' => nil } }
+            options = { :environment => { "LC_ALL" => nil, "LANGUAGE" => nil, "LANG" => nil } }
             expect(shell_out_obj).to receive(:shell_out_command).with(cmd, options).and_return(true)
             shell_out_obj.shell_out(cmd, options)
           end
 
           it "should not change environment language settings when they are set to non-nil" do
-            options = { :environment => { 'LC_ALL' => 'en_US.UTF-8', 'LANGUAGE' => 'en_US.UTF-8', 'LANG' => 'en_US.UTF-8' } }
+            options = { :environment => { "LC_ALL" => "en_US.UTF-8", "LANGUAGE" => "en_US.UTF-8", "LANG" => "en_US.UTF-8" } }
             expect(shell_out_obj).to receive(:shell_out_command).with(cmd, options).and_return(true)
             shell_out_obj.shell_out(cmd, options)
           end
 
           it "should set environment language settings to the configured internal locale when they are not present" do
-            options = { :environment => { 'HOME' => '/Users/morty' } }
+            options = { :environment => { "HOME" => "/Users/morty" } }
             expect(shell_out_obj).to receive(:shell_out_command).with(cmd, {
               :environment => {
-                'HOME'     => '/Users/morty',
-                'LC_ALL'   => Chef::Config[:internal_locale],
-                'LANG'     => Chef::Config[:internal_locale],
-                'LANGUAGE' => Chef::Config[:internal_locale],
-              },
-            }).and_return(true)
+                "HOME"     => "/Users/morty",
+                "LC_ALL"   => Chef::Config[:internal_locale],
+                "LANG"     => Chef::Config[:internal_locale],
+                "LANGUAGE" => Chef::Config[:internal_locale],
+              }
+            },).and_return(true)
             shell_out_obj.shell_out(cmd, options)
           end
 
           it "should not mutate the options hash when it adds language settings" do
-            options = { :environment => { 'HOME' => '/Users/morty' } }
+            options = { :environment => { "HOME" => "/Users/morty" } }
             expect(shell_out_obj).to receive(:shell_out_command).with(cmd, {
               :environment => {
-                'HOME'     => '/Users/morty',
-                'LC_ALL'   => Chef::Config[:internal_locale],
-                'LANG'     => Chef::Config[:internal_locale],
-                'LANGUAGE' => Chef::Config[:internal_locale],
-              },
-            }).and_return(true)
+                "HOME"     => "/Users/morty",
+                "LC_ALL"   => Chef::Config[:internal_locale],
+                "LANG"     => Chef::Config[:internal_locale],
+                "LANGUAGE" => Chef::Config[:internal_locale],
+              }
+            },).and_return(true)
             shell_out_obj.shell_out(cmd, options)
-            expect(options[:environment].has_key?('LC_ALL')).to be false
+            expect(options[:environment].has_key?("LC_ALL")).to be false
           end
         end
 
         describe "and env is an option" do
           it "should not change env when langauge options are set to nil" do
-            options = { :env => { 'LC_ALL' => nil, 'LANG' => nil, 'LANGUAGE' => nil } }
+            options = { :env => { "LC_ALL" => nil, "LANG" => nil, "LANGUAGE" => nil } }
             expect(shell_out_obj).to receive(:shell_out_command).with(cmd, options).and_return(true)
             shell_out_obj.shell_out(cmd, options)
           end
 
           it "should not change env when language options are set to non-nil" do
-            options = { :env => { 'LC_ALL' => 'de_DE.UTF-8', 'LANG' => 'de_DE.UTF-8', 'LANGUAGE' => 'de_DE.UTF-8' }}
+            options = { :env => { "LC_ALL" => "de_DE.UTF-8", "LANG" => "de_DE.UTF-8", "LANGUAGE" => "de_DE.UTF-8" } }
             expect(shell_out_obj).to receive(:shell_out_command).with(cmd, options).and_return(true)
             shell_out_obj.shell_out(cmd, options)
           end
 
           it "should set environment language settings to the configured internal locale when they are not present" do
-            options = { :env => { 'HOME' => '/Users/morty' } }
+            options = { :env => { "HOME" => "/Users/morty" } }
             expect(shell_out_obj).to receive(:shell_out_command).with(cmd, {
               :env => {
-                'HOME'     => '/Users/morty',
-                'LC_ALL'   => Chef::Config[:internal_locale],
-                'LANG'     => Chef::Config[:internal_locale],
-                'LANGUAGE' => Chef::Config[:internal_locale],
+                "HOME"     => "/Users/morty",
+                "LC_ALL"   => Chef::Config[:internal_locale],
+                "LANG"     => Chef::Config[:internal_locale],
+                "LANGUAGE" => Chef::Config[:internal_locale],
               }
-            }).and_return(true)
+            },).and_return(true)
             shell_out_obj.shell_out(cmd, options)
           end
 
           it "should not mutate the options hash when it adds language settings" do
-            options = { :env => { 'HOME' => '/Users/morty' } }
+            options = { :env => { "HOME" => "/Users/morty" } }
             expect(shell_out_obj).to receive(:shell_out_command).with(cmd, {
               :env => {
-                'HOME'     => '/Users/morty',
-                'LC_ALL'   => Chef::Config[:internal_locale],
-                'LANG'     => Chef::Config[:internal_locale],
-                'LANGUAGE' => Chef::Config[:internal_locale],
+                "HOME"     => "/Users/morty",
+                "LC_ALL"   => Chef::Config[:internal_locale],
+                "LANG"     => Chef::Config[:internal_locale],
+                "LANGUAGE" => Chef::Config[:internal_locale],
               }
-            }).and_return(true)
+            },).and_return(true)
             shell_out_obj.shell_out(cmd, options)
-            expect(options[:env].has_key?('LC_ALL')).to be false
+            expect(options[:env].has_key?("LC_ALL")).to be false
           end
         end
 
         describe "and no env/environment option is present" do
           it "should set environment language settings to the configured internal locale" do
-            options = { :user => 'morty' }
+            options = { :user => "morty" }
             expect(shell_out_obj).to receive(:shell_out_command).with(cmd, {
-              :user => 'morty',
+              :user => "morty",
               :environment => {
-                'LC_ALL'   => Chef::Config[:internal_locale],
-                'LANG'     => Chef::Config[:internal_locale],
-                'LANGUAGE' => Chef::Config[:internal_locale],
+                "LC_ALL"   => Chef::Config[:internal_locale],
+                "LANG"     => Chef::Config[:internal_locale],
+                "LANGUAGE" => Chef::Config[:internal_locale],
               },
-            }).and_return(true)
+            },).and_return(true)
             shell_out_obj.shell_out(cmd, options)
           end
         end
@@ -224,11 +224,11 @@ describe Chef::Mixin::ShellOut do
         it "should set environment language settings to the configured internal locale" do
           expect(shell_out_obj).to receive(:shell_out_command).with(cmd, {
             :environment => {
-              'LC_ALL'   => Chef::Config[:internal_locale],
-              'LANG'     => Chef::Config[:internal_locale],
-              'LANGUAGE' => Chef::Config[:internal_locale],
-            },
-          }).and_return(true)
+              "LC_ALL"   => Chef::Config[:internal_locale],
+              "LANG"     => Chef::Config[:internal_locale],
+              "LANGUAGE" => Chef::Config[:internal_locale],
+            }
+          },).and_return(true)
           shell_out_obj.shell_out(cmd)
         end
       end
@@ -240,19 +240,19 @@ describe Chef::Mixin::ShellOut do
       describe "when the last argument is a Hash" do
         describe "and environment is an option" do
           it "should not change environment['LC_ALL'] when set to nil" do
-            options = { :environment => { 'LC_ALL' => nil } }
+            options = { :environment => { "LC_ALL" => nil } }
             expect(shell_out_obj).to receive(:shell_out_command).with(cmd, options).and_return(true)
             shell_out_obj.shell_out_with_systems_locale(cmd, options)
           end
 
           it "should not change environment['LC_ALL'] when set to non-nil" do
-            options = { :environment => { 'LC_ALL' => 'en_US.UTF-8' } }
+            options = { :environment => { "LC_ALL" => "en_US.UTF-8" } }
             expect(shell_out_obj).to receive(:shell_out_command).with(cmd, options).and_return(true)
             shell_out_obj.shell_out_with_systems_locale(cmd, options)
           end
 
           it "should no longer set environment['LC_ALL'] to nil when 'LC_ALL' not present" do
-            options = { :environment => { 'HOME' => '/Users/morty' } }
+            options = { :environment => { "HOME" => "/Users/morty" } }
             expect(shell_out_obj).to receive(:shell_out_command).with(cmd, options).and_return(true)
             shell_out_obj.shell_out_with_systems_locale(cmd, options)
           end
@@ -260,19 +260,19 @@ describe Chef::Mixin::ShellOut do
 
         describe "and env is an option" do
           it "should not change env when set to nil" do
-            options = { :env => { 'LC_ALL' => nil } }
+            options = { :env => { "LC_ALL" => nil } }
             expect(shell_out_obj).to receive(:shell_out_command).with(cmd, options).and_return(true)
             shell_out_obj.shell_out_with_systems_locale(cmd, options)
           end
 
           it "should not change env when set to non-nil" do
-            options = { :env => { 'LC_ALL' => 'en_US.UTF-8'}}
+            options = { :env => { "LC_ALL" => "en_US.UTF-8" } }
             expect(shell_out_obj).to receive(:shell_out_command).with(cmd, options).and_return(true)
             shell_out_obj.shell_out_with_systems_locale(cmd, options)
           end
 
           it "should no longer set env['LC_ALL'] to nil when 'LC_ALL' not present" do
-            options = { :env => { 'HOME' => '/Users/morty' } }
+            options = { :env => { "HOME" => "/Users/morty" } }
             expect(shell_out_obj).to receive(:shell_out_command).with(cmd, options).and_return(true)
             shell_out_obj.shell_out_with_systems_locale(cmd, options)
           end
@@ -280,7 +280,7 @@ describe Chef::Mixin::ShellOut do
 
         describe "and no env/environment option is present" do
           it "should no longer add environment option and set environment['LC_ALL'] to nil" do
-            options = { :user => 'morty' }
+            options = { :user => "morty" }
             expect(shell_out_obj).to receive(:shell_out_command).with(cmd, options).and_return(true)
             shell_out_obj.shell_out_with_systems_locale(cmd, options)
           end

data/spec/unit/mixin/subclass_directive_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2015 Chef Software, Inc.
+# Copyright:: Copyright 2015-2016, Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
+require "spec_helper"
 
 class SubclassDirectiveParent
   extend Chef::Mixin::SubclassDirective

data/spec/unit/mixin/template_spec.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Author:: Adam Jacob (<adam@chef.io>)
+# Copyright:: Copyright 2008-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,9 +16,9 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
+require "spec_helper"
 
-require 'cgi'
+require "cgi"
 describe Chef::Mixin::Template, "render_template" do
 
   let(:sep) { Chef::Platform.windows? ? "\r\n" : "\n" }
@@ -85,10 +85,10 @@ describe Chef::Mixin::Template, "render_template" do
       @events = Chef::EventDispatch::Dispatcher.new
       @run_context = Chef::RunContext.new(@node, @cookbook_collection, @events)
 
-      @rendered_file_location = Dir.tmpdir + '/openldap_stuff.conf'
+      @rendered_file_location = Dir.tmpdir + "/openldap_stuff.conf"
 
       @resource = Chef::Resource::Template.new(@rendered_file_location)
-      @resource.cookbook_name = 'openldap'
+      @resource.cookbook_name = "openldap"
       @current_resource = @resource.dup
 
       @content_provider = Chef::Provider::Template::Content.new(@resource, @current_resource, @run_context)
@@ -117,7 +117,7 @@ describe Chef::Mixin::Template, "render_template" do
     end
 
     it "should render partials from a different cookbook" do
-      @template_context[:template_finder] = Chef::Provider::TemplateFinder.new(@run_context, 'apache2', @node)
+      @template_context[:template_finder] = Chef::Provider::TemplateFinder.new(@run_context, "apache2", @node)
 
       output = @template_context.render_template_from_string("before {<%= render('test.erb', :cookbook => 'openldap').strip %>} after")
       expect(output).to eq("before {We could be diving for pearls!} after")
@@ -144,7 +144,7 @@ describe Chef::Mixin::Template, "render_template" do
     end
 
     it "should pass the original variables to partials" do
-      @template_context[:secret] = 'candy'
+      @template_context[:secret] = "candy"
 
       output = @template_context.render_template_from_string("before {<%= render 'openldap_variable_stuff.conf.erb' %>} after")
       output == "before {super secret is candy} after"
@@ -161,7 +161,7 @@ describe Chef::Mixin::Template, "render_template" do
     end
 
     it "should pass variables to partials even if they are named the same" do
-      @template_context[:secret] = 'one'
+      @template_context[:secret] = "one"
 
       output = @template_context.render_template_from_string("before {<%= render 'openldap_variable_stuff.conf.erb', :variables => {:secret => 'two' } %>} after <%= @secret %>")
       expect(output).to eq("before {super secret is two} after one")
@@ -172,7 +172,7 @@ describe Chef::Mixin::Template, "render_template" do
       expect(output).to eq("before {super secret is } after")
 
       output = @template_context.render_template_from_string("before {<%= render 'openldap_variable_stuff.conf.erb' %>} after")
-    expect(output).to eq("before {super secret is } after")
+      expect(output).to eq("before {super secret is } after")
     end
 
     it "should render nested partials" do
@@ -199,14 +199,17 @@ describe Chef::Mixin::Template, "render_template" do
         mod = Module.new do
           def render
           end
+
           def node
           end
+
           def render_template
           end
+
           def render_template_from_string
           end
         end
-        ['node', 'render', 'render_template', 'render_template_from_string'].each do |method_name|
+        ["node", "render", "render_template", "render_template_from_string"].each do |method_name|
           expect(Chef::Log).to receive(:warn).with(/^Core template method `#{method_name}' overridden by extension module/)
         end
         @template_context._extend_modules([mod])
@@ -225,7 +228,7 @@ describe Chef::Mixin::Template, "render_template" do
     end
 
     it "should raise an error if an attempt is made to access node but it is nil" do
-      expect {@context.render_template_from_string("<%= node %>") {|r| r}}.to raise_error(Chef::Mixin::Template::TemplateError)
+      expect { @context.render_template_from_string("<%= node %>") { |r| r } }.to raise_error(Chef::Mixin::Template::TemplateError)
     end
 
     describe "the raised TemplateError" do

data/spec/unit/mixin/unformatter_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Jay Mundrawala (<jdm@chef.io>)
-# Copyright:: Copyright (c) 2015 Chef Software
+# Copyright:: Copyright 2015-2016, Chef Software
 # 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/mixin/unformatter'
+require "spec_helper"
+require "chef/mixin/unformatter"
 
 class Chef::UnformatterTest
   include Chef::Mixin::Unformatter

data/spec/unit/mixin/uris_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Jay Mundrawala (<jdm@chef.io>)
-# Copyright:: Copyright (c) 2015 Chef Software, Inc.
+# Copyright:: Copyright 2015-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/mixin/uris'
+require "spec_helper"
+require "chef/mixin/uris"
 
 class Chef::UrisTest
   include Chef::Mixin::Uris
@@ -28,25 +28,25 @@ describe Chef::Mixin::Uris do
 
   describe "#uri_scheme?" do
     it "matches 'scheme://foo.com'" do
-      expect(uris.uri_scheme?('scheme://foo.com')).to eq(true)
+      expect(uris.uri_scheme?("scheme://foo.com")).to eq(true)
     end
 
     it "does not match 'c:/foo.com'" do
-      expect(uris.uri_scheme?('c:/foo.com')).to eq(false)
+      expect(uris.uri_scheme?("c:/foo.com")).to eq(false)
     end
 
     it "does not match '/usr/bin/foo.com'" do
-      expect(uris.uri_scheme?('/usr/bin/foo.com')).to eq(false)
+      expect(uris.uri_scheme?("/usr/bin/foo.com")).to eq(false)
     end
 
     it "does not match 'c:/foo.com://bar.com'" do
-      expect(uris.uri_scheme?('c:/foo.com://bar.com')).to eq(false)
+      expect(uris.uri_scheme?("c:/foo.com://bar.com")).to eq(false)
     end
   end
 
   describe "#as_uri" do
     it "parses a file scheme uri with spaces" do
-      expect{ uris.as_uri("file:///c:/foo bar.txt") }.not_to raise_exception
+      expect { uris.as_uri("file:///c:/foo bar.txt") }.not_to raise_exception
     end
 
     it "returns a URI object" do