chef 12.6.0-universal-mingw32 → 12.7.2-universal-mingw32

data/bin/chef-apply

@@ -3,7 +3,7 @@
 # ./chef-apply - Run a single chef recipe
 #
 # Author:: Bryan W. Berry (<bryan.berry@gmail.com>)
-# Copyright:: Copyright (c) 2012 Bryan W. Berry
+# Copyright:: Copyright 2012-2016, Bryan W. Berry
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,8 +18,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'rubygems'
+require "rubygems"
 $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
-require 'chef/application/apply'
+require "chef/application/apply"
 
 Chef::Application::Apply.new.run

data/bin/chef-client

@@ -2,8 +2,8 @@
 #
 # ./chef-client - Run the chef client
 #
-# Author:: AJ Christensen (<aj@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Author:: AJ Christensen (<aj@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");
@@ -18,9 +18,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'rubygems'
+require "rubygems"
 $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
-require 'chef'
-require 'chef/application/client'
+require "chef"
+require "chef/application/client"
 
 Chef::Application::Client.new.run

data/bin/chef-service-manager

@@ -2,8 +2,8 @@
 #
 # ./chef-service-manager - Control chef-service on Windows platforms.
 #
-# 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");
@@ -18,19 +18,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'rubygems'
+require "rubygems"
 $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
-require 'chef'
-require 'chef/application/windows_service_manager'
+require "chef"
+require "chef/application/windows_service_manager"
 
 if Chef::Platform.windows?
   chef_client_service = {
     :service_name => "chef-client",
     :service_display_name => "Chef Client Service",
     :service_description => "Runs Chef Client on regular, configurable intervals.",
-    :service_file_path => File.expand_path('../chef-windows-service', $PROGRAM_NAME),
+    :service_file_path => File.expand_path("../chef-windows-service", $PROGRAM_NAME),
     :delayed_start => true,
-    :dependencies => ['Winmgmt']
+    :dependencies => ["Winmgmt"],
   }
   Chef::Application::WindowsServiceManager.new(chef_client_service).run
 else

data/bin/chef-shell

@@ -25,7 +25,7 @@ end
 
 require "irb"
 require "irb/completion"
-require 'irb/ext/save-history'
+require "irb/ext/save-history"
 
 $:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "lib")))
 

data/bin/chef-solo

@@ -2,8 +2,8 @@
 #
 # ./chef-solo - Run the chef client, in stand-alone mode
 #
-# Author:: AJ Christensen (<aj@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Author:: AJ Christensen (<aj@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");
@@ -18,8 +18,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'rubygems'
+require "rubygems"
 $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
-require 'chef/application/solo'
+require "chef/application/solo"
 
 Chef::Application::Solo.new.run

data/bin/chef-windows-service

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Author:: Jay Mundrawala (<jdm@getchef.com>)
+# Author:: Jay Mundrawala (<jdm@chef.io>)
 #
 # Copyright:: 2014, Chef Software, Inc.
 #
@@ -19,14 +19,14 @@
 
 # Note:
 # The file is used by appbundler to generate a ruby file that
-# we can execute using the correct gems. The batch file we 
+# we can execute using the correct gems. The batch file we
 # generate will call that file, and will be registered as
 # a windows service.
 
-require 'rubygems'
+require "rubygems"
 $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
-require 'chef'
-require 'chef/application/windows_service'
+require "chef"
+require "chef/application/windows_service"
 
 if Chef::Platform.windows?
   Chef::Application::WindowsService.mainloop

data/bin/knife

@@ -2,8 +2,8 @@
 #
 # ./knife - Chef CLI interface
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2009 Opscode, Inc.
+# Author:: Adam Jacob (<adam@chef.io>)
+# Copyright:: Copyright 2009-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,9 +18,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'rubygems'
+require "rubygems"
 $:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "lib")))
-require 'chef/application/knife'
+require "chef/application/knife"
 
 Chef::Application::Knife.new.run
-

data/chef-windows.gemspec

