chef 12.0.0.alpha.2 → 12.0.0.rc.0

data/lib/chef/resource/apt_package.rb

@@ -23,10 +23,12 @@ class Chef
   class Resource
     class AptPackage < Chef::Resource::Package
 
+      provides :apt_package
+      provides :package, os: "linux", platform_family: [ "debian" ]
+
       def initialize(name, run_context=nil)
         super
         @resource_name = :apt_package
-        @provider = Chef::Provider::Package::Apt
         @default_release = nil
       end
 

data/lib/chef/resource/bash.rb

@@ -17,6 +17,7 @@
 #
 
 require 'chef/resource/script'
+require 'chef/provider/script'
 
 class Chef
   class Resource

data/lib/chef/resource/bff_package.rb

@@ -26,7 +26,6 @@ class Chef
       def initialize(name, run_context=nil)
         super
         @resource_name = :bff_package
-        @provider = Chef::Provider::Package::Aix
       end
 
     end

data/lib/chef/resource/breakpoint.rb

@@ -28,7 +28,7 @@ class Chef
         super(@name, *args)
         @action = "break"
         @allowed_actions << :break
-        @provider = Chef::Provider::Breakpoint
+        @resource_name = :breakpoint
       end
     end
   end

data/lib/chef/resource/chef_gem.rb

@@ -23,13 +23,12 @@ class Chef
   class Resource
     class ChefGem < Chef::Resource::Package::GemPackage
 
-      provides :chef_gem, :on_platforms => :all
+      provides :chef_gem
 
       def initialize(name, run_context=nil)
         super
         @resource_name = :chef_gem
         @gem_binary = RbConfig::CONFIG['bindir'] + "/gem"
-        @provider = Chef::Provider::Package::Rubygems
       end
 
       # The chef_gem resources is for installing gems to the current gem environment only for use by Chef cookbooks.

data/lib/chef/resource/conditional.rb

@@ -45,22 +45,42 @@ class Chef
 
       def initialize(positivity, parent_resource, command=nil, command_opts={}, &block)
         @positivity = positivity
-        case command
+        @command, @command_opts = command, command_opts
+        @block = block
+        @block_given = block_given?
+        @parent_resource = parent_resource
+
+        raise ArgumentError, "only_if/not_if requires either a command or a block" unless command || block_given?
+      end
+
+      def configure
+        case @command
         when String
-          @guard_interpreter = new_guard_interpreter(parent_resource, command, command_opts, &block)
-          @command, @command_opts = command, command_opts
+          @guard_interpreter = new_guard_interpreter(@parent_resource, @command, @command_opts, &@block)
           @block = nil
         when nil
-          raise ArgumentError, "only_if/not_if requires either a command or a block" unless block_given?
+          # We should have a block if we get here
+          # Check to see if the user set the guard_interpreter on the parent resource. Note that
+          # this error will not be raised when using the default_guard_interpreter
+          if @parent_resource.guard_interpreter != @parent_resource.default_guard_interpreter
+            msg = "#{@parent_resource.name} was given a guard_interpreter of #{@parent_resource.guard_interpreter}, "
+            msg << "but not given a command as a string. guard_interpreter does not support blocks (because they just contain ruby)."
+            raise ArgumentError, msg
+          end
+
           @guard_interpreter = nil
           @command, @command_opts = nil, nil
-          @block = block
         else
-          raise ArgumentError, "Invalid only_if/not_if command: #{command.inspect} (#{command.class})"
+          # command was passed, but it wasn't a String
+          raise ArgumentError, "Invalid only_if/not_if command, expected a string: #{command.inspect} (#{command.class})"
         end
       end
 
+      # this is run during convergence via Chef::Resource#run_action -> Chef::Resource#should_skip?
       def continue?
+        # configure late in case guard_interpreter is specified on the resource after the conditional
+        configure
+
         case @positivity
         when :only_if
           evaluate

data/lib/chef/resource/cookbook_file.rb

@@ -27,7 +27,7 @@ class Chef
     class CookbookFile < Chef::Resource::File
       include Chef::Mixin::Securable
 
-      provides :cookbook_file, :on_platforms => :all
+      provides :cookbook_file
 
       def initialize(name, run_context=nil)
         super
@@ -36,11 +36,10 @@ class Chef
         @action = "create"
         @source = ::File.basename(name)
         @cookbook = nil
-        @provider = Chef::Provider::CookbookFile
       end
 
       def source(source_filename=nil)
-        set_or_return(:source, source_filename, :kind_of => String)
+        set_or_return(:source, source_filename, :kind_of => [ String, Array ])
       end
 
       def cookbook(cookbook_name=nil)

data/lib/chef/resource/csh.rb

@@ -17,6 +17,7 @@
 #
 
 require 'chef/resource/script'
+require 'chef/provider/script'
 
 class Chef
   class Resource

data/lib/chef/resource/deploy.rb

