chef 12.0.3 → 12.1.0.rc.0

data/lib/chef/resource/chef_gem.rb

@@ -28,6 +28,7 @@ class Chef
       def initialize(name, run_context=nil)
         super
         @resource_name = :chef_gem
+        @compile_time = Chef::Config[:chef_gem_compile_time]
         @gem_binary = RbConfig::CONFIG['bindir'] + "/gem"
       end
 
@@ -40,13 +41,29 @@ class Chef
         @gem_binary
       end
 
+      def compile_time(arg=nil)
+        set_or_return(
+          :compile_time,
+          arg,
+          :kind_of => [ TrueClass, FalseClass ]
+        )
+      end
+
       def after_created
         # Chef::Resource.run_action: Caveat: this skips Chef::Runner.run_action, where notifications are handled
         # Action could be an array of symbols, but probably won't (think install + enable for a package)
-        Array(@action).each do |action|
-          self.run_action(action)
+        if compile_time.nil?
+          Chef::Log.deprecation "#{self} chef_gem compile_time installation is deprecated"
+          Chef::Log.deprecation "#{self} Please set `compile_time false` on the resource to use the new behavior."
+          Chef::Log.deprecation "#{self} or set `compile_time true` on the resource if compile_time behavior is required."
+        end
+
+        if compile_time || compile_time.nil?
+          Array(action).each do |action|
+            self.run_action(action)
+          end
+          Gem.clear_paths
         end
-        Gem.clear_paths
       end
     end
   end

data/lib/chef/resource/conditional.rb

@@ -17,7 +17,7 @@
 #
 
 require 'chef/mixin/shell_out'
-require 'chef/guard_interpreter/resource_guard_interpreter'
+require 'chef/guard_interpreter'
 
 class Chef
   class Resource
@@ -55,8 +55,8 @@ class Chef
 
       def configure
         case @command
-        when String
-          @guard_interpreter = new_guard_interpreter(@parent_resource, @command, @command_opts, &@block)
+        when String,Array
+          @guard_interpreter = Chef::GuardInterpreter.for_resource(@parent_resource, @command, @command_opts)
           @block = nil
         when nil
           # We should have a block if we get here
@@ -122,17 +122,6 @@ class Chef
           "#{@positivity} { #code block }"
         end
       end
-
-      private
-
-      def new_guard_interpreter(parent_resource, command, opts)
-        if parent_resource.guard_interpreter == :default
-          guard_interpreter = Chef::GuardInterpreter::DefaultGuardInterpreter.new(command, opts)
-        else
-          guard_interpreter = Chef::GuardInterpreter::ResourceGuardInterpreter.new(parent_resource, command, opts)
-        end
-      end
-
     end
   end
 end

data/lib/chef/resource/dsc_script.rb

@@ -29,6 +29,7 @@ class Chef
         @allowed_actions.push(:run)
         @action = :run
         @resource_name = :dsc_script
+        @imports = {}
       end
 
       def code(arg=nil)
@@ -89,6 +90,19 @@ class Chef
         )
       end
 
+      def imports(module_name=nil, *args)
+        if module_name
+          @imports[module_name] ||= []
+          if args.length == 0
+            @imports[module_name] << '*'
+          else
+            @imports[module_name].push(*args)
+          end
+        else
+          @imports
+        end
+      end
+
       def flags(arg=nil)
         set_or_return(
           :flags,

data/lib/chef/resource/execute.rb

@@ -26,6 +26,12 @@ class Chef
 
       identity_attr :command
 
+      # The ResourceGuardInterpreter wraps a resource's guards in another resource.  That inner resource
+      # needs to behave differently during (for example) why_run mode, so we flag it here. For why_run mode
+      # we still want to execute the guard resource even if we are not executing the wrapping resource.
+      # Only execute resources (and subclasses) can be guard interpreters.
+      attr_accessor :is_guard_interpreter
+
       def initialize(name, run_context=nil)
         super
         @resource_name = :execute
@@ -43,6 +49,7 @@ class Chef
         @allowed_actions.push(:run)
         @umask = nil
         @default_guard_interpreter = :execute
+        @is_guard_interpreter = false
       end
 
       def umask(arg=nil)
@@ -117,7 +124,7 @@ class Chef
         set_or_return(
           :timeout,
           arg,
-          :kind_of => [ Integer ]
+          :kind_of => [ Integer, Float ]
         )
       end
 
@@ -146,12 +153,12 @@ class Chef
       end
 
       set_guard_inherited_attributes(
-       :cwd,
-       :environment,
-       :group,
-       :user,
-       :umask
-       )
+        :cwd,
+        :environment,
+        :group,
+        :user,
+        :umask
+      )
 
     end
   end

