chef 15.11.3-universal-mingw32 → 16.1.16-universal-mingw32

data/lib/chef/resource/portage_package.rb

@@ -21,13 +21,23 @@ require_relative "package"
 class Chef
   class Resource
     class PortagePackage < Chef::Resource::Package
-      resource_name :portage_package
+      unified_mode true
+
       provides :portage_package
 
-      description "Use the portage_package resource to manage packages for the Gentoo platform."
+      description "Use the **portage_package** resource to manage packages for the Gentoo platform."
+
+      property :package_name, String,
+        description: "An optional property to set the package name if it differs from the resource block's name.",
+        identity: true
+
+      property :version, String,
+        description: "The version of a package to be installed or upgraded."
 
-      property :timeout, default: 3600,
-               description: "The amount of time (in seconds) to wait before timing out."
+      property :timeout, [String, Integer],
+        default: 3600,
+        description: "The amount of time (in seconds) to wait before timing out.",
+        desired_state: false
     end
   end
 end

data/lib/chef/resource/powershell_package.rb

@@ -16,17 +16,15 @@
 #
 
 require_relative "package"
-require_relative "../mixin/uris"
 
 class Chef
   class Resource
     class PowershellPackage < Chef::Resource::Package
-      include Chef::Mixin::Uris
+      unified_mode true
 
-      resource_name :powershell_package
       provides :powershell_package
 
-      description "Use the powershell_package resource to install and manage packages via the PowerShell Package Manager for the Microsoft Windows platform. The powershell_package resource requires administrative access, and a source must be configured in the PowerShell Package Manager via the powershell_package_source resource."
+      description "Use the **powershell_package** resource to install and manage packages via the PowerShell Package Manager for the Microsoft Windows platform. The powershell_package resource requires administrative access, and a source must be configured in the PowerShell Package Manager via the powershell_package_source resource."
       introduced "12.16"
 
       allowed_actions :install, :remove

data/lib/chef/resource/powershell_package_source.rb

@@ -21,9 +21,11 @@ require_relative "../json_compat"
 class Chef
   class Resource
     class PowershellPackageSource < Chef::Resource
-      resource_name "powershell_package_source"
+      unified_mode true
 
-      description "Use the powershell_package_source resource to register a PowerShell package repository."
+      provides :powershell_package_source
+
+      description "Use the **powershell_package_source** resource to register a PowerShell package repository."
       introduced "14.3"
 
       property :source_name, String,

data/lib/chef/resource/powershell_script.rb

@@ -20,6 +20,8 @@ require_relative "windows_script"
 class Chef
   class Resource
     class PowershellScript < Chef::Resource::WindowsScript
+      unified_mode true
+
       provides :powershell_script, os: "windows"
 
       property :flags, String,
@@ -37,7 +39,7 @@ class Chef
           end
         }
 
-      description "Use the powershell_script resource to execute a script using the Windows PowerShell"\
+      description "Use the **powershell_script** resource to execute a script using the Windows PowerShell"\
                   " interpreter, much like how the script and script-based resources—bash, csh, perl, python,"\
                   " and ruby—are used. The powershell_script is specific to the Microsoft Windows platform"\
                   " and the Windows PowerShell interpreter.\n\n The powershell_script resource creates and"\
@@ -71,24 +73,12 @@ class Chef
       end
 
       # Options that will be passed to Windows PowerShell command
+      #
+      # @returns [String]
       def default_flags
