chef 12.6.0 → 12.7.2

data/spec/support/shared/functional/securable_resource_with_reporting.rb

@@ -1,5 +1,5 @@
 
-require 'functional/resource/base'
+require "functional/resource/base"
 
 ALL_EXPANDED_PERMISSIONS = ["generic read",
                             "generic write",
@@ -21,7 +21,6 @@ ALL_EXPANDED_PERMISSIONS = ["generic read",
                             "read attributes",
                             "write attributes"]
 
-
 shared_examples_for "a securable resource with reporting" do
 
   include_context "diff disabled"
@@ -76,9 +75,9 @@ shared_examples_for "a securable resource with reporting" do
         # TODO/bug: duplicated from the "securable resource" tests
 
         if ohai[:platform] == "aix"
-          let(:expected_user_name) { 'guest' }
+          let(:expected_user_name) { "guest" }
         else
-          let(:expected_user_name) { 'nobody' }
+          let(:expected_user_name) { "nobody" }
         end
 
         before do
@@ -96,9 +95,9 @@ shared_examples_for "a securable resource with reporting" do
 
         # TODO: duplicated from "securable resource"
         if ohai[:platform] == "aix"
-          let(:expected_user_name) { 'guest' }
+          let(:expected_user_name) { "guest" }
         else
-          let(:expected_user_name) { 'nobody' }
+          let(:expected_user_name) { "nobody" }
         end
         let(:expected_uid) { Etc.getpwnam(expected_user_name).uid }
         let(:desired_gid) { 1337 }
@@ -273,7 +272,6 @@ shared_examples_for "a securable resource with reporting" do
       # Windows reporting data should look like this (+/- ish):
       # { "owner" => "bob", "checksum" => "ffff", "access control" => { "bob" => { "permissions" => ["perm1", "perm2", ...], "flags" => [] }}}
 
-
       before do
         resource.action(:create)
       end
@@ -293,17 +291,16 @@ shared_examples_for "a securable resource with reporting" do
           resource.run_action(:create)
           # TODO: most stable way to specify?
           expect(resource.owner).to eq(etc.getpwuid(process.uid).name)
-          expect(resource.state[:expanded_rights]).to eq({ "CURRENTUSER" => { "permissions" => ALL_EXPANDED_PERMISSIONS, "flags" => [] }})
+          expect(resource.state[:expanded_rights]).to eq({ "CURRENTUSER" => { "permissions" => ALL_EXPANDED_PERMISSIONS, "flags" => [] } })
           expect(resource.state[:expanded_deny_rights]).to eq({})
           expect(resource.state[:inherits]).to be_truthy
         end
       end
 
-
-      context "and owner is specified with a string (username) in new_resource"  do
+      context "and owner is specified with a string (username) in new_resource" do
 
         # TODO/bug: duplicated from the "securable resource" tests
-        let(:expected_user_name) { 'Guest' }
+        let(:expected_user_name) { "Guest" }
 
         before do
           resource.owner(expected_user_name)
@@ -392,7 +389,6 @@ shared_examples_for "a securable resource with reporting" do
         end
       end
 
-
     end
   end
 end

data/spec/support/shared/functional/win32_service.rb

@@ -1,5 +1,5 @@
 
-require 'chef/application/windows_service_manager'
+require "chef/application/windows_service_manager"
 
 shared_context "using Win32::Service" do
   # Some helper methods.
@@ -35,10 +35,8 @@ shared_context "using Win32::Service" do
     if File.exists?(test_service_file)
       File.delete(test_service_file)
     end
-
   end
 
-
   # Definition for the test-service
 
   let(:test_service) {
@@ -46,8 +44,8 @@ shared_context "using Win32::Service" do
       :service_name => "spec-service",
       :service_display_name => "Spec Test Service",
       :service_description => "Service for testing Chef::Application::WindowsServiceManager.",
-      :service_file_path => File.expand_path(File.join(File.dirname(__FILE__), '../../platforms/win32/spec_service.rb')),
-      :delayed_start => true
+      :service_file_path => File.expand_path(File.join(File.dirname(__FILE__), "../../platforms/win32/spec_service.rb")),
+      :delayed_start => true,
     }
   }
 

