chef 0.10.8 → 0.10.10.beta.1

data/lib/chef/mixin/shell_out.rb

@@ -23,7 +23,7 @@ class Chef
     module ShellOut
 
       def shell_out(*command_args)
-        cmd = Chef::ShellOut.new(*command_args)
+        cmd = Mixlib::ShellOut.new(*command_args)
         if STDOUT.tty? && !Chef::Config[:daemon] && Chef::Log.debug?
           cmd.live_stream = STDOUT
         end

data/lib/chef/mixin/template.rb

@@ -71,10 +71,15 @@ class Chef
         
         def source_listing
           @source_listing ||= begin
-            line_index = line_number - 1
-            beginning_line = line_index <= SOURCE_CONTEXT_WINDOW ? 0 : line_index - SOURCE_CONTEXT_WINDOW
-            source_size = SOURCE_CONTEXT_WINDOW * 2 + 1
             lines = @template.split(/\n/)
+            if line_number
+              line_index = line_number - 1
+              beginning_line = line_index <= SOURCE_CONTEXT_WINDOW ? 0 : line_index - SOURCE_CONTEXT_WINDOW
+              source_size = SOURCE_CONTEXT_WINDOW * 2 + 1
+            else
+              beginning_line = 0
+              source_size    = lines.length
+            end
             contextual_lines = lines[beginning_line, source_size]
             output = []
             contextual_lines.each_with_index do |line, index|

data/lib/chef/mixins.rb

@@ -5,11 +5,14 @@ require 'chef/mixin/command'
 require 'chef/mixin/convert_to_class_name'
 require 'chef/mixin/create_path'
 require 'chef/mixin/deep_merge'
+require 'chef/mixin/enforce_ownership_and_permissions'
 require 'chef/mixin/from_file'
 require 'chef/mixin/language'
 require 'chef/mixin/language_include_attribute'
 require 'chef/mixin/language_include_recipe'
 require 'chef/mixin/params_validate'
+require 'chef/mixin/path_sanity'
 require 'chef/mixin/recipe_definition_dsl_core'
 require 'chef/mixin/template'
+require 'chef/mixin/securable'
 require 'chef/mixin/xml_escape'

data/lib/chef/monkey_patches/moneta.rb

@@ -0,0 +1,50 @@
+#
+# Author:: Seth Chisamore (<schisamo@opscode.com>)
+# Copyright:: Copyright (c) 2011 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.
+#
+
+# ensure data is written and read in binary mode
+# stops "dump format error for symbol(0x75)" errors
+module Moneta
+  class BasicFile
+
+    def store(key, value, options = {})
+      ensure_directory_created(::File.dirname(path(key)))
+      ::File.open(path(key), "wb") do |file|
+        if @expires
+          data = {:value => value}
+          if options[:expires_in]
+            data[:expires_at] = Time.now + options[:expires_in]
+          end
+          contents = Marshal.dump(data)
+        else
+          contents = Marshal.dump(value)
+        end
+        file.puts(contents)
+      end
+    end
+
+    def raw_get(key)
+      if ::File.respond_to?(:binread)
+        data = ::File.binread(path(key))
+      else
+        data = ::File.open(path(key),"rb") { |f| f.read }
+      end
+      Marshal.load(data)
+    end
+
+  end
+end

data/lib/chef/monkey_patches/string.rb

@@ -43,7 +43,7 @@ end
 class String
   unless method_defined?(:ord)
     def ord
-      self.unpack('c').first
+      self.unpack('C').first
     end
   end
 end

data/lib/chef/node.rb

@@ -495,7 +495,8 @@ class Chef
         "chef_type" => "node",
         "default" => default_attrs,
         "override" => override_attrs,
-        "run_list" => run_list.run_list
+        #Render correctly for run_list items so malformed json does not result
+        "run_list" => run_list.run_list.map { |item| item.to_s }
       }
       result["_rev"] = couchdb_rev if couchdb_rev
       result.to_json(*a)

data/lib/chef/platform.rb