-        return "" if Chef::Platform.windows_nano_server?
-
-        # Execution policy 'Bypass' is preferable since it doesn't require
-        # user input confirmation for files such as PowerShell modules
-        # downloaded from the Internet. However, 'Bypass' is not supported
-        # prior to PowerShell 3.0, so the fallback is 'Unrestricted'
-        execution_policy = Chef::Platform.supports_powershell_execution_bypass?(run_context.node) ? "Bypass" : "Unrestricted"
-
-        [
-          "-NoLogo",
-          "-NonInteractive",
-          "-NoProfile",
-          "-ExecutionPolicy #{execution_policy}",
-          # PowerShell will hang if STDIN is redirected
-          # http://connect.microsoft.com/PowerShell/feedback/details/572313/powershell-exe-can-hang-if-stdin-is-redirected
-          "-InputFormat None",
-        ].join(" ")
+        # Set InputFormat to None as PowerShell will hang if STDIN is redirected
+        # http://connect.microsoft.com/PowerShell/feedback/details/572313/powershell-exe-can-hang-if-stdin-is-redirected
+        "-NoLogo -NonInteractive -NoProfile -ExecutionPolicy Bypass -InputFormat None"
       end
     end
   end

data/lib/chef/resource/python.rb

@@ -23,12 +23,14 @@ class Chef
     class Python < Chef::Resource::Script
       unified_mode true
 
+      provides :python
+
       def initialize(name, run_context = nil)
         super
         @interpreter = "python"
       end
 
-      description "Use the python resource to execute scripts using the Python interpreter."\
+      description "Use the **python** resource to execute scripts using the Python interpreter."\
                   " This resource may also use any of the actions and properties that are available"\
                   " to the execute resource. Commands that are executed with this resource are (by"\
                   " their nature) not idempotent, as they are typically unique to the environment in"\

data/lib/chef/resource/reboot.rb

@@ -24,10 +24,9 @@ class Chef
     class Reboot < Chef::Resource
       unified_mode true
 
-      resource_name :reboot
       provides :reboot
 
-      description "Use the reboot resource to reboot a node, a necessary step with some"\
+      description "Use the **reboot** resource to reboot a node, a necessary step with some"\
                   " installations on certain platforms. This resource is supported for use on"\
                   " the Microsoft Windows, macOS, and Linux platforms.\n"\
                   "In using this resource via notifications, it's important to *only* use"\

data/lib/chef/resource/registry_key.rb

@@ -24,10 +24,9 @@ class Chef
     class RegistryKey < Chef::Resource
       unified_mode true
 
-      resource_name :registry_key
       provides(:registry_key) { true }
 
-      description "Use the registry_key resource to create and delete registry keys in Microsoft Windows."
+      description "Use the **registry_key** resource to create and delete registry keys in Microsoft Windows."
       introduced "11.0"
 
       state_attrs :values
@@ -71,7 +70,7 @@ class Chef
         @values, @unscrubbed_values = [], []
       end
 
-      property :key, String, name_property: true, identity: true
+      property :key, String, name_property: true
 
       def values(arg = nil)
         if not arg.nil?

data/lib/chef/resource/remote_directory.rb

@@ -27,7 +27,9 @@ class Chef
       include Chef::Mixin::Securable
       unified_mode true
 
-      description "Use the remote_directory resource to incrementally transfer a directory from a cookbook to a node. The director that is copied from the cookbook should be located under COOKBOOK_NAME/files/default/REMOTE_DIRECTORY. The remote_directory resource will obey file specificity."
+      provides :remote_directory
+
+      description "Use the **remote_directory** resource to incrementally transfer a directory from a cookbook to a node. The director that is copied from the cookbook should be located under COOKBOOK_NAME/files/default/REMOTE_DIRECTORY. The remote_directory resource will obey file specificity."
 
       default_action :create
       allowed_actions :create, :create_if_missing, :delete

data/lib/chef/resource/remote_file.rb

@@ -29,8 +29,9 @@ class Chef
       include Chef::Mixin::Securable
       unified_mode true
 
-      description "Use the remote_file resource to transfer a file from a remote location"\
-                  " using file specificity. This resource is similar to the file resource."
+      provides :remote_file
+
+      description "Use the **remote_file** resource to transfer a file from a remote location using file specificity. This resource is similar to the file resource."
 
       def initialize(name, run_context = nil)
         super

data/lib/chef/resource/rhsm_errata.rb

@@ -21,12 +21,9 @@ class Chef
   class Resource
     class RhsmErrata < Chef::Resource
       unified_mode true
