chef 11.6.2-x86-mingw32 → 11.8.0.rc.1-x86-mingw32

data/lib/chef/resource/ohai.rb

@@ -7,9 +7,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.
@@ -20,7 +20,7 @@
 class Chef
   class Resource
     class Ohai < Chef::Resource
-      
+
       identity_attr :name
 
       state_attrs :plugin

data/lib/chef/resource/pacman_package.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.
@@ -21,13 +21,13 @@ require 'chef/resource/package'
 class Chef
   class Resource
     class PacmanPackage < Chef::Resource::Package
-      
+
       def initialize(name, run_context=nil)
         super
         @resource_name = :pacman_package
         @provider = Chef::Provider::Package::Pacman
       end
-      
+
     end
   end
 end

data/lib/chef/resource/perl.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.
@@ -21,7 +21,7 @@ require 'chef/resource/script'
 class Chef
   class Resource
     class Perl < Chef::Resource::Script
-      
+
       def initialize(name, run_context=nil)
         super
         @resource_name = :perl

data/lib/chef/resource/portage_package.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.
@@ -21,13 +21,13 @@ require 'chef/resource/package'
 class Chef
   class Resource
     class PortagePackage < Chef::Resource::Package
-      
+
       def initialize(name, run_context=nil)
         super
         @resource_name = :portage_package
         @provider = Chef::Provider::Package::Portage
       end
-      
+
     end
   end
 end

data/lib/chef/resource/powershell_script.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.
@@ -25,7 +25,7 @@ class Chef
       def initialize(name, run_context=nil)
         super(name, run_context, :powershell_script, "powershell.exe")
       end
-      
+
     end
   end
 end

data/lib/chef/resource/python.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.
@@ -21,7 +21,7 @@ require 'chef/resource/script'
 class Chef
   class Resource
     class Python < Chef::Resource::Script
-      
+
       def initialize(name, run_context=nil)
         super
         @resource_name = :python

data/lib/chef/resource/route.rb

@@ -7,9 +7,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.
@@ -26,7 +26,7 @@ class Chef
       identity_attr :target
 
       state_attrs :netmask, :gateway
-     
+
       def initialize(name, run_context=nil)
         super
         @resource_name = :route
@@ -36,7 +36,7 @@ class Chef
         @netmask = nil
         @gateway = nil
         @metric = nil
-        @device = nil 
+        @device = nil
         @route_type = :host
         @networking = nil
         @networking_ipv6 = nil

data/lib/chef/resource/rpm_package.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.

data/lib/chef/resource/ruby.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.
@@ -21,7 +21,7 @@ require 'chef/resource/script'
 class Chef
   class Resource
     class Ruby < Chef::Resource::Script
-      
+
       def initialize(name, run_context=nil)
         super
         @resource_name = :ruby

data/lib/chef/resource/ruby_block.rb

@@ -7,9 +7,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.
@@ -20,7 +20,7 @@
 class Chef
   class Resource
     class RubyBlock < Chef::Resource
-      
+
       identity_attr :block_name
 
       def initialize(name, run_context=nil)

data/lib/chef/resource/scm.rb

@@ -23,8 +23,8 @@ class Chef
   class Resource
     class Scm < Chef::Resource
 
-      identity_attr :destination 
-      
+      identity_attr :destination
+
       state_attrs :revision
 
       def initialize(name, run_context=nil)
@@ -146,6 +146,14 @@ class Chef
         )
       end
 
+      def timeout(arg=nil)
+        set_or_return(
+          :timeout,
+          arg,
+          :kind_of => Integer
+        )
+      end
+
     end
   end
 end

data/lib/chef/resource/script.rb

@@ -7,9 +7,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.
@@ -22,7 +22,7 @@ require 'chef/resource/execute'
 class Chef
   class Resource
     class Script < Chef::Resource::Execute
-      
+
       identity_attr :command
 
       def initialize(name, run_context=nil)
@@ -33,7 +33,7 @@ class Chef
         @interpreter = nil
         @flags = nil
       end
-      
+
       def code(arg=nil)
         set_or_return(
           :code,
@@ -41,7 +41,7 @@ class Chef
           :kind_of => [ String ]
         )
       end