@@ -43,6 +43,7 @@ class Chef
           :mac_os_x => {
             :default => {
               :package => Chef::Provider::Package::Macports,
+              :service => Chef::Provider::Service::Macosx,
               :user => Chef::Provider::User::Dscl,
               :group => Chef::Provider::Group::Dscl
             }
@@ -50,6 +51,7 @@ class Chef
           :mac_os_x_server => {
             :default => {
               :package => Chef::Provider::Package::Macports,
+              :service => Chef::Provider::Service::Macosx,
               :user => Chef::Provider::User::Dscl,
               :group => Chef::Provider::Group::Dscl
             }
@@ -71,6 +73,14 @@ class Chef
               :mdadm => Chef::Provider::Mdadm
             }
           },
+          :linuxmint   => {
+            :default => {
+              :package => Chef::Provider::Package::Apt,
+              :service => Chef::Provider::Service::Upstart,
+              :cron => Chef::Provider::Cron,
+              :mdadm => Chef::Provider::Mdadm
+            }
+          },
           :debian => {
             :default => {
               :package => Chef::Provider::Package::Apt,
@@ -130,6 +140,14 @@ class Chef
               :group => Chef::Provider::Group::Suse
             }
           },
+          :oracle  => {
+            :default => {
+              :service => Chef::Provider::Service::Redhat,
+              :cron => Chef::Provider::Cron,
+              :package => Chef::Provider::Package::Yum,
+              :mdadm => Chef::Provider::Mdadm
+            }
+          },
           :redhat   => {
             :default => {
               :service => Chef::Provider::Service::Redhat,
@@ -214,6 +232,14 @@ class Chef
               :group => Chef::Provider::Group::Usermod
             }
           },