data/spec/support/shared/functional/windows_script.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Serdar Sutay (<serdar@opscode.com>)
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Author:: Serdar Sutay (<serdar@chef.io>)
+# Copyright:: Copyright 2013-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,7 +19,7 @@
 # Shared context used by both Powershell and Batch script provider
 # tests.
 
-require 'chef/platform/query_helpers'
+require "chef/platform/query_helpers"
 
 shared_context Chef::Resource::WindowsScript do
   before(:all) do
@@ -27,7 +27,7 @@ shared_context Chef::Resource::WindowsScript do
     @ohai_reader.all_plugins(["platform", "kernel"])
 
     new_node = Chef::Node.new
-    new_node.consume_external_attrs(@ohai_reader.data,{})
+    new_node.consume_external_attrs(@ohai_reader.data, {})
 
     events = Chef::EventDispatch::Dispatcher.new
 
@@ -56,11 +56,11 @@ shared_context Chef::Resource::WindowsScript do
         if resource_architecture
           expected_architecture = resource_architecture
         else
-          expected_architecture = @ohai_reader.data['kernel']['machine'].to_sym
+          expected_architecture = @ohai_reader.data["kernel"]["machine"].to_sym
         end
       end
       let(:expected_architecture_output) do
-        expected_architecture == :i386 ? 'X86' : 'AMD64'
+        expected_architecture == :i386 ? "X86" : "AMD64"
       end
       let(:guard_script_suffix) do
         "guard"
@@ -99,7 +99,7 @@ shared_context Chef::Resource::WindowsScript do
         it "executes a 64-bit guard", :windows64_only do
           resource.only_if resource_guard_command, :architecture => guard_architecture
           resource.run_action(:run)
-          expect(get_guard_process_architecture).to eq('amd64')
+          expect(get_guard_process_architecture).to eq("amd64")
         end
       end
 
@@ -108,7 +108,7 @@ shared_context Chef::Resource::WindowsScript do
         it "executes a 32-bit guard" do
           resource.only_if resource_guard_command, :architecture => guard_architecture
           resource.run_action(:run)
-          expect(get_guard_process_architecture).to eq('x86')
+          expect(get_guard_process_architecture).to eq("x86")
         end
       end
 
@@ -116,7 +116,7 @@ shared_context Chef::Resource::WindowsScript do
         let (:guard_architecture) { :i386 }
         it "raises an error" do
           resource.only_if resource_guard_command, :architecture => guard_architecture