@@ -6,6 +6,9 @@ gemspec.add_dependency "ffi", "~> 1.9"
 gemspec.add_dependency "win32-api", "~> 1.5.3"
 gemspec.add_dependency "win32-dir", "~> 0.5.0"
 gemspec.add_dependency "win32-event", "~> 0.6.1"
+# Hard pin on win32-eventlog until djberg96/win32-eventlog#20 is resolved.
+# win32-eventlog was stomping over the CreateEvent FFI bindings that
+# win32-service needed, causing the chef service to not run.
 gemspec.add_dependency "win32-eventlog", "0.6.3"
 gemspec.add_dependency "win32-mmap", "~> 0.4.1"
 gemspec.add_dependency "win32-mutex", "~> 0.4.2"
@@ -14,8 +17,8 @@ gemspec.add_dependency "win32-service", "~> 0.8.7"
 gemspec.add_dependency "windows-api", "~> 0.4.4"
 gemspec.add_dependency "wmi-lite", "~> 1.0"
 gemspec.extensions << "ext/win32-eventlog/Rakefile"
-gemspec.files += %w(ext/win32-eventlog/Rakefile ext/win32-eventlog/chef-log.man)
+gemspec.files += %w{ext/win32-eventlog/Rakefile ext/win32-eventlog/chef-log.man}
 
-gemspec.executables += %w( chef-service-manager chef-windows-service )
+gemspec.executables += %w{ chef-service-manager chef-windows-service }
 
 gemspec

data/chef.gemspec

@@ -1,8 +1,8 @@
-$:.unshift(File.dirname(__FILE__) + '/lib')
-require 'chef/version'
+$:.unshift(File.dirname(__FILE__) + "/lib")
+require "chef/version"
 
 Gem::Specification.new do |s|
-  s.name = 'chef'
+  s.name = "chef"
   s.version = Chef::VERSION
   s.platform = Gem::Platform::RUBY
   s.extra_rdoc_files = ["README.md", "CONTRIBUTING.md", "LICENSE" ]
@@ -19,40 +19,40 @@ Gem::Specification.new do |s|
 
   s.add_dependency "mixlib-cli", "~> 1.4"
   s.add_dependency "mixlib-log", "~> 1.3"
-  s.add_dependency "mixlib-authentication", "~> 1.3"
+  s.add_dependency "mixlib-authentication", "~> 1.4"
   s.add_dependency "mixlib-shellout", "~> 2.0"
   s.add_dependency "ohai", ">= 8.6.0.alpha.1", "< 9"
 
   s.add_dependency "ffi-yajl", "~> 2.2"
-  s.add_dependency "net-ssh", "~> 2.6"
+  s.add_dependency "net-ssh", ">= 2.9", "< 4.0"
   s.add_dependency "net-ssh-multi", "~> 1.1"
   s.add_dependency "highline", "~> 1.6", ">= 1.6.9"
   s.add_dependency "erubis", "~> 2.7"
   s.add_dependency "diff-lcs", "~> 1.2", ">= 1.2.4"
 
-  s.add_dependency "chef-zero", "~> 4.2", ">= 4.2.2"
-  s.add_dependency "pry", "~> 0.9"
+  s.add_dependency "chef-zero", "~> 4.5"
 
-  s.add_dependency 'plist', '~> 3.1.0'
+  s.add_dependency "plist", "~> 3.1.0"
 
   # Audit mode requires these, so they are non-developmental dependencies now
-  %w(rspec-core rspec-expectations rspec-mocks).each { |gem| s.add_dependency gem, "~> 3.4" }
+  %w{rspec-core rspec-expectations rspec-mocks}.each { |gem| s.add_dependency gem, "~> 3.4" }
   s.add_dependency "rspec_junit_formatter", "~> 0.2.0"
   s.add_dependency "serverspec", "~> 2.7"
   s.add_dependency "specinfra", "~> 2.10"
 
   s.add_dependency "syslog-logger", "~> 1.6"
+  s.add_dependency "uuidtools", "~> 2.1.5"
 
   s.add_dependency "proxifier", "~> 1.0"
 
   s.add_development_dependency "rack"
-  s.add_development_dependency "cheffish", "~> 1.1"
+  s.add_development_dependency "cheffish", ">= 1.1", "< 3.0"
 
   s.add_development_dependency "rake", "~> 10.1"
 
   s.bindir       = "bin"