@@ -77,7 +77,6 @@ class Chef
         @shallow_clone = false
         @scm_provider = Chef::Provider::Git
         @svn_force_export = false
-        @provider = Chef::Provider::Deploy::Timestamped
         @allowed_actions.push(:force_deploy, :deploy, :rollback)
         @additional_remotes = Hash[]
         @keep_releases = 5

data/lib/chef/resource/deploy_revision.rb

@@ -22,14 +22,19 @@ class Chef
     # Convenience class for using the deploy resource with the revision
     # deployment strategy (provider)
     class DeployRevision < Chef::Resource::Deploy
+
+      provides :deploy_revision
+
       def initialize(*args, &block)
         super
         @resource_name = :deploy_revision
-        @provider = Chef::Provider::Deploy::Revision
       end
     end
 
     class DeployBranch < Chef::Resource::DeployRevision
+
+      provides :deploy_branch
+
       def initialize(*args, &block)
         super
         @resource_name = :deploy_branch

data/lib/chef/resource/directory.rb

@@ -32,7 +32,7 @@ class Chef
 
       include Chef::Mixin::Securable
 
-      provides :directory, :on_platforms => :all
+      provides :directory
 
       def initialize(name, run_context=nil)
         super
@@ -41,7 +41,6 @@ class Chef
         @action = :create
         @recursive = false
         @allowed_actions.push(:create, :delete)
-        @provider = Chef::Provider::Directory
       end
 
       def recursive(arg=nil)

data/lib/chef/resource/dpkg_package.rb

@@ -23,10 +23,11 @@ class Chef
   class Resource
     class DpkgPackage < Chef::Resource::Package
 
+      provides :dpkg_package, os: "linux"
+
       def initialize(name, run_context=nil)
         super
         @resource_name = :dpkg_package
-        @provider = Chef::Provider::Package::Dpkg
       end
 
     end

data/lib/chef/resource/dsc_script.rb

@@ -0,0 +1,125 @@
+#
+# Author:: Adam Edwards (<adamed@getchef.com>)
+# Copyright:: Copyright (c) 2014 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.
+#
+
+require 'chef/exceptions'
+
+class Chef
+  class Resource
+    class DscScript < Chef::Resource
+
+      provides :dsc_script, platform: "windows"
+
+      def initialize(name, run_context=nil)
+        super
+        @allowed_actions.push(:run)
+        @action = :run
+        @resource_name = :dsc_script
+      end
+
+      def code(arg=nil)
+        if arg && command
+          raise ArgumentError, "Only one of 'code' and 'command' attributes may be specified"
+        end
+        if arg && configuration_name
+          raise ArgumentError, "The 'code' and 'command' attributes may not be used together"
+        end
+        set_or_return(
+          :code,
+          arg,
+          :kind_of => [ String ]
+        )
+      end
+
+      def configuration_name(arg=nil)
+        if arg && code
+          raise ArgumentError, "Attribute `configuration_name` may not be set if `code` is set"
+        end
+        set_or_return(
+          :configuration_name,
+          arg,
+          :kind_of => [ String ]
+        )
+      end
+
+      def command(arg=nil)
+        if arg && code
+          raise ArgumentError, "The 'code' and 'command' attributes may not be used together"
+        end
+        set_or_return(
+          :command,
+          arg,
+          :kind_of => [ String ]
+        )
+      end
+
+      def configuration_data(arg=nil)
+        if arg && configuration_data_script
+          raise ArgumentError, "The 'configuration_data' and 'configuration_data_script' attributes may not be used together"
+        end
+        set_or_return(
+          :configuration_data,
+          arg,
+          :kind_of => [ String ]
+        )
+      end
+
+      def configuration_data_script(arg=nil)
+        if arg && configuration_data
+          raise ArgumentError, "The 'configuration_data' and 'configuration_data_script' attributes may not be used together"
+        end
+        set_or_return(
+          :configuration_data_script,
+          arg,
+          :kind_of => [ String ]
+        )
+      end
+
+      def flags(arg=nil)
+        set_or_return(
+          :flags,
+          arg,
+          :kind_of => [ Hash ]
+        )
+      end
+
+      def cwd(arg=nil)
+        set_or_return(
+          :cwd,
+          arg,
+          :kind_of => [ String ]
+        )
+      end
+
+      def environment(arg=nil)
+        set_or_return(
+          :environment,
+          arg,
+          :kind_of => [ Hash ]
+        )
+      end
+
+      def timeout(arg=nil)
+        set_or_return(
+          :timeout,
+          arg,
+          :kind_of => [ Integer ]
+        )
+      end
+    end
+  end
+end

data/lib/chef/resource/easy_install_package.rb

@@ -22,10 +22,11 @@ class Chef
   class Resource
     class EasyInstallPackage < Chef::Resource::Package
 
+      provides :easy_install_package
+
       def initialize(name, run_context=nil)
         super
         @resource_name = :easy_install_package