-          expect{ resource.run_action(:run) }.to raise_error(
+          expect { resource.run_action(:run) }.to raise_error(
             Chef::Exceptions::Win32ArchitectureIncorrect,
             /cannot execute script with requested architecture 'i386' on Windows Nano Server/)
         end
@@ -138,8 +138,8 @@ shared_context Chef::Resource::WindowsScript do
       before(:each) do
         @dir = Dir.mktmpdir("Jerry Smith")
         @original_env = ENV.to_hash.dup
-        ENV.delete('TMP')
-        ENV['TMP'] = @dir
+        ENV.delete("TMP")
+        ENV["TMP"] = @dir
       end
 
       after(:each) do
@@ -183,7 +183,7 @@ shared_context Chef::Resource::WindowsScript do
     end
   end
 
-  def get_windows_script_output(suffix = '')
+  def get_windows_script_output(suffix = "")
     File.read("#{script_output_path}#{suffix}")
   end
 
@@ -195,7 +195,7 @@ shared_context Chef::Resource::WindowsScript do
     get_process_architecture(guard_script_suffix)
   end
 
-  def get_process_architecture(suffix = '')
+  def get_process_architecture(suffix = "")
     get_windows_script_output(suffix).strip.downcase
   end
 

data/spec/support/shared/integration/app_server_support.rb

@@ -1,7 +1,7 @@
 #
-# Author:: John Keiser (<jkeiser@opscode.com>)
-# Author:: Ho-Sheng Hsiao (<hosh@opscode.com>)
-# Copyright:: Copyright (c) 2012, 2013 Opscode, Inc.
+# Author:: John Keiser (<jkeiser@chef.io>)
+# Author:: Ho-Sheng Hsiao (<hosh@chef.io>)
+# Copyright:: Copyright 2012-2016, 2013-2015 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,8 +17,8 @@
 # limitations under the License.
 #
 
-require 'rack'
-require 'stringio'
+require "rack"
+require "stringio"
 
 module AppServerSupport
   def start_app_server(app, port)
@@ -27,12 +27,12 @@ module AppServerSupport
       Rack::Handler::WEBrick.run(app,
         :Port => 9018,
         :AccessLog => [],
-        :Logger => WEBrick::Log::new(StringIO.new, 7)
+        :Logger => WEBrick::Log::new(StringIO.new, 7),
       ) do |found_server|
         server = found_server
       end
     end
-    Timeout::timeout(5) do
+    Timeout::timeout(30) do
       until server && server.status == :Running
         sleep(0.01)
       end

data/spec/support/shared/integration/integration_helper.rb

@@ -1,7 +1,7 @@
 #
-# Author:: John Keiser (<jkeiser@opscode.com>)
-# Author:: Ho-Sheng Hsiao (<hosh@opscode.com>)
-# Copyright:: Copyright (c) 2012, 2013 Opscode, Inc.
+# Author:: John Keiser (<jkeiser@chef.io>)
+# Author:: Ho-Sheng Hsiao (<hosh@chef.io>)
+# Copyright:: Copyright 2012-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,15 +17,15 @@
 # limitations under the License.
 #
 
-require 'tmpdir'
-require 'fileutils'
-require 'chef/config'
-require 'chef/json_compat'
-require 'chef/server_api'
-require 'support/shared/integration/knife_support'
-require 'support/shared/integration/app_server_support'
-require 'cheffish/rspec/chef_run_support'
-require 'spec_helper'
+require "tmpdir"
+require "fileutils"
+require "chef/config"
+require "chef/json_compat"
+require "chef/server_api"
+require "support/shared/integration/knife_support"
+require "support/shared/integration/app_server_support"
+require "cheffish/rspec/chef_run_support"
+require "spec_helper"
 
 module Cheffish
   class BasicChefClient
@@ -75,8 +75,8 @@ module IntegrationSupport
   def file(relative_path, contents)
     filename = path_to(relative_path)
     dir = File.dirname(filename)
-    FileUtils.mkdir_p(dir) unless dir == '.'
-    File.open(filename, 'w') do |file|
+    FileUtils.mkdir_p(dir) unless dir == "."
+    File.open(filename, "w") do |file|
       raw = case contents
             when Hash, Array
               Chef::JSONCompat.to_json_pretty(contents)
@@ -90,7 +90,7 @@ module IntegrationSupport
   def symlink(relative_path, relative_dest)
     filename = path_to(relative_path)
     dir = File.dirname(filename)
-    FileUtils.mkdir_p(dir) unless dir == '.'
+    FileUtils.mkdir_p(dir) unless dir == "."
     dest_filename = path_to(relative_dest)
     File.symlink(dest_filename, filename)
   end
@@ -99,7 +99,7 @@ module IntegrationSupport
     File.expand_path(relative_path, (@parent_path || @repository_dir))
   end
 
-  def cb_metadata(name, version, extra_text="")
+  def cb_metadata(name, version, extra_text = "")
     "name #{name.inspect}; version #{version.inspect}#{extra_text}"
   end
 
@@ -111,9 +111,9 @@ module IntegrationSupport
   RSpec.shared_context "with a chef repo" do
     before :each do
       raise "Can only create one directory per test" if @repository_dir
-      @repository_dir = Dir.mktmpdir('chef_repo')
+      @repository_dir = Dir.mktmpdir("chef_repo")
       Chef::Config.chef_repo_path = @repository_dir
-      %w(client cookbook data_bag environment node role user).each do |object_name|
+      %w{client cookbook data_bag environment node role user}.each do |object_name|
         Chef::Config.delete("#{object_name}_path".to_sym)
       end
     end
@@ -121,14 +121,14 @@ module IntegrationSupport
     after :each do
       if @repository_dir
         begin
-          %w(client cookbook data_bag environment node role user).each do |object_name|
+          %w{client cookbook data_bag environment node role user}.each do |object_name|
             Chef::Config.delete("#{object_name}_path".to_sym)
           end
           Chef::Config.delete(:chef_repo_path)
           # TODO: "force" actually means "silence all exceptions". this
           # silences a weird permissions error on Windows that we should track
           # down, but for now there's no reason for it to blow up our CI.
-          FileUtils.remove_entry_secure(@repository_dir, force=Chef::Platform.windows?)
+          FileUtils.remove_entry_secure(@repository_dir, force = Chef::Platform.windows?)
         ensure
           @repository_dir = nil
         end
@@ -140,7 +140,7 @@ module IntegrationSupport
 
   # Versioned cookbooks
 
-  RSpec.shared_context 'with versioned cookbooks', :versioned_cookbooks => true do
+  RSpec.shared_context "with versioned cookbooks", :versioned_cookbooks => true do
     before(:each) { Chef::Config[:versioned_cookbooks] = true }
     after(:each)  { Chef::Config.delete(:versioned_cookbooks) }
   end

data/spec/support/shared/integration/knife_support.rb

@@ -1,6 +1,6 @@
 #
-# Author:: John Keiser (<jkeiser@opscode.com>)
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Author:: John Keiser (<jkeiser@chef.io>)
+# Copyright:: Copyright 2013-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,14 +15,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'chef/config'
-require 'chef/knife'
-require 'chef/application/knife'
-require 'logger'
-require 'chef/log'
+require "chef/config"
+require "chef/knife"
+require "chef/application/knife"
+require "logger"
+require "chef/log"
 
 module KnifeSupport
-  DEBUG = ENV['DEBUG']
+  DEBUG = ENV["DEBUG"]
   def knife(*args, &block)
     # Allow knife('role from file roles/blah.json') rather than requiring the
     # arguments to be split like knife('role', 'from', 'file', 'roles/blah.json')
@@ -37,10 +37,10 @@ module KnifeSupport
     Chef::Config[:concurrency] = 1
 
     # Work on machines where we can't access /var
-    checksums_cache_dir = Dir.mktmpdir('checksums') do |checksums_cache_dir|
+    checksums_cache_dir = Dir.mktmpdir("checksums") do |checksums_cache_dir|
       Chef::Config[:cache_options] = {
         :path => checksums_cache_dir,
-        :skip_expires => true
+        :skip_expires => true,
       }
 
       # This is Chef::Knife.run without load_commands--we'll load stuff
@@ -146,11 +146,11 @@ module KnifeSupport
     private
 
     def should_result_in(expected)
-      expected[:stdout] = '' if !expected[:stdout]
-      expected[:stderr] = '' if !expected[:stderr]
+      expected[:stdout] = "" if !expected[:stdout]
+      expected[:stderr] = "" if !expected[:stderr]
       expected[:exit_code] = 0 if !expected[:exit_code]
       # TODO make this go away
-      stderr_actual = @stderr.sub(/^WARNING: No knife configuration file found\n/, '')
+      stderr_actual = @stderr.sub(/^WARNING: No knife configuration file found\n/, "")
 
       if expected[:stderr].is_a?(Regexp)
         expect(stderr_actual).to match(expected[:stderr])

data/spec/support/shared/matchers/exit_with_code.rb

@@ -1,4 +1,4 @@
-require 'rspec/expectations'
+require "rspec/expectations"
 
 # Lifted from http://stackoverflow.com/questions/1480537/how-can-i-validate-exits-and-aborts-in-rspec
 RSpec::Matchers.define :exit_with_code do |exp_code|
@@ -14,7 +14,7 @@ RSpec::Matchers.define :exit_with_code do |exp_code|
 
   failure_message do |block|
     "expected block to call exit(#{exp_code}) but exit" +
-        (actual.nil? ? " not called" : "(#{actual}) was called")
+      (actual.nil? ? " not called" : "(#{actual}) was called")
   end
 
   failure_message_when_negated do |block|

data/spec/support/shared/matchers/match_environment_variable.rb

@@ -1,6 +1,6 @@
 
-require 'rspec/expectations'
-require 'spec/support/platform_helpers'
+require "rspec/expectations"
+require "spec/support/platform_helpers"
 
 RSpec::Matchers.define :match_environment_variable do |varname|
   match do |actual|

data/spec/support/shared/unit/api_error_inspector.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Daniel DeLeo (<dan@opscode.com>)
-# Copyright:: Copyright (c) 2012 Opscode, Inc.
+# Author:: Daniel DeLeo (<dan@chef.io>)
+# Copyright:: Copyright 2012-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,8 +16,6 @@
 # limitations under the License.
 #
 
-
-
 # == API Error Inspector Examples
 # These tests are work in progress. They exercise the code enough to ensure it
 # runs without error, but don't make assertions about the output. This is
@@ -34,7 +32,7 @@ shared_examples_for "an api error inspector" do
       :validation_key => "/etc/chef/testorg-validator.pem",
       :chef_server_url => "https://chef-api.example.com",
       :node_name => "testnode-name",
-      :client_key => "/etc/chef/client.pem"
+      :client_key => "/etc/chef/client.pem",
     }
     @description = Chef::Formatters::ErrorDescription.new("Error registering the node:")
     @outputter = Chef::Formatters::IndentableOutputStream.new(StringIO.new, STDERR)