-      resource_name :rhsm_errata
       provides(:rhsm_errata) { true }
 
-      description "Use the rhsm_errata resource to install packages associated with a given Red"\
-                  " Hat Subscription Manager Errata ID. This is helpful if packages"\
-                  " to mitigate a single vulnerability must be installed on your hosts."
+      description "Use the **rhsm_errata** resource to install packages associated with a given Red Hat Subscription Manager Errata ID. This is helpful if packages to mitigate a single vulnerability must be installed on your hosts."
       introduced "14.0"
 
       property :errata_id, String,

data/lib/chef/resource/rhsm_errata_level.rb

@@ -21,10 +21,9 @@ class Chef
   class Resource
     class RhsmErrataLevel < Chef::Resource
       unified_mode true
-      resource_name :rhsm_errata_level
       provides(:rhsm_errata_level) { true }
 
-      description "Use the rhsm_errata_level resource to install all packages of a specified errata level from the Red Hat Subscription Manager. For example, you can ensure that all packages associated with errata marked at a 'Critical' security level are installed."
+      description "Use the **rhsm_errata_level** resource to install all packages of a specified errata level from the Red Hat Subscription Manager. For example, you can ensure that all packages associated with errata marked at a 'Critical' security level are installed."
       introduced "14.0"
 
       property :errata_level, String,

data/lib/chef/resource/rhsm_register.rb

@@ -23,11 +23,9 @@ class Chef
   class Resource
     class RhsmRegister < Chef::Resource
       unified_mode true
-      resource_name :rhsm_register
       provides(:rhsm_register) { true }
 
-      description "Use the rhsm_register resource to register a node with the Red Hat Subscription Manager"\
-                  " or a local Red Hat Satellite server."
+      description "Use the **rhsm_register** resource to register a node with the Red Hat Subscription Manager or a local Red Hat Satellite server."
       introduced "14.0"
 
       property :activation_key, [String, Array],
@@ -128,12 +126,14 @@ class Chef
         end
 
         def registered_with_rhsm?
+          # FIXME: use shell_out
           cmd = Mixlib::ShellOut.new("subscription-manager status", env: { LANG: "en_US" })
           cmd.run_command
           !cmd.stdout.match(/Overall Status: Unknown/)
         end
 
         def katello_cert_rpm_installed?
+          # FIXME: use shell_out
           cmd = Mixlib::ShellOut.new("rpm -qa | grep katello-ca-consumer")
           cmd.run_command
           !cmd.stdout.match(/katello-ca-consumer/).nil?

data/lib/chef/resource/rhsm_repo.rb

@@ -20,11 +20,11 @@ require_relative "../resource"
 class Chef
   class Resource
     class RhsmRepo < Chef::Resource
-      resource_name :rhsm_repo
+      unified_mode true
+
       provides(:rhsm_repo) { true }
 
-      description "Use the rhsm_repo resource to enable or disable Red Hat Subscription Manager"\
-                  " repositories that are made available via attached subscriptions."
+      description "Use the **rhsm_repo** resource to enable or disable Red Hat Subscription Manager repositories that are made available via attached subscriptions."
       introduced "14.0"
 
       property :repo_name, String,
@@ -55,6 +55,7 @@ class Chef
 
       action_class do
         def repo_enabled?(repo)