+          :smartos => {
+            :default => {
+              :service => Chef::Provider::Service::Solaris,
+              :package => Chef::Provider::Package::SmartOS,
+              :cron => Chef::Provider::Cron::Solaris,
+              :group => Chef::Provider::Group::Usermod
+            }
+          },
           :netbsd => {
             :default => {
               :group => Chef::Provider::Group::Usermod
@@ -404,6 +430,14 @@ class Chef
         provider_klass
       end
 
+      def windows?
+        if RUBY_PLATFORM =~ /mswin|mingw|windows/
+          true
+        else
+          false
+        end
+      end
+
       private
 
         def explicit_provider(platform, version, resource_type)

data/lib/chef/provider.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,14 +20,16 @@
 require 'chef/mixin/from_file'
 require 'chef/mixin/convert_to_class_name'
 require 'chef/mixin/recipe_definition_dsl_core'
+require 'chef/mixin/enforce_ownership_and_permissions'
 
 class Chef
   class Provider
-    
+
     include Chef::Mixin::RecipeDefinitionDSLCore
-    
+    include Chef::Mixin::EnforceOwnershipAndPermissions
+
     attr_accessor :new_resource, :current_resource, :run_context
-    
+
     def initialize(new_resource, run_context)
       @new_resource = new_resource
       @current_resource = nil
@@ -46,18 +48,18 @@ class Chef
     def cookbook_name
       new_resource.cookbook_name
     end
-    
+
     def load_current_resource
       raise Chef::Exceptions::Override, "You must override load_current_resource in #{self.to_s}"
     end
-    
+
     def action_nothing
       Chef::Log.debug("Doing nothing for #{@new_resource.to_s}")
       true
     end
-    
+
     protected
-    
+
     def recipe_eval(&block)
       # This block has new resource definitions within it, which
       # essentially makes it an in-line Chef run. Save our current
@@ -72,32 +74,32 @@ class Chef
       @run_context.resource_collection = Chef::ResourceCollection.new
       instance_eval(&block)
       Chef::Runner.new(@run_context).converge
-      
+
       @run_context = saved_run_context
     end
-    
+
     public
-    
+
     class << self
       include Chef::Mixin::ConvertToClassName
-      
+
       def build_from_file(cookbook_name, filename, run_context)
         pname = filename_to_qualified_string(cookbook_name, filename)
-        
+
         # Add log entry if we override an existing light-weight provider.
         class_name = convert_to_class_name(pname)
         overriding = Chef::Provider.const_defined?(class_name)
         Chef::Log.info("#{class_name} light-weight provider already initialized -- overriding!") if overriding
-        
+
         new_provider_class = Class.new self do |cls|
-          
+
           def load_current_resource
             # silence Chef::Exceptions::Override exception
           end
-          
+
           class << cls
             include Chef::Mixin::FromFile
-            
+
             # setup DSL's shortcut methods
             def action(name, &block)
               define_method("action_#{name.to_s}") do
@@ -105,17 +107,17 @@ class Chef
               end
             end
           end
-          
+
           # load provider definition from file
           cls.class_from_file(filename)
         end
-        
+
         # register new class as a Chef::Provider
         pname = filename_to_qualified_string(cookbook_name, filename)
         class_name = convert_to_class_name(pname)
         Chef::Provider.const_set(class_name, new_provider_class)
         Chef::Log.debug("Loaded contents of #{filename} into a provider named #{pname} defined in Chef::Provider::#{class_name}")
-        
+
         new_provider_class
       end
     end

data/lib/chef/provider/cron.rb

@@ -26,6 +26,7 @@ class Chef
       include Chef::Mixin::Command
 
       CRON_PATTERN = /([-0-9*,\/]+)\s([-0-9*,\/]+)\s([-0-9*,\/]+)\s([-0-9*,\/]+)\s([-0-9*,\/]+)\s(.*)/
+      CRON_ATTRIBUTES = [:minute, :hour, :day, :month, :weekday, :command, :mailto, :path, :shell, :home, :environment]
 
       def initialize(new_resource, run_context)
         super(new_resource, run_context)
@@ -52,17 +53,8 @@ class Chef
               cron_found = true
               @cron_exists = true
               next
-            when /^MAILTO=(\S*)/
-              @current_resource.mailto($1) if cron_found
-              next
-            when /^PATH=(\S*)/
-              @current_resource.path($1) if cron_found
-              next
-            when /^SHELL=(\S*)/
-              @current_resource.shell($1) if cron_found
-              next
-            when /^HOME=(\S*)/
-              @current_resource.home($1) if cron_found
+            when /^(\S*)=(\S*)/
+              set_environment_var($1, $2) if cron_found
               next
             when CRON_PATTERN
               if cron_found
@@ -89,7 +81,7 @@ class Chef
       end
 
       def compare_cron
-        [ :minute, :hour, :day, :month, :weekday, :command, :mailto, :path, :shell, :home ].any? do |cron_var|
+        CRON_ATTRIBUTES.any? do |cron_var|
           !@new_resource.send(cron_var).nil? && @new_resource.send(cron_var) != @current_resource.send(cron_var)
         end
       end
@@ -103,6 +95,9 @@ class Chef
         [ :mailto, :path, :shell, :home ].each do |v|
           newcron << "#{v.to_s.upcase}=#{@new_resource.send(v)}\n" if @new_resource.send(v)
         end
+        @new_resource.environment.each do |name, value|
+          newcron << "#{name}=#{value}\n"
+        end
         newcron << "#{@new_resource.minute} #{@new_resource.hour} #{@new_resource.day} #{@new_resource.month} #{@new_resource.weekday} #{@new_resource.command}\n"
 
         if @cron_exists
@@ -181,6 +176,16 @@ class Chef
         end
       end
 
+      private
+
+      def set_environment_var(attr_name, attr_value)
+        method_name = attr_name.downcase.to_sym
+        if CRON_ATTRIBUTES.include?(method_name)
+          @current_resource.send(method_name, attr_value)
+        else
+          @current_resource.environment(@current_resource.environment.merge(attr_name => attr_value))
+        end
+      end
     end
   end
 end

data/lib/chef/provider/cron/solaris.rb

@@ -55,17 +55,8 @@ class Chef
               cron_found = true
               @cron_exists = true
               next
-            when /^MAILTO=(\S*)/
-              @current_resource.mailto($1) if cron_found
-              next
-            when /^PATH=(\S*)/
-              @current_resource.path($1) if cron_found
-              next
-            when /^SHELL=(\S*)/
-              @current_resource.shell($1) if cron_found
-              next
-            when /^HOME=(\S*)/
-              @current_resource.home($1) if cron_found
+            when /^(\S*)=(\S*)/
+              set_environment_var($1, $2) if cron_found
               next
             when CRON_PATTERN
               if cron_found
@@ -91,12 +82,6 @@ class Chef
         @current_resource
       end
 
-      def compare_cron
-        [ :minute, :hour, :day, :month, :weekday, :command, :mailto, :path, :shell, :home ].any? do |cron_var|
-          !@new_resource.send(cron_var).nil? && @new_resource.send(cron_var) != @current_resource.send(cron_var)
-        end
-      end
-
       def write_crontab(crontab)
         tempcron = Tempfile.new("chef-cron")
         tempcron << crontab
@@ -121,6 +106,10 @@ class Chef
         [ :mailto, :path, :shell, :home ].each do |v|
           newcron << "#{v.to_s.upcase}=#{@new_resource.send(v)}\n" if @new_resource.send(v)
         end
+        @new_resource.environment.each do |name, value|
+          newcron << "#{name}=#{value}\n"
+        end
+
         newcron << "#{@new_resource.minute} #{@new_resource.hour} #{@new_resource.day} #{@new_resource.month} #{@new_resource.weekday} #{@new_resource.command}\n"
 
         if @cron_exists
@@ -188,7 +177,6 @@ class Chef
           Chef::Log.info("#{@new_resource} deleted crontab entry")
         end
       end
-
     end
   end
 end

data/lib/chef/provider/deploy.rb

@@ -65,7 +65,7 @@ class Chef
           if current_release?(release_path) 
             Chef::Log.debug("#{@new_resource} is the latest version")
           else
-            action_rollback
+            rollback_to release_path
           end
         else
 
@@ -93,16 +93,15 @@ class Chef
       end
 
       def action_rollback
-        if release_path
-          rp_index = all_releases.index(release_path)
-          raise RuntimeError, "There is no release to rollback to!" unless rp_index
-          rp_index += 1
-          releases_to_nuke = all_releases[rp_index..-1]
-        else
-          @release_path = all_releases[-2]
-          raise RuntimeError, "There is no release to rollback to!" unless @release_path
-          releases_to_nuke = [ all_releases.last ]
-        end
+        rollback_to all_releases[-2]
+      end
+
+      def rollback_to(target_release_path)
+        @release_path = target_release_path
+        raise RuntimeError, "There is no release to rollback to!" unless @release_path
+
+        rp_index = all_releases.index(release_path)
+        releases_to_nuke = all_releases[(rp_index + 1)..-1]
 
         rollback
 
@@ -170,7 +169,7 @@ class Chef
           end.join(" ")
 
           Chef::Log.info "#{@new_resource} migrating #{@new_resource.user} with environment #{env_info}"
-          run_command(run_options(:command => @new_resource.migration_command, :cwd=>release_path, :command_log_level => :info))
+          run_command(run_options(:command => @new_resource.migration_command, :cwd=>release_path, :log_level => :info))
         end
       end
 
@@ -338,9 +337,9 @@ class Chef
         run_opts[:user] = @new_resource.user if @new_resource.user
         run_opts[:group] = @new_resource.group if @new_resource.group
         run_opts[:environment] = @new_resource.environment if @new_resource.environment
-        run_opts[:command_log_prepend] = @new_resource.to_s
-        run_opts[:command_log_level] ||= :debug
-        if run_opts[:command_log_level] == :info
+        run_opts[:log_tag] = @new_resource.to_s
+        run_opts[:log_level] ||= :debug
+        if run_opts[:log_level] == :info
           if STDOUT.tty? && !Chef::Config[:daemon] && Chef::Log.info?
             run_opts[:live_stream] = STDOUT
           end