data/spec/support/shared/unit/api_versioning.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Tyler Cloke (<tyler@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");
@@ -19,7 +19,7 @@
 require "chef/exceptions"
 
 shared_examples_for "version handling" do
-  let(:response_406) { OpenStruct.new(:code => '406') }
+  let(:response_406) { OpenStruct.new(:code => "406") }
   let(:exception_406) { Net::HTTPServerException.new("406 Not Acceptable", response_406) }
 
   before do
@@ -32,13 +32,13 @@ shared_examples_for "version handling" do
     end
 
     it "raises the original exception" do
-      expect{ object.send(method) }.to raise_error(exception_406)
+      expect { object.send(method) }.to raise_error(exception_406)
     end
   end # when the server does not support the min or max server API version that Chef::UserV1 supports
 end # version handling
 
 shared_examples_for "user and client reregister" do
-  let(:response_406) { OpenStruct.new(:code => '406') }
+  let(:response_406) { OpenStruct.new(:code => "406") }
   let(:exception_406) { Net::HTTPServerException.new("406 Not Acceptable", response_406) }
   let(:generic_exception) { Exception.new }
   let(:min_version) { "2" }
@@ -47,7 +47,7 @@ shared_examples_for "user and client reregister" do
     {
       "min_version" => min_version,
       "max_version" => max_version,
-      "request_version" => "30"
+      "request_version" => "30",
     }
   }
 
@@ -55,12 +55,12 @@ shared_examples_for "user and client reregister" do
     context "when the exception is 406 and returns x-ops-server-api-version header" do
       before do
         allow(rest_v0).to receive(:put).and_raise(exception_406)
-        allow(response_406).to receive(:[]).with('x-ops-server-api-version').and_return(Chef::JSONCompat.to_json(return_hash_406))
+        allow(response_406).to receive(:[]).with("x-ops-server-api-version").and_return(Chef::JSONCompat.to_json(return_hash_406))
       end
 
       it "raises an error about only V0 being supported" do
         expect(object).to receive(:reregister_only_v0_supported_error_msg).with(max_version, min_version)
-        expect{ object.reregister }.to raise_error(Chef::Exceptions::OnlyApiVersion0SupportedForAction)
+        expect { object.reregister }.to raise_error(Chef::Exceptions::OnlyApiVersion0SupportedForAction)
       end
 
     end
@@ -70,7 +70,7 @@ shared_examples_for "user and client reregister" do
       end
 
       it "raises the original error" do
-        expect{ object.reregister }.to raise_error(generic_exception)
+        expect { object.reregister }.to raise_error(generic_exception)
       end
     end
   end