+          # FIXME: use shell_out()
           cmd = Mixlib::ShellOut.new("subscription-manager repos --list-enabled", env: { LANG: "en_US" })
           cmd.run_command
           repo == "*" || !cmd.stdout.match(/Repo ID:\s+#{repo}$/).nil?

data/lib/chef/resource/rhsm_subscription.rb

@@ -20,12 +20,11 @@ require_relative "../resource"
 class Chef
   class Resource
     class RhsmSubscription < Chef::Resource
-      resource_name :rhsm_subscription
+      unified_mode true
+
       provides(:rhsm_subscription) { true }
 
-      description "Use the rhsm_subscription resource to add or remove Red Hat Subscription Manager"\
-                  " subscriptions from your host. This can be used when a host's activation_key"\
-                  " does not attach all necessary subscriptions to your host."
+      description "Use the **rhsm_subscription** resource to add or remove Red Hat Subscription Manager subscriptions from your host. This can be used when a host's activation_key does not attach all necessary subscriptions to your host."
       introduced "14.0"
 
       property :pool_id, String,
@@ -56,6 +55,7 @@ class Chef
 
       action_class do
         def subscription_attached?(subscription)
+          # FIXME: use shell_out
           cmd = Mixlib::ShellOut.new("subscription-manager list --consumed | grep #{subscription}", env: { LANG: "en_US" })
           cmd.run_command
           !cmd.stdout.match(/Pool ID:\s+#{subscription}$/).nil?
@@ -66,6 +66,7 @@ class Chef
           pool = nil
           serial = nil
 
+          # FIXME: use shell_out
           cmd = Mixlib::ShellOut.new("subscription-manager list --consumed", env: { LANG: "en_US" })
           cmd.run_command
           cmd.stdout.lines.each do |line|

data/lib/chef/resource/route.rb

@@ -22,14 +22,18 @@ require_relative "../resource"
 class Chef
   class Resource
     class Route < Chef::Resource
+      unified_mode true
+
+      provides :route
+
       default_action :add
       allowed_actions :add, :delete
 
-      description "Use the route resource to manage the system routing table in a Linux environment."
+      description "Use the **route** resource to manage the system routing table in a Linux environment."
 
       property :target, String,
         description: "The IP address of the target route.",
-        identity: true, name_property: true
+        name_property: true
 
       property :comment, [String, nil],
         description: "Add a comment for the route.",

data/lib/chef/resource/rpm_package.rb

@@ -21,13 +21,23 @@ require_relative "package"
 class Chef
   class Resource
     class RpmPackage < Chef::Resource::Package
-      resource_name :rpm_package
+      unified_mode true
+
       provides :rpm_package
 
-      description "Use the rpm_package resource to manage packages for the RPM Package Manager platform."
+      description "Use the **rpm_package** resource to manage packages using the RPM Package Manager."
+
+      property :allow_downgrade, [ TrueClass, FalseClass ],
+        description: "Allow downgrading a package to satisfy requested version requirements.",
+        default: true,
+        desired_state: false
 
-      property :allow_downgrade, [ true, false ], default: true, desired_state: false
+      property :package_name, String,
+        description: "An optional property to set the package name if it differs from the resource block's name.",
+        identity: true
 
+      property :version, String,
+        description: "The version of a package to be installed or upgraded."
     end
   end
 end

data/lib/chef/resource/ruby.rb

@@ -24,7 +24,9 @@ class Chef
     class Ruby < Chef::Resource::Script
       unified_mode true
 
-      description "Use the ruby resource to execute scripts using the Ruby interpreter. This"\
+      provides :ruby
+
+      description "Use the **ruby** resource to execute scripts using the Ruby interpreter. This"\
                   " resource may also use any of the actions and properties that are available"\
                   " to the execute resource. Commands that are executed with this resource are (by"\
                   " their nature) not idempotent, as they are typically unique to the environment"\

data/lib/chef/resource/ruby_block.rb

@@ -28,10 +28,7 @@ class Chef
 
       provides :ruby_block, target_mode: true
 
-      description "Use the ruby_block resource to execute Ruby code during a #{Chef::Dist::PRODUCT} run."\
-                  " Ruby code in the ruby_block resource is evaluated with other resources during"\
-                  " convergence, whereas Ruby code outside of a ruby_block resource is evaluated"\
-                  " before other resources, as the recipe is compiled."
+      description "Use the **ruby_block** resource to execute Ruby code during a #{Chef::Dist::PRODUCT} run. Ruby code in the ruby_block resource is evaluated with other resources during convergence, whereas Ruby code outside of a ruby_block resource is evaluated before other resources, as the recipe is compiled."
 
       default_action :run
       allowed_actions :create, :run
@@ -44,7 +41,7 @@ class Chef
         end
       end
 
-      property :block_name, String, name_property: true, identity: true
+      property :block_name, String, name_property: true
     end
   end
 end

data/lib/chef/resource/scm/_scm.rb

@@ -0,0 +1,49 @@
+#
+# Author:: Daniel DeLeo (<dan@kallistec.com>)
+# Copyright:: Copyright (c) Chef Software Inc.
+# 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.
+#
+
+unified_mode true
+
+default_action :sync
+allowed_actions :checkout, :export, :sync, :diff, :log
+
+property :destination, String,
+  description: "The location path to which the source is to be cloned, checked out, or exported. Default value: the name of the resource block.",
+  name_property: true
+
+property :repository, String,
+  description: "The URI of the code repository."
+
+property :revision, String,
+  description: "The revision to checkout.",
+  default: "HEAD"
+
+property :user, [String, Integer],
+  description: "The system user that will own the checked-out code."
+
+property :group, [String, Integer],
+  description: "The system group that will own the checked-out code."
+
+property :timeout, Integer,
+  description: "The amount of time (in seconds) to wait before timing out.",
+  desired_state: false
+
+property :environment, [Hash, nil],
+  description: "A Hash of environment variables in the form of ({'ENV_VARIABLE' => 'VALUE'}).",
+  default: nil
+
+alias :env :environment

data/lib/chef/resource/{scm.rb → scm/git.rb}

@@ -16,33 +16,23 @@
 # limitations under the License.
 #
 
-require_relative "../resource"
+require_relative "../../resource"
 
 class Chef
   class Resource
-    class Scm < Chef::Resource
-      unified_mode true
-
-      default_action :sync
-      allowed_actions :checkout, :export, :sync, :diff, :log
-
-      property :destination, String,
-        description: "The location path to which the source is to be cloned, checked out, or exported. Default value: the name of the resource block.",
-        name_property: true, identity: true
+    class Git < Chef::Resource
+      use "scm"
 
-      property :repository, String
+      unified_mode true
 
-      property :revision, String,
-        description: "The revision to checkout.",
-        default: "HEAD"
+      provides :git
 
-      property :user, [String, Integer],
-        description: "The system user that is responsible for the checked-out code."
+      description "Use the **git** resource to manage source control resources that exist in a git repository. git version 1.6.5 (or higher) is required to use all of the functionality in the git resource."
 
-      property :group, [String, Integer],
-        description: "The system group that is responsible for the checked-out code."
+      property :additional_remotes, Hash,
+        description: "A Hash of additional remotes that are added to the git repository configuration.",
+        default: lazy { {} }
 
-      # Capistrano and git-deploy use ``shallow clone''
       property :depth, Integer,
         description: "The number of past revisions to be included in the git shallow clone. Unless specified the default behavior will do a full clone."
 
@@ -55,23 +45,19 @@ class Chef
         default: true
 
       property :remote, String,
+        description: "The remote repository to use when synchronizing an existing clone.",
         default: "origin"
 
       property :ssh_wrapper, String,
-        desired_state: false
-
-      property :timeout, Integer,
-        desired_state: false
+        desired_state: false,
+        description: "The path to the wrapper script used when running SSH with git. The `GIT_SSH` environment variable is set to this."
 
       property :checkout_branch, String,
-        description: "Do a one-time checkout **or** use when a branch in the upstream repository is named 'deploy'. To prevent the resource from attempting to check out master from master, set 'enable_checkout' to 'false' when using the 'checkout_branch' property.",
-        default: "deploy"
-
-      property :environment, [Hash, nil],
-        description: "A Hash of environment variables in the form of ({'ENV_VARIABLE' => 'VALUE'}).",
-        default: nil
+        description: "Set this to use a local branch to avoid checking SHAs or tags to a detached head state."
 
-      alias :env :environment
+      alias :branch :revision
+      alias :reference :revision
+      alias :repo :repository
     end
   end
 end