chef 10.34.6-x86-mingw32 → 11.6.2-x86-mingw32

data/lib/chef/provider/package/rpm.rb

@@ -60,7 +60,7 @@ class Chef
             status = popen4("rpm -qp --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' #{@new_resource.source}") do |pid, stdin, stdout, stderr|
               stdout.each do |line|
                 case line
-                when /^([\w\d_.-]+)\s([\w\d_.-]+)$/
+                when /([\w\d_.-]+)\s([\w\d_.-]+)/
                   @current_resource.package_name($1)
                   @new_resource.version($2)
                 end
@@ -77,7 +77,7 @@ class Chef
           @rpm_status = popen4("rpm -q --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' #{@current_resource.package_name}") do |pid, stdin, stdout, stderr|
             stdout.each do |line|
               case line
-              when /^([\w\d_.-]+)\s([\w\d_.-]+)$/
+              when /([\w\d_.-]+)\s([\w\d_.-]+)/
                 Chef::Log.debug("#{@new_resource} current version is #{$2}")
                 @current_resource.version($2)
               end

data/lib/chef/provider/package/rubygems.rb

@@ -425,6 +425,9 @@ class Chef
           # URI.parse gets confused by MS Windows paths with forward slashes.
           scheme = nil if scheme =~ /^[a-z]$/
           %w{http https}.include?(scheme)
+        rescue URI::InvalidURIError
+          Chef::Log.debug("#{@new_resource} failed to parse source '#{@new_resource.source}' as a URI, assuming a local path")
+          false
         end
 
         def current_version
@@ -534,7 +537,7 @@ class Chef
           if version
             shell_out!("#{gem_binary_path} install #{name} -q --no-rdoc --no-ri -v \"#{version}\"#{src}#{opts}", :env=>nil)
           else
-            shell_out!("#{gem_binary_path} install #{name} -q --no-rdoc --no-ri #{src}#{opts}", :env=>nil)
+            shell_out!("#{gem_binary_path} install \"#{name}\" -q --no-rdoc --no-ri #{src}#{opts}", :env=>nil)
           end
         end
 

data/lib/chef/provider/package/smartos.rb

@@ -2,6 +2,7 @@
 # Authors:: Trevor O (trevoro@joyent.com)
 #           Bryan McLellan (btm@loftninjas.org)
 #           Matthew Landauer (matthew@openaustralia.org)
+#           Ben Rockwood (benr@joyent.com)
 # Copyright:: Copyright (c) 2009 Bryan McLellan, Matthew Landauer
 # License:: Apache License, Version 2.0
 #
@@ -17,10 +18,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# Notes
-#
-#  * Supports installing using a local package name
-#  * Otherwise reverts to installing from the pkgsrc repositories URL
 
 require 'chef/provider/package'
 require 'chef/mixin/shell_out'
@@ -36,47 +33,61 @@ class Chef
 
 
         def load_current_resource
-					Chef::Log.debug("#{@new_resource} loading current resource")
-					@current_resource = Chef::Resource::Package.new(@new_resource.name)
-					@current_resource.package_name(@new_resource.package_name)
-					@current_resource.version(nil)
+          Chef::Log.debug("#{@new_resource} loading current resource")
+          @current_resource = Chef::Resource::Package.new(@new_resource.name)
+          @current_resource.package_name(@new_resource.package_name)
+          @current_resource.version(nil)
           check_package_state(@new_resource.package_name)