-  s.executables  = %w( chef-client chef-solo knife chef-shell chef-apply )
+  s.executables  = %w{ chef-client chef-solo knife chef-shell chef-apply }
 
-  s.require_path = 'lib'
-  s.files = %w(Gemfile Rakefile LICENSE README.md CONTRIBUTING.md) + Dir.glob("{distro,lib,tasks,spec}/**/*", File::FNM_DOTMATCH).reject {|f| File.directory?(f) } + Dir.glob("*.gemspec")
+  s.require_paths = %w{ lib lib-backcompat }
+  s.files = %w{Gemfile Rakefile LICENSE README.md CONTRIBUTING.md VERSION} + Dir.glob("{distro,lib,lib-backcompat,tasks,acceptance,spec}/**/*", File::FNM_DOTMATCH).reject { |f| File.directory?(f) } + Dir.glob("*.gemspec")
 end

data/distro/common/html/_static/basic.css

@@ -4,7 +4,7 @@
  *
  * Sphinx stylesheet -- basic theme.
  *
- * :copyright: Copyright 2007-2014 by the Sphinx team, see AUTHORS.
+ * :copyright: Copyright 2007-2016, by the Sphinx team, see AUTHORS.
  * :license: BSD, see LICENSE for details.
  *
  */

data/distro/common/html/_static/doctools.js

@@ -4,7 +4,7 @@
  *
  * Sphinx JavaScript utilities for all documentation.
  *
- * :copyright: Copyright 2007-2014 by the Sphinx team, see AUTHORS.
+ * :copyright: Copyright 2007-2016, by the Sphinx team, see AUTHORS.
  * :license: BSD, see LICENSE for details.
  *
  */

data/distro/common/html/_static/searchtools.js

@@ -4,7 +4,7 @@
  *
  * Sphinx JavaScript utilties for the full-text search.
  *
- * :copyright: Copyright 2007-2014 by the Sphinx team, see AUTHORS.
+ * :copyright: Copyright 2007-2016, by the Sphinx team, see AUTHORS.
  * :license: BSD, see LICENSE for details.
  *
  */

data/distro/common/html/_static/websupport.js

@@ -4,7 +4,7 @@
  *
  * sphinx.websupport utilties for all documentation.
  *
- * :copyright: Copyright 2007-2014 by the Sphinx team, see AUTHORS.
+ * :copyright: Copyright 2007-2016, by the Sphinx team, see AUTHORS.
  * :license: BSD, see LICENSE for details.
  *
  */

data/ext/win32-eventlog/Rakefile

@@ -1,6 +1,6 @@
-require 'rubygems'
-require 'rake'
-require 'mkmf'
+require "rubygems"
+require "rake"
+require "mkmf"
 
 desc "Building event log dll"
 
@@ -12,21 +12,20 @@ def ensure_present(commands)
   end
 end
 
-
-EVT_MC_FILE = 'chef-log.man'
-EVT_RC_FILE = 'chef-log.rc'
-EVT_RESOURCE_OBJECT = 'resource.o'
-EVT_SHARED_OBJECT = 'chef-log.dll'
-MC = 'windmc'
-RC = 'windres'
-CC = 'gcc'
+EVT_MC_FILE = "chef-log.man"
+EVT_RC_FILE = "chef-log.rc"
+EVT_RESOURCE_OBJECT = "resource.o"
+EVT_SHARED_OBJECT = "chef-log.dll"
+MC = "windmc"
+RC = "windres"
+CC = "gcc"
 
 ensure_present [MC, RC, CC]
 
 task :build => [EVT_RESOURCE_OBJECT, EVT_SHARED_OBJECT]
 task :default => [:build, :register]
 
-file EVT_RC_FILE=> EVT_MC_FILE do
+file EVT_RC_FILE => EVT_MC_FILE do
   sh "#{MC} #{EVT_MC_FILE}"
 end
 
@@ -39,14 +38,14 @@ file EVT_SHARED_OBJECT => EVT_RESOURCE_OBJECT do
 end
 
 task :register => EVT_SHARED_OBJECT do
