chef 0.10.8 → 0.10.10.beta.1

data/lib/chef/resource/apt_package.rb

@@ -27,8 +27,17 @@ class Chef
         super
         @resource_name = :apt_package
         @provider = Chef::Provider::Package::Apt
+        @default_release = nil
       end
-      
+
+      def default_release(arg=nil)
+        set_or_return(
+          :default_release,
+          arg,
+          :kind_of => [ String ]
+        )
+      end
+
     end
   end
 end

data/lib/chef/resource/chef_gem.rb

@@ -0,0 +1,53 @@
+#
+# Author:: Bryan McLellan <btm@loftninjas.org>
+# Copyright:: Copyright (c) 2012 Opscode, 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/resource/package'
+require 'chef/resource/gem_package'
+
+class Chef
+  class Resource
+    class ChefGem < Chef::Resource::Package::GemPackage
+
+      provides :chef_gem, :on_platforms => :all
+
+      def initialize(name, run_context=nil)
+        super
+        @resource_name = :chef_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.
+      def gem_binary(arg=nil)
+        if arg
+          raise ArgumentError, "The chef_gem resource is restricted to the current gem environment, use gem_package to install to other environments."
+        end
+
+        nil
+      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)
+        end
+        Gem.clear_paths
+      end
+    end
+  end
+end

data/lib/chef/resource/conditional.rb

@@ -74,6 +74,9 @@ class Chef
 
       def evaluate_command
         shell_out(@command, @command_opts).status.success?
+      rescue Chef::Exceptions::CommandTimeout
+        Chef::Log.warn "Command '#{@command}' timed out"
+        false
       end
 
       def evaluate_block

data/lib/chef/resource/cookbook_file.rb

@@ -1,14 +1,15 @@
 #
 # Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Author:: Seth Chisamore (<schisamo@opscode.com>)
+# Copyright:: Copyright (c) 2008, 2011 Opscode, 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.
@@ -18,11 +19,15 @@
 
 require 'chef/resource/file'
 require 'chef/provider/cookbook_file'
+require 'chef/mixin/securable'
 
 class Chef
   class Resource
     class CookbookFile < Chef::Resource::File
-      
+      include Chef::Mixin::Securable
+
+      provides :cookbook_file, :on_platforms => :all
+
       def initialize(name, run_context=nil)
         super
         @provider = Chef::Provider::CookbookFile
@@ -30,12 +35,13 @@ 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)
       end
-      
+
       def cookbook(cookbook_name=nil)
         set_or_return(:cookbook, cookbook_name, :kind_of => String)
       end

data/lib/chef/resource/cron.rb

@@ -38,6 +38,7 @@ class Chef
         @path = nil
         @shell = nil
         @home = nil
+        @environment = {}
       end
 
       def minute(arg=nil)
@@ -172,6 +173,14 @@ class Chef
           :kind_of => String
         )
       end
+
+      def environment(arg=nil)
+        set_or_return(
+          :environment,
+          arg,
+          :kind_of => Hash
+        )
+      end
       
       private
       

data/lib/chef/resource/directory.rb

@@ -1,14 +1,15 @@
 #
 # Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Author:: Seth Chisamore (<schisamo@opscode.com>)
+# Copyright:: Copyright (c) 2008, 2011 Opscode, 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.
@@ -17,11 +18,16 @@
 #
 
 require 'chef/resource'
+require 'chef/provider/directory'
+require 'chef/mixin/securable'
 
 class Chef
   class Resource
     class Directory < Chef::Resource
-      
+      include Chef::Mixin::Securable
+
+      provides :directory, :on_platforms => :all
+
       def initialize(name, run_context=nil)
         super
         @resource_name = :directory
@@ -29,8 +35,9 @@ class Chef
         @action = :create
         @recursive = false
         @allowed_actions.push(:create, :delete)
+        @provider = Chef::Provider::Directory
       end
-      
+
       def recursive(arg=nil)
         set_or_return(
           :recursive,
@@ -38,31 +45,7 @@ class Chef
           :kind_of => [ TrueClass, FalseClass ]
         )
       end
-      
-      def group(arg=nil)
-        set_or_return(
-          :group,
-          arg,
-          :regex => Chef::Config[:group_valid_regex]
-        )
-      end
-      
-      def mode(arg=nil)
-        set_or_return(
-          :mode,
-          arg,
-          :regex => /^\d{3,4}$/
-        )
-      end
-      
-      def owner(arg=nil)
-        set_or_return(
-          :owner,
-          arg,
-          :regex => Chef::Config[:user_valid_regex]
-        )
-      end
-      
+
       def path(arg=nil)
         set_or_return(
           :path,
@@ -70,7 +53,7 @@ class Chef
           :kind_of => String
         )
       end