-        @provider = Chef::Provider::Package::EasyInstall
       end
 
       def easy_install_binary(arg=nil)

data/lib/chef/resource/erl_call.rb

@@ -18,6 +18,7 @@
 #
 
 require 'chef/resource'
+require 'chef/provider/erl_call'
 
 class Chef
   class Resource

data/lib/chef/resource/execute.rb

@@ -18,6 +18,7 @@
 #
 
 require 'chef/resource'
+require 'chef/provider/execute'
 
 class Chef
   class Resource
@@ -35,12 +36,12 @@ class Chef
         @cwd = nil
         @environment = nil
         @group = nil
-        @path = nil
         @returns = 0
         @timeout = nil
         @user = nil
         @allowed_actions.push(:run)
         @umask = nil
+        @default_guard_interpreter = :execute
       end
 
       def umask(arg=nil)
@@ -93,14 +94,6 @@ class Chef
         )
       end
 
-      def path(arg=nil)
-        set_or_return(
-          :path,
-          arg,
-          :kind_of => [ Array ]
-        )
-      end
-
       def returns(arg=nil)
         set_or_return(
           :returns,
@@ -125,6 +118,30 @@ class Chef
         )
       end
 
+      def self.set_guard_inherited_attributes(*inherited_attributes)
+        @class_inherited_attributes = inherited_attributes
+      end
+
+      def self.guard_inherited_attributes(*inherited_attributes)
+        # Similar to patterns elsewhere, return attributes from this
+        # class and superclasses as a form of inheritance
+        ancestor_attributes = []
+
+        if superclass.respond_to?(:guard_inherited_attributes)
+          ancestor_attributes = superclass.guard_inherited_attributes
+        end
+
+        ancestor_attributes.concat(@class_inherited_attributes ? @class_inherited_attributes : []).uniq
+      end
+
+      set_guard_inherited_attributes(
+       :cwd,
+       :environment,
+       :group,
+       :user,
+       :umask
+       )
+
     end
   end
 end

data/lib/chef/resource/file.rb

@@ -19,7 +19,6 @@
 
 require 'chef/resource'
 require 'chef/platform/query_helpers'
-require 'chef/provider/file'
 require 'chef/mixin/securable'
 
 class Chef
@@ -38,7 +37,7 @@ class Chef
 
       attr_writer :checksum
 
-      provides :file, :on_platforms => :all
+      provides :file
 
       def initialize(name, run_context=nil)
         super
@@ -47,7 +46,6 @@ class Chef
         @backup = 5
         @action = "create"
         @allowed_actions.push(:create, :delete, :touch, :create_if_missing)
-        @provider = Chef::Provider::File
         @atomic_update = Chef::Config[:file_atomic_update]
         @force_unlink = false
         @manage_symlink_source = nil

data/lib/chef/resource/freebsd_package.rb

@@ -29,51 +29,38 @@ class Chef
     class FreebsdPackage < Chef::Resource::Package
       include Chef::Mixin::ShellOut
 
-      provides :package, :on_platforms => ["freebsd"]
-
-      attr_accessor :created_as_type
+      provides :package, platform: "freebsd"
 
       def initialize(name, run_context=nil)
         super
         @resource_name = :freebsd_package
-        @created_as_type = "freebsd_package"
       end
 
       def after_created
         assign_provider
       end
 
-      # This resource can be invoked with multiple names package & freebsd_package.
-      # We override the to_s method to ensure the key in resource collection
-      # matches the type resource is declared as using created_as_type. This
-      # logic can be removed once Chef does this for all resource in Chef 12:
-      # https://github.com/opscode/chef/issues/1817
-      def to_s
-        "#{created_as_type}[#{name}]"
+      def supports_pkgng?
+        ships_with_pkgng? || !!shell_out!("make -V WITH_PKGNG", :env => nil).stdout.match(/yes/i)
       end
 
       private
 
+      def ships_with_pkgng?
+        # It was not until __FreeBSD_version 1000017 that pkgng became
+        # the default binary package manager. See '/usr/ports/Mk/bsd.port.mk'.
+        node.automatic[:os_version].to_i >= 1000017
+      end
+
       def assign_provider
         @provider = if @source.to_s =~ /^ports$/i
                       Chef::Provider::Package::Freebsd::Port
-                    elsif ships_with_pkgng? || supports_pkgng?
+                    elsif supports_pkgng?
                       Chef::Provider::Package::Freebsd::Pkgng
                     else
                       Chef::Provider::Package::Freebsd::Pkg
                     end
       end
-
-      def ships_with_pkgng?
-        # It was not until __FreeBSD_version 1000017 that pkgng became
-        # the default binary package manager. See '/usr/ports/Mk/bsd.port.mk'.
-        node[:os_version].to_i >= 1000017
-      end
-
-      def supports_pkgng?
-        !!shell_out!("make -V WITH_PKGNG", :env => nil).stdout.match(/yes/i)
-      end
-
     end
   end
 end