-					@current_resource # modified by check_package_state
-				end
-				
-				def check_package_state(name)
-					Chef::Log.debug("#{@new_resource} checking package #{name}")
-					# XXX
-					version = nil
-					info = shell_out!("pkg_info -E \"#{name}*\"", :env => nil, :returns => [0,1])
-					
-					if info.stdout
-						version = info.stdout[/^#{@new_resource.package_name}-(.+)/, 1]
+          @current_resource # modified by check_package_state
+        end
+
+        def check_package_state(name)
+          Chef::Log.debug("#{@new_resource} checking package #{name}")
+          version = nil
+          info = shell_out!("/opt/local/sbin/pkg_info -E \"#{name}*\"", :env => nil, :returns => [0,1])
+
+          if info.stdout
+            version = info.stdout[/^#{@new_resource.package_name}-(.+)/, 1]
           end
 
-					if !version
-						@current_resource.version(nil)
-					else
-						@current_resource.version(version)
-					end
+          if !version
+            @current_resource.version(nil)
+          else
+            @current_resource.version(version)
+          end
         end
 
+        def candidate_version
+          return @candidate_version if @candidate_version
+          name = nil
+          version = nil
+          pkg = shell_out!("/opt/local/bin/pkgin se #{new_resource.package_name}", :env => nil, :returns => [0,1])
+          pkg.stdout.each_line do |line|
+            case line
+            when /^#{name}/
+              name, version = line.split[0].split(/-([^-]+)$/)
+            end
+          end
+          @candidate_version = version
+          version
+        end
+     
         def install_package(name, version)
-					Chef::Log.debug("#{@new_resource} installing package #{name}-#{version}")
-					package = "#{name}-#{version}"
-          out = shell_out!("pkgin -y install #{package}", :env => nil)
+          Chef::Log.debug("#{@new_resource} installing package #{name} version #{version}")
+          package = "#{name}-#{version}"
+          out = shell_out!("/opt/local/bin/pkgin -y install #{package}", :env => nil)
         end
 
-				def upgrade_package(name, version)
-					Chef::Log.debug("#{@new_resource} upgrading package #{name}-#{version}")
-					install_package(name, version)
-				end
+        def upgrade_package(name, version)
+          Chef::Log.debug("#{@new_resource} upgrading package #{name} version #{version}")
+          install_package(name, version)
+        end
 
-				def remove_package(name, version)
-					Chef::Log.debug("#{@new_resource} removing package #{name}-#{version}")
-					package = "#{name}-#{version}"
-          out = shell_out!("pkgin -y remove #{package}", :env => nil)
-				end
+        def remove_package(name, version)
+          Chef::Log.debug("#{@new_resource} removing package #{name} version #{version}") 
+          package = "#{name}"
+          out = shell_out!("/opt/local/bin/pkgin -y remove #{package}", :env => nil)
+        end
 
       end
     end

data/lib/chef/provider/package/zypper.rb

@@ -1,14 +1,17 @@
+# -*- coding: utf-8 -*-
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
+# Authors:: Adam Jacob (<adam@opscode.com>)
+#           Ionuț Arțăriși (<iartarisi@suse.cz>)
 # Copyright:: Copyright (c) 2008 Opscode, Inc.
+#             Copyright (c) 2013 SUSE Linux GmbH
 # 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.
@@ -19,14 +22,16 @@
 require 'chef/provider/package'
 require 'chef/mixin/command'
 require 'chef/resource/package'
+require 'chef/mixin/shell_out'
 require 'singleton'
 
 class Chef
   class Provider
     class Package
-      class Zypper < Chef::Provider::Package  
-      
- 
+      class Zypper < Chef::Provider::Package
+
+        include Chef::Mixin::ShellOut
+
         def load_current_resource
           @current_resource = Chef::Resource::Package.new(@new_resource.name)
           @current_resource.package_name(@new_resource.package_name)
@@ -36,7 +41,7 @@ class Chef
           version=''
           oud_version=''
           Chef::Log.debug("#{@new_resource} checking zypper")
-          status = popen4("zypper info #{@new_resource.package_name}") do |pid, stdin, stdout, stderr|
+          status = popen4("zypper --non-interactive info #{@new_resource.package_name}") do |pid, stdin, stdout, stderr|
             stdout.each do |line|
               case line
               when /^Version: (.+)$/
@@ -45,7 +50,7 @@ class Chef
               when /^Installed: Yes$/
                 is_installed=true
                 Chef::Log.debug("#{@new_resource} is installed")
-                
+
               when /^Installed: No$/
                 is_installed=false
                 Chef::Log.debug("#{@new_resource} is not installed")
@@ -61,12 +66,12 @@ class Chef
             @candidate_version=version
             @current_resource.version(nil)
           end
- 
+
           if is_installed==true
             if is_out_of_date==true
               @current_resource.version(oud_version)
               @candidate_version=version
-            else 
+            else
               @current_resource.version(version)
               @candidate_version=version
             end
@@ -75,69 +80,54 @@ class Chef
           unless status.exitstatus == 0
             raise Chef::Exceptions::Package, "zypper failed - #{status.inspect}!"
           end
-          
+
           @current_resource
         end
-        
-        #Gets the zypper Version from command output (Returns Floating Point number)
+
         def zypper_version()
           `zypper -V 2>&1`.scan(/\d+/).join(".").to_f
         end
 
         def install_package(name, version)
-          if zypper_version < 1.0
-            run_command(
-              :command => "zypper install -y #{name}"
-            )
-          elsif version
-            run_command(
-              :command => "zypper -n --no-gpg-checks install -l  #{name}=#{version}"
-            )
-          else
-            run_command(
-              :command => "zypper -n --no-gpg-checks install -l  #{name}"
-            )
-          end
+          zypper_package("install --auto-agree-with-licenses", name, version)
         end
 
         def upgrade_package(name, version)
-          if zypper_version < 1.0
-            run_command(
-              :command => "zypper install -y #{name}"
-            )
-          elsif version
-            run_command(
-              :command => "zypper -n --no-gpg-checks install -l #{name}=#{version}"
-            )
-          else
-            run_command(
-              :command => "zypper -n --no-gpg-checks install -l #{name}"
-            )
-          end
+          install_package(name, version)
         end
 
         def remove_package(name, version)
+          zypper_package("remove", name, version)
+        end
+
+        def purge_package(name, version)
+          zypper_package("remove --clean-deps", name, version)
+        end
+
+        private
+        def zypper_package(command, pkgname, version)
+          version = "=#{version}" unless version.empty?
           if zypper_version < 1.0
-            run_command(
-              :command => "zypper remove -y #{name}"
-            )
-          elsif version
-            run_command(
-              :command => "zypper -n --no-gpg-checks remove  #{name}=#{version}"
-            )
+            shell_out!("zypper#{gpg_checks} #{command} -y #{pkgname}")
           else
-            run_command(
-              :command => "zypper -n --no-gpg-checks remove  #{name}"
-            )
+            shell_out!("zypper --non-interactive#{gpg_checks} "+
+                      "#{command} #{pkgname}#{version}")
           end
-            
-         
         end
-      
-        def purge_package(name, version)
-          remove_package(name, version)
+
+        def gpg_checks()
+          case Chef::Config[:zypper_check_gpg]
+          when true
+            ""
+          when false
+            " --no-gpg-checks"
+          when nil
+            Chef::Log.warn("Chef::Config[:zypper_check_gpg] was not set. " +
+              "All packages will be installed without gpg signature checks. " +
+              "This is a security hazard.")
+            " --no-gpg-checks"
+          end
         end
-      
       end
     end
   end

data/lib/chef/provider/powershell_script.rb

@@ -0,0 +1,77 @@
+#
+# Author:: Adam Edwards (<adamed@opscode.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/provider/windows_script'
+
+class Chef
+  class Provider
+    class PowershellScript < Chef::Provider::WindowsScript
+
+      protected
+      
+      EXIT_STATUS_NORMALIZATION_SCRIPT = "\nif ($? -eq $true) {exit 0} elseif ( $LASTEXITCODE -ne 0) {exit $LASTEXITCODE} else { exit 1 }"
+      EXIT_STATUS_RESET_SCRIPT = "$LASTEXITCODE=0\n"
+
+      # Process exit codes are strange with PowerShell. Unless you
+      # explicitly call exit in Powershell, the powershell.exe
+      # interpreter returns only 0 for success or 1 for failure. Since
+      # we'd like to get specific exit codes from executable tools run
+      # with Powershell, we do some work using the automatic variables
+      # $? and $LASTEXITCODE to return the process exit code of the
+      # last process run in the script if it is the last command
+      # executed, otherwise 0 or 1 based on whether $? is set to true
+      # (success, where we return 0) or false (where we return 1).
+      def NormalizeScriptExitStatus( code )
+        @code = (! code.nil?) ? ( EXIT_STATUS_RESET_SCRIPT + code + EXIT_STATUS_NORMALIZATION_SCRIPT ) : nil
+      end
+
+      public
+      
+      def initialize (new_resource, run_context)
+        super(new_resource, run_context, '.ps1')
+        NormalizeScriptExitStatus(new_resource.code)
+      end
+      
+      def flags
+        default_flags = [
+          "-NoLogo",
+          "-NonInteractive",
+          "-NoProfile",
+          "-ExecutionPolicy RemoteSigned",
+          # Powershell will hang if STDIN is redirected
+          # http://connect.microsoft.com/PowerShell/feedback/details/572313/powershell-exe-can-hang-if-stdin-is-redirected
+          "-InputFormat None",
+          # Must use -File rather than -Command to launch the script
+          # file created by the base class that contains the script
+          # code -- otherwise, powershell.exe does not propagate the
+          # error status of a failed Windows process that ran at the
+          # end of the script, it gets changed to '1'.                         
+          "-File"                         
+        ]
+
+        interpreter_flags = default_flags.join(' ')
+
+        if ! (@new_resource.flags.nil?)
+          interpreter_flags = [@new_resource.flags, interpreter_flags].join(' ')
+        end
+
+        interpreter_flags
+      end
+    end
+  end
+end

data/lib/chef/provider/registry_key.rb

@@ -0,0 +1,156 @@
+#
+# Author:: Prajakta Purohit (<prajakta@opscode.com>)
+# Author:: Lamont Granquist (<lamont@opscode.com>)
+#
+# Copyright:: 2011, Opscode, Inc.
+#
+# 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/config'
+require 'chef/log'
+require 'chef/resource/file'
+require 'chef/mixin/checksum'
+require 'chef/provider'
+require 'etc'
+require 'fileutils'
+require 'chef/scan_access_control'
+require 'chef/mixin/shell_out'
+require 'chef/win32/registry'
+
+class Chef
+
+  class Provider
+    class RegistryKey < Chef::Provider
+      include Chef::Mixin::Checksum
+      include Chef::Mixin::ShellOut
+
+      def whyrun_supported?
+        true
+      end
+
+      def running_on_windows!
+        unless Chef::Platform.windows?
+          raise Chef::Exceptions::Win32NotWindows, "Attempt to manipulate the windows registry on a non-windows node"
+        end
+      end
+
+      def load_current_resource
+        running_on_windows!
+        @current_resource ||= Chef::Resource::RegistryKey.new(@new_resource.key, run_context)
+        @current_resource.key(@new_resource.key)
+        @current_resource.architecture(@new_resource.architecture)
+        @current_resource.recursive(@new_resource.recursive)
+        if registry.key_exists?(@new_resource.key)
+          @current_resource.values(registry.get_values(@new_resource.key))
+        end
+        values_to_hash(@current_resource.values)
+        @current_resource
+      end
+
+      def registry
+        @registry ||= Chef::Win32::Registry.new(@run_context, @new_resource.architecture)
+      end
+
+     def values_to_hash(values)
+        if values
+         @name_hash = Hash[values.map { |val| [val[:name], val] }]
+        else
+          @name_hash = {}
+        end
+      end
+
+      def define_resource_requirements
+        requirements.assert(:create, :create_if_missing, :delete, :delete_key) do |a|
+          a.assertion{ registry.hive_exists?(@new_resource.key) }
+          a.failure_message(Chef::Exceptions::Win32RegHiveMissing, "Hive #{@new_resource.key.split("\\").shift} does not exist")
+        end
+        requirements.assert(:create) do |a|
+          a.assertion{ registry.key_exists?(@new_resource.key) }
+          a.whyrun("Key #{@new_resource.key} does not exist. Unless it would have been created before, attempt to modify its values would fail.")
+        end
+        requirements.assert(:create, :create_if_missing) do |a|
+          #If keys missing in the path and recursive == false
+          a.assertion{ !registry.keys_missing?(@current_resource.key) || @new_resource.recursive }
+          a.failure_message(Chef::Exceptions::Win32RegNoRecursive, "Intermediate keys missing but recursive is set to false")
+          a.whyrun("Intermediate keys in #{@new_resource.key} go not exist. Unless they would have been created earlier, attempt to modify them would fail.")
+        end
+        requirements.assert(:delete_key) do |a|
+          #If key to be deleted has subkeys but recurssive == false
+          a.assertion{ !registry.key_exists?(@new_resource.key) || !registry.has_subkeys?(@new_resource.key) || @new_resource.recursive }
+          a.failure_message(Chef::Exceptions::Win32RegNoRecursive, "#{@new_resource.key} has subkeys but recursive is set to false.")
+          a.whyrun("#{@current_resource.key} has subkeys, but recursive is set to false. attempt to delete would fails unless subkeys were deleted prior to this action.")
+        end
+      end
+
+      def action_create
+        unless registry.key_exists?(@current_resource.key)
+          converge_by("create key #{@new_resource.key}") do
+            registry.create_key(@new_resource.key, @new_resource.recursive)
+          end
+        end
+        @new_resource.values.each do |value|
+          if @name_hash.has_key?(value[:name])
+            current_value = @name_hash[value[:name]]
+            unless current_value[:type] == value[:type] && current_value[:data] == value[:data]
+              converge_by("set value #{value}") do
+                registry.set_value(@new_resource.key, value)
+              end
+            end
+          else
+            converge_by("set value #{value}") do
+              registry.set_value(@new_resource.key, value)
+            end
+          end
+        end
+      end
+
+      def action_create_if_missing
+        unless registry.key_exists?(@new_resource.key)
+          converge_by("create key #{@new_resource.key}") do
+            registry.create_key(@new_resource.key, @new_resource.recursive)
+          end
+        end
+        @new_resource.values.each do |value|
+          unless @name_hash.has_key?(value[:name])
+            converge_by("create value #{value}") do
+              registry.set_value(@new_resource.key, value)
+            end
+          end
+        end
+      end
+
+      def action_delete
+        if registry.key_exists?(@new_resource.key)
+          @new_resource.values.each do |value|
+            if @name_hash.has_key?(value[:name])
+              converge_by("delete value #{value}") do
+                registry.delete_value(@new_resource.key, value)
+              end
+            end
+          end
+        end
+      end
+
+      def action_delete_key
+        if registry.key_exists?(@new_resource.key)
+          converge_by("delete key #{@new_resource.key}") do
+            registry.delete_key(@new_resource.key, @new_resource.recursive)
+          end
+        end
+      end
+
+    end
+  end
+end
+