chef 12.1.2 → 12.2.0.rc.1

data/lib/chef/provider/user/dscl.rb

@@ -44,6 +44,8 @@ class Chef
       # This provider only supports Mac OSX versions 10.7 and above
       class Dscl < Chef::Provider::User
 
+        provides :user, os: "darwin"
+
         def define_resource_requirements
           super
 
@@ -650,7 +652,11 @@ user password using shadow hash.")
         def run_plutil(*args)
           result = shell_out("plutil -#{args.join(' ')}")
           raise(Chef::Exceptions::PlistUtilCommandFailed,"plutil error: #{result.inspect}") unless result.exitstatus == 0
-          result.stdout
+          if result.stdout.encoding == Encoding::ASCII_8BIT
+            result.stdout.encode("utf-8", "binary",  :undef => :replace, :invalid => :replace, :replace => '?')
+          else
+            result.stdout
+          end
         end
 
         def convert_binary_plist_to_xml(binary_plist_string)

data/lib/chef/provider/user/windows.rb

@@ -27,6 +27,8 @@ class Chef
     class User
       class Windows < Chef::Provider::User
 
+        provides :user, os: "windows"
+
         def initialize(new_resource,run_context)
           super
           @net_user = Chef::Util::Windows::NetUser.new(@new_resource.username)

data/lib/chef/providers.rb

@@ -25,6 +25,7 @@ require 'chef/provider/cron/aix'
 require 'chef/provider/deploy'
 require 'chef/provider/directory'
 require 'chef/provider/dsc_script'
+require 'chef/provider/dsc_resource'
 require 'chef/provider/env'
 require 'chef/provider/erl_call'
 require 'chef/provider/execute'

data/lib/chef/recipe.rb

@@ -25,6 +25,7 @@ require 'chef/dsl/include_recipe'
 require 'chef/dsl/registry_helper'
 require 'chef/dsl/reboot_pending'
 require 'chef/dsl/audit'
+require 'chef/dsl/powershell'
 
 require 'chef/mixin/from_file'
 
@@ -42,6 +43,7 @@ class Chef
     include Chef::DSL::RegistryHelper
     include Chef::DSL::RebootPending
     include Chef::DSL::Audit
+    include Chef::DSL::Powershell
 
     include Chef::Mixin::FromFile
     include Chef::Mixin::Deprecation

data/lib/chef/resource.rb

@@ -996,6 +996,15 @@ class Chef
       end
     end
 
+    #
+    # DSL method used to define attribute on a resource wrapping params_validate
+    #
+    def self.attribute(attr_name, validation_opts={})
+      define_method(attr_name) do |arg=NULL_ARG|
+        nillable_set_or_return(attr_name.to_sym, arg, validation_opts)
+      end
+    end
+
     #
     # The cookbook in which this Resource was defined (if any).
     #

data/lib/chef/resource/batch.rb

@@ -22,6 +22,8 @@ class Chef
   class Resource
     class Batch < Chef::Resource::WindowsScript
 
+      provides :batch, os: "windows"
+
       def initialize(name, run_context=nil)
         super(name, run_context, :batch, "cmd.exe")
       end

data/lib/chef/resource/cron.rb

@@ -27,6 +27,8 @@ class Chef
 
       state_attrs :minute, :hour, :day, :month, :weekday, :user
 
+      provides :cron
+
       def initialize(name, run_context=nil)
         super
         @resource_name = :cron
@@ -138,7 +140,7 @@ class Chef
           :kind_of => [String, Symbol]
         )
       end