data/lib/chef/resource/file.rb

@@ -20,6 +20,7 @@
 require 'chef/resource'
 require 'chef/platform/query_helpers'
 require 'chef/mixin/securable'
+require 'chef/resource/file/verification'
 
 class Chef
   class Resource
@@ -50,6 +51,7 @@ class Chef
         @force_unlink = false
         @manage_symlink_source = nil
         @diff = nil
+        @verifications = []
       end
 
       def content(arg=nil)
@@ -115,6 +117,18 @@ class Chef
           :kind_of => [ TrueClass, FalseClass ]
         )
       end
+
+      def verify(command=nil, opts={}, &block)
+        if ! (command.nil? || [String, Symbol].include?(command.class))
+          raise ArgumentError, "verify requires either a string, symbol, or a block"
+        end
+
+        if command || block_given?
+          @verifications << Verification.new(self, command, opts, &block)
+        else
+          @verifications
+        end
+      end
     end
   end
 end

data/lib/chef/resource/file/verification.rb

@@ -0,0 +1,122 @@
+#
+# Author:: Steven Danna (<steve@chef.io>)
+# 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'
+require 'chef/guard_interpreter'
+require 'chef/mixin/descendants_tracker'
+
+class Chef
+  class Resource
+    class File < Chef::Resource
+
+      #
+      # See RFC 027 for a full specification
+      #
+      # File verifications allow user-supplied commands a means of
+      # preventing file reosurce content deploys.  Their intended use
+      # is to verify the contents of a temporary file before it is
+      # deployed onto the system.
+      #
+      # Similar to not_if and only_if, file verifications can take a
+      # ruby block, which will be called, or a string, which will be
+      # executed as a Shell command.
+      #
+      # Additonally, Chef or third-party verifications can ship
+      # "registered verifications" that the user can use by specifying
+      # a :symbol as the command name.
+      #
+      # To create a registered verification, create a class that
+      # inherits from Chef::Resource::File::Verification and use the
+      # provides class method to give it name.  Registered
+      # verifications are expected to supply a verify instance method
+      # that takes 2 arguments.
+      #
+      # Example:
+      # class Chef
+      #  class Resource
+      #    class File::Verification::Foo < Chef::Resource::File::Verification
+      #      provides :noop
+      #      def verify(path, opts)
+      #        #yolo
+      #        true
+      #      end
+      #    end
+      #  end
+      # end
+      #
+      #
+
+      class Verification
+        extend Chef::Mixin::DescendantsTracker
+
+        def self.provides(name)
+          @provides = name
+        end
+
+        def self.provides?(name)
+          @provides == name
+        end
+
+        def self.lookup(name)
+          c = descendants.find {|d| d.provides?(name) }
+          if c.nil?
+            raise Chef::Exceptions::VerificationNotFound.new "No file verification for #{name} found."
+          end
+          c
+        end
+
+        def initialize(parent_resource, command, opts, &block)
+          @command, @command_opts = command, opts
+          @block = block
+          @parent_resource = parent_resource
+        end
+
+        def verify(path, opts={})
+          Chef::Log.debug("Running verification[#{self}] on #{path}")
+          if @block
+            verify_block(path, opts)
+          elsif @command.is_a?(Symbol)
+            verify_registered_verification(path, opts)
+          elsif @command.is_a?(String)
+            verify_command(path, opts)
+          end
+        end
+
+        # opts is currently unused, but included in the API
+        # to support future extensions
+        def verify_block(path, opts)
+          @block.call(path)
+        end
+
+        # We reuse Chef::GuardInterpreter in order to support
+        # the same set of options that the not_if/only_if blocks do
+        def verify_command(path, opts)
+          command = @command % {:file => path}
+          interpreter = Chef::GuardInterpreter.for_resource(@parent_resource, command, @command_opts)
+          interpreter.evaluate
+        end
+
+        def verify_registered_verification(path, opts)
+          verification_class = Chef::Resource::File::Verification.lookup(@command)
+          v = verification_class.new(@parent_resource, @command, @command_opts, &@block)
+          v.verify(path, opts)
+        end
+      end
+    end
+  end
+end