-  require 'win32/eventlog'
+  require "win32/eventlog"
   dll_file = File.expand_path(EVT_SHARED_OBJECT)
   begin
     Win32::EventLog.add_event_source(
       :source => "Application",
       :key_name => "Chef",
       :event_message_file => dll_file,
-      :category_message_file => dll_file
+      :category_message_file => dll_file,
     )
   rescue Errno::EIO => e
     puts "Skipping event log registration due to missing privileges: #{e}"

data/lib-backcompat/chef/chef_fs/file_system/acl_entry.rb

@@ -0,0 +1,5 @@
+require "chef/chef_fs/file_system/chef_server/acl_entry"
+
+module Chef::ChefFS::FileSystem
+  AclEntry = ChefServer::AclEntry
+end

data/lib-backcompat/chef/chef_fs/file_system/chef_repository_file_system_root_dir.rb

@@ -0,0 +1,5 @@
+require "chef/chef_fs/file_system/repository/chef_repository_file_system_root_dir"
+
+module Chef::ChefFS::FileSystem
+  ChefRepositoryFileSystemRootDir = Repository::ChefRepositoryFileSystemRootDir
+end

data/lib-backcompat/chef/chef_fs/file_system/chef_server_root_dir.rb

@@ -0,0 +1,5 @@
+require "chef/chef_fs/file_system/chef_server/chef_server_root_dir"
+
+module Chef::ChefFS::FileSystem
+  ChefServerRootDir = ChefServer::ChefServerRootDir
+end

data/lib/chef.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,20 +16,20 @@
 # limitations under the License.
 #
 
-require 'chef/version'
-require 'chef/nil_argument'
-require 'chef/mash'
-require 'chef/exceptions'
-require 'chef/log'
-require 'chef/config'
-require 'chef/providers'
-require 'chef/resources'
-require 'chef/shell_out'
+require "chef/version"
+require "chef/nil_argument"
+require "chef/mash"
+require "chef/exceptions"
+require "chef/log"
+require "chef/config"
+require "chef/providers"
+require "chef/resources"
+require "chef/shell_out"
 
-require 'chef/daemon'
+require "chef/daemon"
 
-require 'chef/run_status'
-require 'chef/handler'
-require 'chef/handler/json_file'
-require 'chef/event_dispatch/dsl'
-require 'chef/chef_class'
+require "chef/run_status"
+require "chef/handler"
+require "chef/handler/json_file"
+require "chef/event_dispatch/dsl"
+require "chef/chef_class"

data/lib/chef/api_client.rb