-      
+
     end
   end
 end

data/lib/chef/resource/execute.rb

@@ -6,9 +6,9 @@
 # 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.
@@ -47,7 +47,7 @@ class Chef
           :kind_of => [ String, Integer ]
         )
       end
-    
+
       def command(arg=nil)
         set_or_return(
           :command,
@@ -55,7 +55,7 @@ class Chef
           :kind_of => [ String ]
         )
       end
-      
+
       def creates(arg=nil)
         set_or_return(
           :creates,
@@ -63,7 +63,7 @@ class Chef
           :kind_of => [ String ]
         )
       end
-      
+
       def cwd(arg=nil)
         set_or_return(
           :cwd,
@@ -79,7 +79,9 @@ class Chef
           :kind_of => [ Hash ]
         )
       end
-      
+
+      alias :env :environment
+
       def group(arg=nil)
         set_or_return(
           :group,
@@ -95,7 +97,7 @@ class Chef
           :kind_of => [ Array ]
         )
       end
-      
+
       def returns(arg=nil)
         set_or_return(
           :returns,
@@ -103,7 +105,7 @@ class Chef
           :kind_of => [ Integer, Array ]
         )
       end
-      
+
       def timeout(arg=nil)
         set_or_return(
           :timeout,
@@ -111,7 +113,7 @@ class Chef
           :kind_of => [ Integer ]
         )
       end
-      
+
       def user(arg=nil)
         set_or_return(
           :user,

data/lib/chef/resource/file.rb

@@ -1,6 +1,7 @@
 #
 # Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Author:: Seth Chisamore (<schisamo@opscode.com>)
+# Copyright:: Copyright (c) 2008, 2011 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,11 +18,16 @@
 #
 
 require 'chef/resource'
+require 'chef/provider/file'
+require 'chef/mixin/securable'
 
 class Chef
   class Resource
     class File < Chef::Resource
-      
+      include Chef::Mixin::Securable
+
+      provides :file, :on_platforms => :all
+
       def initialize(name, run_context=nil)
         super
         @resource_name = :file
@@ -29,6 +35,7 @@ class Chef
         @backup = 5
         @action = "create"
         @allowed_actions.push(:create, :delete, :touch, :create_if_missing)
+        @provider = Chef::Provider::File
       end
 
       def content(arg=nil)
@@ -55,37 +62,6 @@ class Chef
         )
       end
 
-      def group(arg=nil)
-        set_or_return(
-          :group,
-          arg,
-          :regex => Chef::Config[:group_valid_regex]
-        )
-      end
-
-      def mode(arg=nil)
-        set_or_return(
-          :mode,
-          arg,
-          :callbacks => { 
-            "not in valid numeric range" => lambda { |m| 
-              if m.kind_of?(String)
-                m =~ /^0/ || m="0#{m}"
-              end 
-              Integer(m)<=07777 && Integer(m)>=0
-            }
-          }
-        )
-      end
-
-      def owner(arg=nil)
-        set_or_return(
-          :owner,
-          arg,
-          :regex => Chef::Config[:user_valid_regex]
-        )
-      end
-
       def path(arg=nil)
         set_or_return(
           :path,

data/lib/chef/resource/link.rb

@@ -6,9 +6,9 @@
 # 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.
@@ -17,11 +17,15 @@
 #
 
 require 'chef/resource'
+require 'chef/mixin/securable'
 
 class Chef
   class Resource
     class Link < Chef::Resource
-      
+      include Chef::Mixin::Securable
+
+       provides :link, :on_platform  => :all
+
       def initialize(name, run_context=nil)
         super
         @resource_name = :link
@@ -30,8 +34,9 @@ class Chef
         @link_type = :symbolic
         @target_file = name
         @allowed_actions.push(:create, :delete)
+        @provider = Chef::Provider::Link
       end
-      
+
       def to(arg=nil)
         set_or_return(
           :source_file,
@@ -39,7 +44,7 @@ class Chef
           :kind_of => String
         )
       end
-      
+
       def target_file(arg=nil)
         set_or_return(
           :target_file,
@@ -47,7 +52,7 @@ class Chef
           :kind_of => String
         )
       end
-      
+
       def link_type(arg=nil)
         real_arg = arg.kind_of?(String) ? arg.to_sym : arg
         set_or_return(
@@ -56,7 +61,7 @@ class Chef
           :equal_to => [ :symbolic, :hard ]
         )
       end
-      
+
       def group(arg=nil)
         set_or_return(
           :group,
@@ -64,7 +69,7 @@ class Chef
           :regex => Chef::Config[:group_valid_regex]
         )
       end
-      
+
       def owner(arg=nil)
         set_or_return(
           :owner,