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

data/lib/chef/provider/user/pw.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.
@@ -34,20 +34,20 @@ class Chef
           run_command(:command => command)
           modify_password
         end
-        
+
         def manage_user
           command = "pw usermod"
           command << set_options
           run_command(:command => command)
           modify_password
         end
-        
+
         def remove_user
           command = "pw userdel #{@new_resource.username}"
           command << " -r" if @new_resource.supports[:manage_home]
           run_command(:command => command)
         end
-        
+
         def check_lock
           case @current_resource.password
           when /^\*LOCKED\*/
@@ -57,18 +57,18 @@ class Chef
           end
           @locked
         end
-        
+
         def lock_user
           run_command(:command => "pw lock #{@new_resource.username}")
         end
-        
+
         def unlock_user
           run_command(:command => "pw unlock #{@new_resource.username}")
         end
-        
+
         def set_options
           opts = " #{@new_resource.username}"
-          
+
           field_list = {
             'comment' => "-c",
             'home' => "-d",
@@ -91,7 +91,7 @@ class Chef
           end
           opts
         end
-      
+
         def modify_password
           if @current_resource.password != @new_resource.password
             Chef::Log.debug("#{new_resource} updating password")
@@ -99,7 +99,7 @@ class Chef
             status = popen4(command, :waitlast => true) do |pid, stdin, stdout, stderr|
               stdin.puts "#{@new_resource.password}"
             end
-            
+
             unless status.exitstatus == 0
               raise Chef::Exceptions::User, "pw failed - #{status.inspect}!"
             end

data/lib/chef/provider/user/useradd.rb

@@ -124,7 +124,7 @@ class Chef
         end
 
         def update_options(field, option, opts)
-          if @current_resource.send(field) != new_resource.send(field)
+          if @current_resource.send(field).to_s != new_resource.send(field).to_s
             if new_resource.send(field)
               Chef::Log.debug("#{new_resource} setting #{field} to #{new_resource.send(field)}")
               opts << option << new_resource.send(field).to_s

data/lib/chef/provider/user/windows.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.
@@ -71,23 +71,23 @@ class Chef
         def create_user
           @net_user.add(set_options)
         end
-        
+
         def manage_user
           @net_user.update(set_options)
         end
-        
+
         def remove_user
           @net_user.delete
         end
-        
+
         def check_lock
           @net_user.check_enabled
         end
-        
+
         def lock_user
           @net_user.disable_account
         end
-        
+
         def unlock_user
           @net_user.enable_account
         end

data/lib/chef/provider/windows_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.
@@ -24,7 +24,7 @@ class Chef
     class WindowsScript < Chef::Provider::Script
 
       protected
-      
+
       include Chef::Mixin::WindowsArchitectureHelper
 
       def initialize( new_resource, run_context, script_extension='')
@@ -43,14 +43,14 @@ class Chef
       end
 
       public
-      
+
       def action_run
         wow64_redirection_state = nil
 
         if @is_wow64
           wow64_redirection_state = disable_wow64_file_redirection(@run_context.node)
         end
-        
+
         begin
           super
         rescue
@@ -61,11 +61,11 @@ class Chef
           end
         end
       end
-        
+
       def script_file
         base_script_name = "chef-script"
         temp_file_arguments = [ base_script_name, @script_extension ]
-        
+
         @script_file ||= Tempfile.open(temp_file_arguments)
       end
     end

data/lib/chef/providers.rb

@@ -21,6 +21,7 @@ require 'chef/provider/breakpoint'
 require 'chef/provider/cookbook_file'
 require 'chef/provider/cron'
 require 'chef/provider/cron/solaris'
+require 'chef/provider/cron/aix'
 require 'chef/provider/deploy'
 require 'chef/provider/directory'
 require 'chef/provider/env'
@@ -64,6 +65,7 @@ require 'chef/provider/package/yum'
 require 'chef/provider/package/zypper'
 require 'chef/provider/package/solaris'
 require 'chef/provider/package/smartos'
+require 'chef/provider/package/aix'
 
 require 'chef/provider/service/arch'
 require 'chef/provider/service/debian'
@@ -97,6 +99,7 @@ require 'chef/provider/group/usermod'
 require 'chef/provider/group/windows'
 
 require 'chef/provider/mount/mount'
+require 'chef/provider/mount/aix'
 require 'chef/provider/mount/windows'
 
 require 'chef/provider/deploy/revision'
@@ -117,3 +120,4 @@ require 'chef/provider/template/content'
 
 require 'chef/provider/ifconfig/redhat'
 require 'chef/provider/ifconfig/debian'
+require 'chef/provider/ifconfig/aix'

data/lib/chef/recipe.rb

@@ -81,26 +81,9 @@ class Chef
       run_context.resource_collection.find(*args)
     end
 
-    # Sets a tag, or list of tags, for this node.  Syntactic sugar for
-    # run_context.node[:tags].
-    #
-    # With no arguments, returns the list of tags.
-    #
-    # === Parameters
-    # tags<Array>:: A list of tags to add - can be a single string
-    #
-    # === Returns
-    # tags<Array>:: The contents of run_context.node[:tags]
+    # This was moved to Chef::Node#tag, redirecting here for compatability
     def tag(*tags)
-      if tags.length > 0
-        tags.each do |tag|
-          tag = tag.to_s
-          run_context.node.normal[:tags] << tag unless run_context.node[:tags].include?(tag)
-        end
-        run_context.node[:tags]
-      else
-        run_context.node[:tags]
-      end
+      run_context.node.tag(*tags)
     end
 
     # Returns true if the node is tagged with *all* of the supplied +tags+.

data/lib/chef/resource/apt_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.
@@ -22,7 +22,7 @@ require 'chef/provider/package/apt'
 class Chef
   class Resource
     class AptPackage < Chef::Resource::Package
-      
+
       def initialize(name, run_context=nil)
         super
         @resource_name = :apt_package

data/lib/chef/resource/bash.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 Bash < Chef::Resource::Script
-      
+
       def initialize(name, run_context=nil)
         super
         @resource_name = :bash

data/lib/chef/resource/batch.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,11 +21,11 @@ require 'chef/resource/windows_script'
 class Chef
   class Resource
     class Batch < Chef::Resource::WindowsScript
-      
+
       def initialize(name, run_context=nil)
         super(name, run_context, :batch, "cmd.exe")
       end
-      
+
     end
   end
 end

data/lib/chef/resource/bff_package.rb

@@ -0,0 +1,36 @@
+#
+# Author:: Deepali Jagtap (<deepali.jagtap@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.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'chef/resource/package'
+require 'chef/provider/package/aix'
+
+class Chef
+  class Resource
+    class BffPackage < Chef::Resource::Package
+
+      def initialize(name, run_context=nil)
+        super
+        @resource_name = :bff_package
+        @provider = Chef::Provider::Package::Aix
+      end
+
+    end
+  end
+end
+
+

data/lib/chef/resource/breakpoint.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.
@@ -22,7 +22,7 @@ require 'chef/resource'
 class Chef
   class Resource
     class Breakpoint < Chef::Resource
-      
+
       def initialize(action="break", *args)
         @name = caller.first
         super(@name, *args)

data/lib/chef/resource/cron.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 Cron < Chef::Resource
-      
+
       identity_attr :command
 
       state_attrs :minute, :hour, :day, :month, :weekday, :user
@@ -186,9 +186,9 @@ class Chef
           :kind_of => Hash
         )
       end
