chef 0.8.16 → 0.9.0.a3

data/lib/chef/resource/deploy.rb

@@ -51,9 +51,9 @@ class Chef
     class Deploy < Chef::Resource
 
       provider_base Chef::Provider::Deploy
-
-      def initialize(name, collection=nil, node=nil)
-        super(name, collection, node)
+      
+      def initialize(name, run_context=nil)
+        super
         @resource_name = :deploy
         @deploy_to = name
         @environment = nil

data/lib/chef/resource/directory.rb

@@ -21,9 +21,9 @@ require 'chef/resource'
 class Chef
   class Resource
     class Directory < Chef::Resource
-            
-      def initialize(name, collection=nil, node=nil)
-        super(name, collection, node)
+      
+      def initialize(name, run_context=nil)
+        super
         @resource_name = :directory
         @path = name
         @action = :create
@@ -73,4 +73,4 @@ class Chef
       
     end
   end
-end
+end

data/lib/chef/resource/dpkg_package.rb

@@ -22,13 +22,13 @@ require 'chef/provider/package/dpkg'
 class Chef
   class Resource
     class DpkgPackage < Chef::Resource::Package
-        
-      def initialize(name, collection=nil, node=nil)
-        super(name, collection, node)
+      
+      def initialize(name, run_context=nil)
+        super
         @resource_name = :dpkg_package
         @provider = Chef::Provider::Package::Dpkg
       end
       
     end
   end
-end
+end

data/lib/chef/resource/easy_install_package.rb

@@ -21,9 +21,9 @@ require 'chef/resource/package'
 class Chef
   class Resource
     class EasyInstallPackage < Chef::Resource::Package
-
-      def initialize(name, collection=nil, node=nil)
-        super(name, collection, node)
+      
+      def initialize(name, run_context=nil)
+        super
         @resource_name = :easy_install_package
         @provider = Chef::Provider::Package::EasyInstall
       end

data/lib/chef/resource/env.rb

@@ -0,0 +1,58 @@
+#
+# Author:: Doug MacEachern (<dougm@vmware.com>)
+# Copyright:: Copyright (c) 2010 VMware, 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.
+#
+
+class Chef
+  class Resource
+    class Env < Chef::Resource
+
+      def initialize(name, run_context=nil)
+        super
+        @resource_name = :env
+        @key_name = name
+        @value = nil
+        @action = :create
+        @delim = nil
+        @allowed_actions.push(:create, :delete, :modify)
+      end
+
+      def key_name(arg=nil)
+        set_or_return(
+          :key_name,
+          arg,
+          :kind_of => [ String ]
+        )
+      end
+
+      def value(arg=nil)
+        set_or_return(
+          :value,
+          arg,
+          :kind_of => [ String ]
+        )
+      end
+
+      def delim(arg=nil)
+        set_or_return(
+          :delim,
+          arg,
+          :kind_of => [ String ]
+        )
+      end
+    end
+  end
+end

data/lib/chef/resource/erl_call.rb

@@ -23,9 +23,9 @@ class Chef
     class ErlCall < Chef::Resource
 
       # erl_call : http://erlang.org/doc/man/erl_call.html
-
-      def initialize(name, collection=nil, node=nil)
-        super(name, collection, node)
+      
+      def initialize(name, run_context=nil)
+        super
         @resource_name = :erl_call
 
         @code = "q()." # your erlang code goes here

data/lib/chef/resource/execute.rb

@@ -21,9 +21,9 @@ require 'chef/resource'
 class Chef
   class Resource
     class Execute < Chef::Resource
-        
-      def initialize(name, collection=nil, node=nil)
-        super(name, collection, node)
+
+      def initialize(name, run_context=nil)
+        super
         @resource_name = :execute
         @command = name
         @backup = 5

data/lib/chef/resource/file.rb

@@ -21,9 +21,9 @@ require 'chef/resource'
 class Chef
   class Resource
     class File < Chef::Resource
-
-      def initialize(name, collection=nil, node=nil)
-        super(name, collection, node)
+      
+      def initialize(name, run_context=nil)
+        super
         @resource_name = :file
         @path = name
         @backup = 5