data/lib/chef/resource/ips_package.rb

@@ -28,7 +28,7 @@ class Chef
       def initialize(name, run_context = nil)
         super(name, run_context)
         @resource_name = :ips_package
-        @allowed_actions = [ :install, :remove, :upgrade ]
+        @allowed_actions.push(:install, :remove, :upgrade)
         @accept_license = false
       end
 

data/lib/chef/resource/lwrp_base.rb

@@ -39,7 +39,7 @@ class Chef
         rname = filename_to_qualified_string(cookbook_name, filename)
 
         class_name = convert_to_class_name(rname)
-        if Resource.strict_const_defined?(class_name)
+        if Resource.const_defined?(class_name, false)
           Chef::Log.info("#{class_name} light-weight resource is already initialized -- Skipping loading #{filename}!")
           Chef::Log.debug("Overriding already defined LWRPs is not supported anymore starting with Chef 12.")
           resource_class = Resource.const_get(class_name)
@@ -73,16 +73,7 @@ class Chef
       # Define an attribute on this resource, including optional validation
       # parameters.
       def self.attribute(attr_name, validation_opts={})
-        # Ruby 1.8 doesn't support default arguments to blocks, but we have to
-        # use define_method with a block to capture +validation_opts+.
-        # Workaround this by defining two methods :(
-        class_eval(<<-SHIM, __FILE__, __LINE__)
-          def #{attr_name}(arg=nil)
-            _set_or_return_#{attr_name}(arg)
-          end
-        SHIM
-
-        define_method("_set_or_return_#{attr_name.to_s}".to_sym) do |arg|
+        define_method(attr_name) do |arg=nil|
           set_or_return(attr_name.to_sym, arg, validation_opts)
         end
       end

data/lib/chef/resource/macports_package.rb

@@ -20,7 +20,8 @@ class Chef
   class Resource
     class MacportsPackage < Chef::Resource::Package
 
-      provides :macports_package, os: "mac_os_x"
+      provides :macports_package
+      provides :package, os: "darwin"
 
       def initialize(name, run_context=nil)
         super

data/lib/chef/resource/openbsd_package.rb

@@ -0,0 +1,51 @@
+#
+# Authors:: AJ Christensen (<aj@opscode.com>)
+#           Richard Manyanza (<liseki@nyikacraftsmen.com>)
+#           Scott Bonds (<scott@ggr.com>)
+# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Copyright:: Copyright (c) 2014 Richard Manyanza, Scott Bonds
+# 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/resource/package'
+require 'chef/provider/package/openbsd'
+require 'chef/mixin/shell_out'
+
+class Chef
+  class Resource
+    class OpenbsdPackage < Chef::Resource::Package
+      include Chef::Mixin::ShellOut
+
+      provides :package, os: "openbsd"
+
+      def initialize(name, run_context=nil)
+        super
+        @resource_name = :openbsd_package
+      end
+
+      def after_created
+        assign_provider
+      end
+
+      private
+
+      def assign_provider
+        @provider = Chef::Provider::Package::Openbsd
+      end
+
+    end
+  end
+end
+

data/lib/chef/resource/package.rb

@@ -46,7 +46,7 @@ class Chef
         set_or_return(
           :package_name,
           arg,
-          :kind_of => [ String ]
+          :kind_of => [ String, Array ]
         )
       end
 
@@ -54,7 +54,7 @@ class Chef
         set_or_return(
           :version,
           arg,
-          :kind_of => [ String ]
+          :kind_of => [ String, Array ]
         )
       end
 

data/lib/chef/resource/paludis_package.rb

@@ -28,7 +28,7 @@ class Chef
       def initialize(name, run_context=nil)
         super(name, run_context)
         @resource_name = :paludis_package
-        @allowed_actions = [ :install, :remove, :upgrade ]
+        @allowed_actions.push(:install, :remove, :upgrade)
         @timeout = 3600
       end
     end

data/lib/chef/resource/reboot.rb

@@ -28,7 +28,7 @@ class Chef
         super
         @resource_name = :reboot
         @provider = Chef::Provider::Reboot
-        @allowed_actions = [:request_reboot, :reboot_now, :cancel]
+        @allowed_actions.push(:request_reboot, :reboot_now, :cancel)
 
         @reason = "Reboot by Chef"
         @delay_mins = 0