-      
+
       private
-      
+
       # On Ruby 1.8, Kernel#Integer will happily do this for you. On 1.9, no.
       def integerize(integerish)
         Integer(integerish)

data/lib/chef/resource/csh.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 Csh < Chef::Resource::Script
-      
+
       def initialize(name, run_context=nil)
         super
         @resource_name = :csh

data/lib/chef/resource/deploy.rb

@@ -50,9 +50,9 @@ class Chef
     # release directory. Callback files can contain chef code (resources, etc.)
     #
     class Deploy < Chef::Resource
-      
+
       provider_base Chef::Provider::Deploy
-      
+
       identity_attr :repository
 
       state_attrs :deploy_to, :revision
@@ -389,7 +389,7 @@ class Chef
         arg ||= block
         set_or_return(:after_restart, arg, :kind_of => [Proc, String])
       end
-      
+
       def additional_remotes(arg=nil)
         set_or_return(
           :additional_remotes,
@@ -398,6 +398,19 @@ class Chef
         )
       end
 
+      # FIXME The Deploy resource may be passed to an SCM provider as its
+      # resource.  The SCM provider knows that SCM resources can specify a
+      # timeout for SCM operations. The deploy resource must therefore support
+      # a timeout method, but the timeout it describes is for SCM operations,
+      # not the overall deployment. This is potentially confusing.
+      def timeout(arg=nil)
+        set_or_return(
+          :timeout,
+          arg,
+          :kind_of => Integer
+        )
+      end
+
     end
   end
 end