data/lib/chef/resource/freebsd_package.rb

@@ -22,9 +22,9 @@ require 'chef/provider/package/freebsd'
 class Chef
   class Resource
     class FreebsdPackage < Chef::Resource::Package
-        
-      def initialize(name, collection=nil, node=nil)
-        super(name, collection, node)
+      
+      def initialize(name, run_context=nil)
+        super
         @resource_name = :freebsd_package
         @provider = Chef::Provider::Package::Freebsd
       end

data/lib/chef/resource/gem_package.rb

@@ -21,21 +21,29 @@ require 'chef/resource/package'
 class Chef
   class Resource
     class GemPackage < Chef::Resource::Package
-        
-      def initialize(name, collection=nil, node=nil)
-        super(name, collection, node)
+      
+      def initialize(name, run_context=nil)
+        super
         @resource_name = :gem_package
         @provider = Chef::Provider::Package::Rubygems
       end
 
       # Sets a custom gem_binary to run for gem commands.
-      def gem_binary(arg=nil)
-        set_or_return(
-          :gem_binary,
-          arg,
-          :kind_of => [ String ]
-        )
+      def gem_binary(gem_cmd=nil)
+        set_or_return(:gem_binary,gem_cmd,:kind_of => [ String ])
       end
+
+      ##
+      # Options for the gem install, either a Hash or a String. When a hash is
+      # given, the options are passed to Gem::DependencyInstaller.new, and the
+      # gem will be installed via the gems API. When a String is given, the gem
+      # will be installed by shelling out to the gem command. Using a Hash of
+      # options with an explicit gem_binary will result in undefined behavior.
+      def options(opts=nil)
+        set_or_return(:options,opts,:kind_of => [String,Hash])
+      end
+
+
     end
   end
 end

data/lib/chef/resource/git.rb

@@ -22,8 +22,8 @@ class Chef
   class Resource
     class Git < Chef::Resource::Scm
       
-      def initialize(name, collection=nil, node=nil)
-        super(name, collection, node)
+      def initialize(name, run_context=nil)
+        super
         @resource_name = :git
         @provider = Chef::Provider::Git
       end
@@ -33,4 +33,4 @@ class Chef
       
     end
   end
-end
+end

data/lib/chef/resource/group.rb

@@ -19,9 +19,9 @@
 class Chef
   class Resource
     class Group < Chef::Resource
-        
-      def initialize(name, collection=nil, node=nil)
-        super(name, collection, node)
+      
+      def initialize(name, run_context=nil)
+        super
         @resource_name = :group
         @group_name = name
         @gid = nil

data/lib/chef/resource/http_request.rb

@@ -21,9 +21,9 @@ require 'chef/resource'
 class Chef
   class Resource
     class HttpRequest < Chef::Resource
-            
-      def initialize(name, collection=nil, node=nil)
-        super(name, collection, node)
+      
+      def initialize(name, run_context=nil)
+        super
         @resource_name = :http_request
         @message = name
         @url = nil
@@ -49,4 +49,4 @@ class Chef
       
     end
   end
-end
+end

data/lib/chef/resource/ifconfig.rb

@@ -21,9 +21,9 @@ require 'chef/resource'
 class Chef
   class Resource
     class Ifconfig < Chef::Resource
-
-      def initialize(name, collection=nil, node=nil)
-        super(name, collection, node)
+      
+      def initialize(name, run_context=nil)
+        super
         @resource_name = :ifconfig
         @target = name
         @action = :add

data/lib/chef/resource/link.rb

@@ -21,9 +21,9 @@ require 'chef/resource'
 class Chef
   class Resource
     class Link < Chef::Resource
-            
-      def initialize(name, collection=nil, node=nil)
-        super(name, collection, node)
+      
+      def initialize(name, run_context=nil)
+        super
         @resource_name = :link
         @to = nil
         @action = :create

data/lib/chef/resource/log.rb

@@ -39,8 +39,8 @@ class Chef
       # name<String>:: Message to log
       # collection<Array>:: Collection of included recipes
       # node<Chef::Node>:: Node where resource will be used