-      
+
       def interpreter(arg=nil)
         set_or_return(
           :interpreter,

data/lib/chef/resource/service.rb

@@ -7,9 +7,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.
@@ -22,7 +22,7 @@ require 'chef/resource'
 class Chef
   class Resource
     class Service < Chef::Resource
-      
+
       identity_attr :service_name
 
       state_attrs :enabled, :running
@@ -47,7 +47,7 @@ class Chef
         @supports = { :restart => false, :reload => false, :status => false }
         @allowed_actions.push(:enable, :disable, :start, :stop, :restart, :reload)
       end
-      
+
       def service_name(arg=nil)
         set_or_return(
           :service_name,
@@ -55,7 +55,7 @@ class Chef
           :kind_of => [ String ]
         )
       end
-      
+
       # regex for match against ps -ef when !supports[:has_status] && status == nil
       def pattern(arg=nil)
         set_or_return(

data/lib/chef/resource/smartos_package.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.
@@ -21,16 +21,18 @@ require 'chef/provider/package/smartos'
 
 class Chef
   class Resource
-    class SmartOSPackage < Chef::Resource::Package
-        
+    class SmartosPackage < Chef::Resource::Package
+
       def initialize(name, run_context=nil)
         super
         @resource_name = :smartos_package
         @provider = Chef::Provider::Package::SmartOS
       end
-      
+
     end
   end
 end
 
-
+# Backwards compatability
+# @todo remove in Chef 12
+Chef::Resource::SmartOSPackage = Chef::Resource::SmartosPackage

data/lib/chef/resource/solaris_package.rb

@@ -1,14 +1,15 @@
 #
 # Author:: Toomas Pelberg (<toomasp@gmx.net>)
-# Copyright:: Copyright (c) 2010 Opscode, Inc.
+# Author:: Prabhu Das (<prabhu.das@clogeny.com>)
+# Copyright:: Copyright (c) 2013 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.
@@ -22,13 +23,13 @@ require 'chef/provider/package/solaris'
 class Chef
   class Resource
     class SolarisPackage < Chef::Resource::Package
-        
-      def initialize(name, collection=nil, node=nil)
-        super(name, collection, node)
+
+      def initialize(name, run_context=nil)
+        super
         @resource_name = :solaris_package
         @provider = Chef::Provider::Package::Solaris
       end
-      
+
     end
   end
 end

data/lib/chef/resource/subversion.rb

@@ -7,9 +7,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.
@@ -31,7 +31,7 @@ class Chef
         @provider = Chef::Provider::Subversion
         allowed_actions << :force_export
       end
-      
+
     end
   end
 end

data/lib/chef/resource/timestamped_deploy.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.
@@ -18,9 +18,9 @@
 
 class Chef
   class Resource
-    
+
     # Convenience class for using the deploy resource with the timestamped
-    # deployment strategy (provider) 
+    # deployment strategy (provider)
     class TimestampedDeploy < Chef::Resource::Deploy
       def initialize(*args, &block)
         super(*args, &block)

data/lib/chef/resource/user.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.
@@ -25,7 +25,7 @@ class Chef
       identity_attr :username
 
       state_attrs :uid, :gid, :home
-      
+
       def initialize(name, run_context=nil)
         super
         @resource_name = :user
@@ -40,13 +40,13 @@ class Chef
         @manage_home = false
         @non_unique = false
         @action = :create
-        @supports = { 
+        @supports = {
           :manage_home => false,
           :non_unique => false
         }
         @allowed_actions.push(:create, :remove, :modify, :manage, :lock, :unlock)
       end
-      
+
       def username(arg=nil)
         set_or_return(
           :username,
@@ -54,7 +54,7 @@ class Chef
           :kind_of => [ String ]
         )
       end
-      
+
       def comment(arg=nil)
         set_or_return(
           :comment,
@@ -62,7 +62,7 @@ class Chef
           :kind_of => [ String ]
         )
       end
-      
+
       def uid(arg=nil)
         set_or_return(
           :uid,
@@ -70,7 +70,7 @@ class Chef
           :kind_of => [ String, Integer ]
         )
       end
-      
+
       def gid(arg=nil)
         set_or_return(
           :gid,
@@ -78,9 +78,9 @@ class Chef
           :kind_of => [ String, Integer ]
         )
       end
-      
+
       alias_method :group, :gid
-      
+
       def home(arg=nil)
         set_or_return(
           :home,
@@ -88,7 +88,7 @@ class Chef
           :kind_of => [ String ]
         )
       end
-      
+
       def shell(arg=nil)
         set_or_return(
           :shell,
@@ -96,7 +96,7 @@ class Chef
           :kind_of => [ String ]
         )
       end
-      
+
       def password(arg=nil)
         set_or_return(
           :password,
@@ -128,7 +128,7 @@ class Chef
           :kind_of => [ TrueClass, FalseClass ]
         )
       end
-      
+
     end
   end
 end