RubyGems - chef - Versions diffs - 0.9.14.beta.1 → 0.9.14.rc.1 - Mend

@@ -25,21 +25,25 @@ class Chef
     extend Mixlib::Log
     class << self
-      attr_accessor :verbose
       attr_reader :verbose_logger
-      protected :verbose_logger
+      @verbose_logger = nil
+      @verbose = false
-      def verbose
-        !(@verbose_logger.nil?)
+      def verbose?
+        @verbose
       end
+      alias :verbose :verbose?
       def verbose=(value)
         if value
+          @verbose = true
           @verbose_logger ||= Logger.new(STDOUT)
           @verbose_logger.level = self.logger.level
           @verbose_logger.formatter = self.logger.formatter
         else
-          @verbose_logger = nil
+          @verbose, @verbose_logger = false, nil
         end
         self.verbose
       end
@@ -48,6 +52,7 @@ class Chef
         class_eval(<<-METHOD_DEFN, __FILE__, __LINE__)
           def #{method_name}(msg=nil, &block)
             @logger.#{method_name}(msg, &block)
+            @verbose_logger.#{method_name}(msg, &block) if verbose?
           end
         METHOD_DEFN
       end

data/lib/chef/monkey_patches/regexp.rb ADDED

@@ -0,0 +1,34 @@
+# Copyright (c) 2009 Marc-Andre Lafortune
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+class Regexp
+  # Standard in Ruby 1.8.7+. See official documentation[http://www.ruby-doc.org/core-1.8.7/classes/Regexp.html]
+  class << self
+    unless (union(%w(a b)) rescue false)
+      alias :union_without_array_argument :union
+      def union(*arg)
+        return union_without_array_argument(*arg) unless arg.size == 1
+        union_without_array_argument(*arg.first)
+      end
+    end
+  end
+end

data/lib/chef/node.rb CHANGED

@@ -32,7 +32,7 @@ require 'chef/run_list'
 require 'chef/node/attribute'
 require 'chef/index_queue'
 require 'extlib'
-require 'chef/json'
+require 'chef/json_compat'
 class Chef
   class Node

data/lib/chef/openid_registration.rb CHANGED

@@ -21,7 +21,7 @@ require 'chef/mixin/params_validate'
 require 'chef/couchdb'
 require 'chef/index_queue'
 require 'digest/sha1'
-require 'chef/json'
+require 'chef/json_compat'
 class Chef
   class OpenIDRegistration

data/lib/chef/provider/deploy/revision.rb CHANGED

@@ -16,6 +16,10 @@
 # limitations under the License.
 #
+require 'chef/provider'
+require 'chef/provider/deploy'
+require 'chef/json_compat'
 class Chef
   class Provider
     class Deploy
@@ -56,7 +60,7 @@ class Chef
         def load_cache
           begin
-            Chef::JSON.from_json(Chef::FileCache.load("revision-deploys/#{new_resource.name}"))
+            Chef::JSONCompat.from_json(Chef::FileCache.load("revision-deploys/#{new_resource.name}"))
           rescue Chef::Exceptions::FileNotFound
             sorted_releases_from_filesystem
           end

data/lib/chef/provider/erl_call.rb CHANGED

@@ -66,13 +66,29 @@ class Chef
           stdin.close
-          Chef::Log.info("Ran erl_call[#{@new_resource.name}] successfully")
           Chef::Log.debug("erl_call[#{@new_resource.name}] output: ")
-          stdout.each_line { |line| Chef::Log.debug("#{line}")}
-          stderr.each_line { |line| Chef::Log.debug("#{line}")}
+          stdout_output = ""
+          stdout.each_line { |line| stdout_output << line }
           stdout.close
+          stderr_output = ""
+          stderr.each_line { |line| stderr_output << line }
           stderr.close
+          # fail if stderr contains anything
+          if stderr_output.length > 0
+            raise Chef::Exceptions::ErlCall, stderr_output
+          end
+          # fail if the first 4 characters aren't "{ok,"
+          unless stdout_output[0..3].include?('{ok,')
+            raise Chef::Exceptions::ErlCall, stdout_output
+          end
+          Chef::Log.debug("#{stdout_output}")
+          Chef::Log.info("Ran erl_call[#{@new_resource.name}] successfully")
         ensure
           Process.wait(pid) if pid
         end

data/lib/chef/provider/package/apt.rb CHANGED

@@ -43,7 +43,7 @@ class Chef
                   @current_resource.version(installed_version)
                 end
               when /^\s{2}Candidate: (.+)$/
-                Chef::Log.debug("Current version is #{$1}")
+                Chef::Log.debug("Candidate version is #{$1}")
                 @candidate_version = $1
               end
             end

data/lib/chef/provider/package/yum.rb CHANGED

@@ -104,6 +104,26 @@ class Chef
             nil
           end
+          def version_available?(package_name, desired_version, arch)
+            if (package_data = @data[package_name])
+              if (available_versions = package_data[:available])
+                if arch
+                  matching_versions = available_versions[arch]
+                else
+                  matching_versions = available_versions.values
+                end
+                matching_versions.each do |ver|
+                  if (desired_version == "#{ver[:version]}-#{ver[:release]}")
+                    return true
+                  end
+                end
+              end
+            end
+            nil
+          end
           def installed_version(package_name, arch)
             version(package_name, :installed, arch)
           end
@@ -168,6 +188,7 @@ class Chef
           else
             @candidate_version = installed_version
           end
+          Chef::Log.debug("#{@current_resource.name}: Installed version: #{installed_version} Candidate version: #{candidate_version}")
           @current_resource
         end
@@ -178,9 +199,14 @@ class Chef
               :command => "yum -d0 -e0 -y #{@new_resource.options} localinstall #{@new_resource.source}"
             )
           else
-            run_command_with_systems_locale(
-              :command => "yum -d0 -e0 -y #{@new_resource.options} install #{name}-#{version}#{yum_arch}"
-            )
+            # Work around yum not exiting with an error if a package doesn't exist for CHEF-2062
+            if @yum.version_available?(name, version, yum_arch)
+              run_command_with_systems_locale(
+                :command => "yum -d0 -e0 -y #{@new_resource.options} install #{name}-#{version}#{yum_arch}"
+              )
+            else
+              raise ArgumentError, "#{new_resource.name}: Version #{version} of #{name} not found. Did you specify both version and release? (version-release, e.g. 1.84-10.fc6)"
+            end
           end
           @yum.flush
         end