-      def initialize(name, collection=nil, node=nil)
-        super(name, collection, node)
+      def initialize(name, run_context=nil)
+        super
         @resource_name = :log
         @level = :info
         @action = :write

data/lib/chef/resource/macports_package.rb

@@ -19,8 +19,8 @@
 class Chef
   class Resource
     class MacportsPackage < Chef::Resource::Package
-      def initialize(name, collection = nil, node = nil)
-        super(name, collection, node)
+      def initialize(name, run_context=nil)
+        super
         @resource_name = :macports_package
         @provider = Chef::Provider::Package::Macports
       end

data/lib/chef/resource/mdadm.rb

@@ -21,9 +21,9 @@ require 'chef/resource'
 class Chef
   class Resource
     class Mdadm < Chef::Resource
-
-      def initialize(name, collection=nil, node=nil)
-        super(name, collection, node)
+      
+      def initialize(name, run_context=nil)
+        super
         @resource_name = :mdadm
 
         @chunk = 16

data/lib/chef/resource/mount.rb

@@ -22,8 +22,8 @@ class Chef
   class Resource
     class Mount < Chef::Resource
       
-      def initialize(name, collection=nil, node=nil)
-        super(name, collection, node)
+      def initialize(name, run_context=nil)
+        super
         @resource_name = :mount
         @mount_point = name
         @device = nil

data/lib/chef/resource/package.rb

@@ -21,16 +21,16 @@ require 'chef/resource'
 class Chef
   class Resource
     class Package < Chef::Resource
-        
-      def initialize(name, collection=nil, node=nil)
-        super(name, collection, node)
+      
+      def initialize(name, run_context=nil)
+        super
         @resource_name = :package
         @package_name = name
         @version = nil
         @candidate_version = nil
         @response_file = nil
         @source = nil
-        @action = "install"
+        @action = :install
         @options = nil
         @allowed_actions.push(:install, :upgrade, :remove, :purge)
       end

data/lib/chef/resource/pacman_package.rb

@@ -21,13 +21,13 @@ require 'chef/resource/package'
 class Chef
   class Resource
     class PacmanPackage < Chef::Resource::Package
-        
-      def initialize(name, collection=nil, node=nil)
-        super(name, collection, node)
+      
+      def initialize(name, run_context=nil)
+        super
         @resource_name = :pacman_package
         @provider = Chef::Provider::Package::Pacman
       end
       
     end
   end
-end
+end

data/lib/chef/resource/perl.rb

@@ -21,13 +21,13 @@ require 'chef/resource/script'
 class Chef
   class Resource
     class Perl < Chef::Resource::Script
-        
-      def initialize(name, collection=nil, node=nil)
-        super(name, collection, node)
+      
+      def initialize(name, run_context=nil)
+        super
         @resource_name = :perl
         @interpreter = "perl"
       end
 
     end
   end
-end
+end

data/lib/chef/resource/portage_package.rb

@@ -21,13 +21,13 @@ require 'chef/resource/package'
 class Chef
   class Resource
     class PortagePackage < Chef::Resource::Package
-        
-      def initialize(name, collection=nil, node=nil)
-        super(name, collection, node)
+      
+      def initialize(name, run_context=nil)
+        super
         @resource_name = :portage_package
         @provider = Chef::Provider::Package::Portage
       end
       
     end
   end
-end
+end

data/lib/chef/resource/python.rb

@@ -21,13 +21,13 @@ require 'chef/resource/script'
 class Chef
   class Resource
     class Python < Chef::Resource::Script
-        
-      def initialize(name, collection=nil, node=nil)
-        super(name, collection, node)
+      
+      def initialize(name, run_context=nil)
+        super
         @resource_name = :python
         @interpreter = "python"
       end
 
     end
   end
-end
+end

data/lib/chef/resource/remote_directory.rb

@@ -21,9 +21,9 @@ require 'chef/resource/directory'
 class Chef
   class Resource
     class RemoteDirectory < Chef::Resource::Directory
-
-      def initialize(name, collection=nil, node=nil)
-        super(name, collection, node)
+      
+      def initialize(name, run_context=nil)
+        super
         @resource_name = :remote_directory
         @path = name
         @source = ::File.basename(name)