-      
+
       def time(arg=nil)
         set_or_return(
           :time,
@@ -214,5 +216,3 @@ class Chef
     end
   end
 end
-
-

data/lib/chef/resource/deploy.rb

@@ -63,6 +63,7 @@ class Chef
         @deploy_to = name
         @environment = nil
         @repository_cache = 'cached-copy'
+        # XXX: if copy_exclude is a kind_of String why is initialized to an array???
         @copy_exclude = []
         @purge_before_symlink = %w{log tmp/pids public/system}
         @create_dirs_before_symlink = %w{tmp public config}
@@ -78,10 +79,11 @@ class Chef
         @scm_provider = Chef::Provider::Git
         @svn_force_export = false
         @allowed_actions.push(:force_deploy, :deploy, :rollback)
-        @additional_remotes = Hash[]
+        @additional_remotes = {}
         @keep_releases = 5
         @enable_checkout = true
         @checkout_branch = "deploy"
+        @timeout = nil
       end
 
       # where the checked out/cloned code goes
@@ -104,42 +106,18 @@ class Chef
       end
 
       # note: deploy_to is your application "meta-root."
-      def deploy_to(arg=nil)
-        set_or_return(
-          :deploy_to,
-          arg,
-          :kind_of => [ String ]
-        )
-      end
+      attribute :deploy_to, :kind_of => [ String ]
 
-      def repo(arg=nil)
-        set_or_return(
-          :repo,
-          arg,
-          :kind_of => [ String ]
-        )
-      end
+      attribute :repo, :kind_of => [ String ]
       alias :repository :repo
 
-      def remote(arg=nil)
-        set_or_return(
-          :remote,
-          arg,
-          :kind_of => [ String ]
-        )
-      end
+      attribute :remote, :kind_of => [ String ]
 
-      def role(arg=nil)
-        set_or_return(
-          :role,
-          arg,
-          :kind_of => [ String ]
-        )
-      end
+      attribute :role, :kind_of => [ String ]
 
-      def restart_command(arg=nil, &block)
-        arg ||= block
-        set_or_return(
+      def restart_command(arg=NULL_ARG, &block)
+        arg = block if block_given?
+        nillable_set_or_return(
           :restart_command,
           arg,
           :kind_of => [ String, Proc ]
@@ -147,155 +125,60 @@ class Chef
       end
       alias :restart :restart_command
 
-      def migrate(arg=nil)
-        set_or_return(
-          :migrate,
-          arg,
-          :kind_of => [ TrueClass, FalseClass ]
-        )
-      end
+      attribute :migrate, :kind_of => [ TrueClass, FalseClass ]
 
-      def migration_command(arg=nil)
-        set_or_return(
-          :migration_command,
-          arg,
-          :kind_of => [ String ]
-        )
-      end
+      attribute :migration_command, kind_of: String
 
-      def rollback_on_error(arg=nil)
-        set_or_return(
-          :rollback_on_error,
-          arg,
-          :kind_of => [ TrueClass, FalseClass ]
-        )
-      end
+      attribute :rollback_on_error, :kind_of => [ TrueClass, FalseClass ]
 
-      def user(arg=nil)
-        set_or_return(
-          :user,
-          arg,
-          :kind_of => [ String ]
-        )
-      end
+      attribute :user, kind_of: String
 
-      def group(arg=nil)
-        set_or_return(
-          :group,
-          arg,
-          :kind_of => [ String ]
-        )
-      end
+      attribute :group, kind_of: [ String ]
 
-      def enable_submodules(arg=nil)
-        set_or_return(
-          :enable_submodules,
-          arg,
-          :kind_of => [ TrueClass, FalseClass ]
-        )
-      end
+      attribute :enable_submodules, kind_of: [ TrueClass, FalseClass ]
 
-      def shallow_clone(arg=nil)
-        set_or_return(
-          :shallow_clone,
-          arg,
-          :kind_of => [ TrueClass, FalseClass ]
-        )
-      end
+      attribute :shallow_clone, kind_of: [ TrueClass, FalseClass ]
 
-      def repository_cache(arg=nil)
-        set_or_return(
-          :repository_cache,
-          arg,
-          :kind_of => [ String ]
-        )
-      end
+      attribute :repository_cache, kind_of: String
 
-      def copy_exclude(arg=nil)
-        set_or_return(
-          :copy_exclude,
-          arg,
-          :kind_of => [ String ]
-        )
-      end
+      attribute :copy_exclude, kind_of: String
 
-      def revision(arg=nil)
-        set_or_return(
-          :revision,
-          arg,
-          :kind_of => [ String ]
-        )
-      end
+      attribute :revision, kind_of: String
       alias :branch :revision
 
-      def git_ssh_wrapper(arg=nil)
-        set_or_return(
-          :git_ssh_wrapper,
-          arg,
-          :kind_of => [ String ]
-        )
-      end
+      attribute :git_ssh_wrapper, kind_of: String
       alias :ssh_wrapper :git_ssh_wrapper
 
-      def svn_username(arg=nil)
-        set_or_return(
-          :svn_username,
-          arg,
-          :kind_of => [ String ]
-        )
-      end
+      attribute :svn_username, kind_of: String
 
-      def svn_password(arg=nil)
-        set_or_return(
-          :svn_password,
-          arg,
-          :kind_of => [ String ]
-        )
-      end
+      attribute :svn_password, kind_of: String
 
-      def svn_arguments(arg=nil)
-        set_or_return(
-          :svn_arguments,
-          arg,
-          :kind_of => [ String ]
-        )
-      end
+      attribute :svn_arguments, kind_of: String
 
-      def svn_info_args(arg=nil)
-        set_or_return(
-          :svn_arguments,
-          arg,
-          :kind_of => [ String ])
-      end
+      attribute :svn_info_args, kind_of: String
 
-      def scm_provider(arg=nil)
+      def scm_provider(arg=NULL_ARG)
         klass = if arg.kind_of?(String) || arg.kind_of?(Symbol)
                   lookup_provider_constant(arg)
                 else
                   arg
                 end
-        set_or_return(
+        nillable_set_or_return(
           :scm_provider,
           klass,
           :kind_of => [ Class ]
         )
       end
 
-      def svn_force_export(arg=nil)
-        set_or_return(
-          :svn_force_export,
-          arg,
-          :kind_of => [ TrueClass, FalseClass ]
-        )
-      end
+      attribute :svn_force_export, kind_of: [ TrueClass, FalseClass ]
 
-      def environment(arg=nil)
+      def environment(arg=NULL_ARG)
         if arg.is_a?(String)
           Chef::Log.debug "Setting RAILS_ENV, RACK_ENV, and MERB_ENV to `#{arg}'"
           Chef::Log.warn "[DEPRECATED] please modify your deploy recipe or attributes to set the environment using a hash"
           arg = {"RAILS_ENV"=>arg,"MERB_ENV"=>arg,"RACK_ENV"=>arg}
         end
-        set_or_return(
+        nillable_set_or_return(
           :environment,
           arg,
           :kind_of => [ Hash ]
@@ -303,8 +186,8 @@ class Chef
       end
 
        # The number of old release directories to keep around after cleanup
-      def keep_releases(arg=nil)
-        [set_or_return(
+      def keep_releases(arg=NULL_ARG)
+        [nillable_set_or_return(
           :keep_releases,
           arg,
           :kind_of => [ Integer ]), 1].max
@@ -314,13 +197,7 @@ class Chef
       # SCM clone/checkout before symlinking. Use this to get rid of files and
       # directories you want to be shared between releases.
       # Default: ["log", "tmp/pids", "public/system"]
-      def purge_before_symlink(arg=nil)
-        set_or_return(
-          :purge_before_symlink,
-          arg,
-          :kind_of => Array
-        )
-      end
+      attribute :purge_before_symlink, kind_of: Array
 
       # An array of paths, relative to your app's root, where you expect dirs to
       # exist before symlinking. This runs after #purge_before_symlink, so you
@@ -330,13 +207,7 @@ class Chef
       # then specify tmp here so that the tmp directory will exist when you
       # symlink the pids directory in to the current release.
       # Default: ["tmp", "public", "config"]
-      def create_dirs_before_symlink(arg=nil)
-        set_or_return(
-          :create_dirs_before_symlink,
-          arg,
-          :kind_of => Array
-        )
-      end
+      attribute :create_dirs_before_symlink, kind_of: Array
 
       # A Hash of shared/dir/path => release/dir/path. This attribute determines
       # which files and dirs in the shared directory get symlinked to the current
@@ -344,13 +215,7 @@ class Chef
       # $shared/pids that you would like to symlink as $current_release/tmp/pids
       # you specify it as "pids" => "tmp/pids"
       # Default {"system" => "public/system", "pids" => "tmp/pids", "log" => "log"}
-      def symlinks(arg=nil)
-        set_or_return(
-          :symlinks,
-          arg,
-          :kind_of => Hash
-        )
-      end
+      attribute :symlinks, kind_of: Hash
 
       # A Hash of shared/dir/path => release/dir/path. This attribute determines
       # which files in the shared directory get symlinked to the current release
@@ -359,74 +224,44 @@ class Chef
       # For a rails/merb app, this is used to link in a known good database.yml
       # (with the production db password) before running migrate.
       # Default {"config/database.yml" => "config/database.yml"}
-      def symlink_before_migrate(arg=nil)
-        set_or_return(
-          :symlink_before_migrate,
-          arg,
-          :kind_of => Hash
-        )
-      end
+      attribute :symlink_before_migrate, kind_of: Hash
 
       # Callback fires before migration is run.
-      def before_migrate(arg=nil, &block)
-        arg ||= block
-        set_or_return(:before_migrate, arg, :kind_of => [Proc, String])
+      def before_migrate(arg=NULL_ARG, &block)
+        arg = block if block_given?
+        nillable_set_or_return(:before_migrate, arg, kind_of: [Proc, String])
       end
 
       # Callback fires before symlinking
-      def before_symlink(arg=nil, &block)
-        arg ||= block
-        set_or_return(:before_symlink, arg, :kind_of => [Proc, String])
+      def before_symlink(arg=NULL_ARG, &block)
+        arg = block if block_given?
+        nillable_set_or_return(:before_symlink, arg, kind_of: [Proc, String])
       end
 
       # Callback fires before restart
-      def before_restart(arg=nil, &block)
-        arg ||= block
-        set_or_return(:before_restart, arg, :kind_of => [Proc, String])
+      def before_restart(arg=NULL_ARG, &block)
+        arg = block if block_given?
+        nillable_set_or_return(:before_restart, arg, kind_of: [Proc, String])
       end
 
       # Callback fires after restart
-      def after_restart(arg=nil, &block)
-        arg ||= block
-        set_or_return(:after_restart, arg, :kind_of => [Proc, String])
+      def after_restart(arg=NULL_ARG, &block)
+        arg = block if block_given?
+        nillable_set_or_return(:after_restart, arg, kind_of: [Proc, String])
       end
 
-      def additional_remotes(arg=nil)
-        set_or_return(
-          :additional_remotes,
-          arg,
-          :kind_of => Hash
-        )
-      end
+      attribute :additional_remotes, kind_of: Hash
 
-      def enable_checkout(arg=nil)
-        set_or_return(
-          :enable_checkout,
-          arg,
-          :kind_of => [TrueClass, FalseClass]
-        )
-      end
+      attribute :enable_checkout, kind_of: [ TrueClass, FalseClass ]
 
-      def checkout_branch(arg=nil)
-        set_or_return(
-          :checkout_branch,
-          arg,
-          :kind_of => String
-        )
-      end
+      attribute :checkout_branch, kind_of: String
 
       # FIXME The Deploy resource may be passed to an SCM provider as its
       # resource.  The SCM provider knows that SCM resources can specify a
       # timeout for SCM operations. The deploy resource must therefore support
       # a timeout method, but the timeout it describes is for SCM operations,
       # not the overall deployment. This is potentially confusing.
-      def timeout(arg=nil)
-        set_or_return(
-          :timeout,
-          arg,
-          :kind_of => Integer
-        )
-      end
+      attribute :timeout, kind_of: Integer
 
     end
   end