@@ -1,7 +1,7 @@
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Author:: Nuo Yan (<nuo@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Author:: Adam Jacob (<adam@chef.io>)
+# Author:: Nuo Yan (<nuo@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");
@@ -17,13 +17,13 @@
 # limitations under the License.
 #
 
-require 'chef/config'
-require 'chef/mixin/params_validate'
-require 'chef/mixin/from_file'
-require 'chef/mash'
-require 'chef/json_compat'
-require 'chef/search/query'
-require 'chef/server_api'
+require "chef/config"
+require "chef/mixin/params_validate"
+require "chef/mixin/from_file"
+require "chef/mash"
+require "chef/json_compat"
+require "chef/search/query"
+require "chef/server_api"
 
 # DEPRECATION NOTE
 #
@@ -38,7 +38,7 @@ class Chef
 
     # Create a new Chef::ApiClient object.
     def initialize
-      @name = ''
+      @name = ""
       @public_key = nil
       @private_key = nil
       @admin = false
@@ -49,11 +49,11 @@ class Chef
     #
     # @params [Optional String] The name must be alpha-numeric plus - and _.
     # @return [String] The current value of the name.
-    def name(arg=nil)
+    def name(arg = nil)
       set_or_return(
         :name,
         arg,
-        :regex => /^[\-[:alnum:]_\.]+$/
+        :regex => /^[\-[:alnum:]_\.]+$/,
       )
     end
 
@@ -61,11 +61,11 @@ class Chef
     #
     # @params [Optional True/False] Should be true or false - default is false.
     # @return [True/False] The current value
-    def admin(arg=nil)
+    def admin(arg = nil)
       set_or_return(
         :admin,
         arg,
-        :kind_of => [ TrueClass, FalseClass ]
+        :kind_of => [ TrueClass, FalseClass ],
       )
     end
 
@@ -73,11 +73,11 @@ class Chef
     #
     # @params [Optional String] The string representation of the public key.
     # @return [String] The current value.
-    def public_key(arg=nil)
+    def public_key(arg = nil)
       set_or_return(
         :public_key,
         arg,
-        :kind_of => String
+        :kind_of => String,
       )
     end
 
@@ -86,11 +86,11 @@ class Chef
     # @params [Boolean] whether or not the client is a validator.  If
     #   `nil`, retrieves the already-set value.
     # @return [Boolean] The current value
-    def validator(arg=nil)
+    def validator(arg = nil)
       set_or_return(
         :validator,
         arg,
-        :kind_of => [TrueClass, FalseClass]
+        :kind_of => [TrueClass, FalseClass],
       )
     end
 
@@ -98,11 +98,11 @@ class Chef
     #
     # @params [Optional String] The string representation of the private key.
     # @return [String] The current value.
-    def private_key(arg=nil)
+    def private_key(arg = nil)
       set_or_return(
         :private_key,
         arg,
-        :kind_of => [String, FalseClass]
+        :kind_of => [String, FalseClass],
       )
     end
 
@@ -116,8 +116,8 @@ class Chef
         "public_key" => @public_key,
         "validator" => @validator,
         "admin" => @admin,
-        'json_class' => self.class.name,
-        "chef_type" => "client"
+        "json_class" => self.class.name,
+        "chef_type" => "client",
       }
       result["private_key"] = @private_key if @private_key
       result
@@ -141,6 +141,7 @@ class Chef
     end
 
     def self.json_create(data)
+      Chef.log_deprecation("Auto inflation of JSON data is deprecated. Please use Chef::ApiClient#from_hash")
       from_hash(data)
     end
 
@@ -149,7 +150,7 @@ class Chef
     end
 
     def self.http_api
-      Chef::ServerAPI.new(Chef::Config[:chef_server_url], {:api_version => "0"})
+      Chef::ServerAPI.new(Chef::Config[:chef_server_url], { :api_version => "0" })
     end
 
     def self.reregister(name)
@@ -157,7 +158,7 @@ class Chef
       api_client.reregister
     end
 
-    def self.list(inflate=false)
+    def self.list(inflate = false)
       if inflate
         response = Hash.new
         Chef::Search::Query.new.search(:client) do |n|
@@ -176,7 +177,7 @@ class Chef
       if response.kind_of?(Chef::ApiClient)
         response
       else
-        json_create(response)
+        from_hash(response)
       end
     end
 
@@ -188,11 +189,11 @@ class Chef
     # Save this client via the REST API, returns a hash including the private key
     def save
       begin
-        http_api.put("clients/#{name}", { :name => self.name, :admin => self.admin, :validator => self.validator})
+        http_api.put("clients/#{name}", { :name => self.name, :admin => self.admin, :validator => self.validator })
       rescue Net::HTTPServerException => e
         # If that fails, go ahead and try and update it
         if e.response.code == "404"
-          http_api.post("clients", {:name => self.name, :admin => self.admin, :validator => self.validator })
+          http_api.post("clients", { :name => self.name, :admin => self.admin, :validator => self.validator })
         else
           raise e
         end
@@ -221,11 +222,11 @@ class Chef
 
     def inspect
       "Chef::ApiClient name:'#{name}' admin:'#{admin.inspect}' validator:'#{validator}' " +
-      "public_key:'#{public_key}' private_key:'#{private_key}'"
+        "public_key:'#{public_key}' private_key:'#{private_key}'"
     end
 
     def http_api
-      @http_api ||= Chef::ServerAPI.new(Chef::Config[:chef_server_url], {:api_version => "0"})
+      @http_api ||= Chef::ServerAPI.new(Chef::Config[:chef_server_url], { :api_version => "0" })
     end
 
   end