chef 0.10.10.beta.1 → 0.10.10.rc.1

data/lib/chef/knife/ssh.rb

@@ -326,7 +326,8 @@ class Chef
 
       def configure_attribute
         config[:attribute] = (Chef::Config[:knife][:ssh_attribute] ||
-                              config[:attribute]).strip
+                              config[:attribute] ||
+                              "fqdn").strip
       end
 
       def csshx

data/lib/chef/platform.rb

@@ -73,6 +73,14 @@ class Chef
               :mdadm => Chef::Provider::Mdadm
             }
           },
+          :linaro   => {
+            :default => {
+              :package => Chef::Provider::Package::Apt,
+              :service => Chef::Provider::Service::Debian,
+              :cron => Chef::Provider::Cron,
+              :mdadm => Chef::Provider::Mdadm
+            }
+          },
           :linuxmint   => {
             :default => {
               :package => Chef::Provider::Package::Apt,

data/lib/chef/provider/cron.rb

@@ -25,7 +25,9 @@ class Chef
     class Cron < Chef::Provider
       include Chef::Mixin::Command
 
-      CRON_PATTERN = /([-0-9*,\/]+)\s([-0-9*,\/]+)\s([-0-9*,\/]+)\s([-0-9*,\/]+)\s([-0-9*,\/]+)\s(.*)/
+      CRON_PATTERN = /\A([-0-9*,\/]+)\s([-0-9*,\/]+)\s([-0-9*,\/]+)\s([-0-9*,\/]+)\s([-0-9*,\/]+)\s(.*)/
+      ENV_PATTERN = /\A(\S+)=(\S*)/
+
       CRON_ATTRIBUTES = [:minute, :hour, :day, :month, :weekday, :command, :mailto, :path, :shell, :home, :environment]
 
       def initialize(new_resource, run_context)
@@ -39,21 +41,16 @@ class Chef
         crontab_lines = []
         @current_resource = Chef::Resource::Cron.new(@new_resource.name)
         @current_resource.user(@new_resource.user)
-        status = popen4("crontab -l -u #{@new_resource.user}") do |pid, stdin, stdout, stderr|
-          stdout.each_line { |line| crontab_lines << line }
-        end
-        if status.exitstatus > 1
-          raise Chef::Exceptions::Cron, "Error determining state of #{@new_resource.name}, exit: #{status.exitstatus}"
-        elsif status.exitstatus == 0
+        if crontab = read_crontab
           cron_found = false
-          crontab_lines.each do |line|
+          crontab.each_line do |line|
             case line.chomp
             when "# Chef Name: #{@new_resource.name}"
               Chef::Log.debug("Found cron '#{@new_resource.name}'")
               cron_found = true
               @cron_exists = true
               next
-            when /^(\S*)=(\S*)/
+            when ENV_PATTERN
               set_environment_var($1, $2) if cron_found
               next
             when CRON_PATTERN
@@ -68,11 +65,12 @@ class Chef
               end
               next
             else
+              cron_found=false # We've got a Chef comment with no following crontab line
               next
             end
           end
           Chef::Log.debug("Cron '#{@new_resource.name}' not found") unless @cron_exists
-        elsif status.exitstatus == 1
+        else
           Chef::Log.debug("Cron empty for '#{@new_resource.user}'")
           @cron_empty = true
         end
@@ -80,7 +78,7 @@ class Chef
         @current_resource
       end
 
-      def compare_cron
+      def cron_different?
         CRON_ATTRIBUTES.any? do |cron_var|
           !@new_resource.send(cron_var).nil? && @new_resource.send(cron_var) != @current_resource.send(cron_var)
         end
@@ -101,46 +99,44 @@ class Chef
         newcron << "#{@new_resource.minute} #{@new_resource.hour} #{@new_resource.day} #{@new_resource.month} #{@new_resource.weekday} #{@new_resource.command}\n"
 
         if @cron_exists
-          unless compare_cron
+          unless cron_different?
             Chef::Log.debug("Skipping existing cron entry '#{@new_resource.name}'")
             return
           end
-          status = popen4("crontab -l -u #{@new_resource.user}") do |pid, stdin, stdout, stderr|
-            stdout.each_line do |line|
-              case line.chomp
-              when "# Chef Name: #{@new_resource.name}"
-                cron_found = true
+          read_crontab.each_line do |line|
+            case line.chomp
+            when "# Chef Name: #{@new_resource.name}"
+              cron_found = true
+              next
+            when ENV_PATTERN
+              crontab << line unless cron_found
+              next
+            when CRON_PATTERN
+              if cron_found
+                cron_found = false
+                crontab << newcron
                 next
-              when CRON_PATTERN
-                if cron_found
-                  cron_found = false
-                  crontab << newcron
-                  next
-                end
-              else
-                next if cron_found
               end
-              crontab << line
+            else
+              if cron_found # We've got a Chef comment with no following crontab line
+                crontab << newcron
+                cron_found = false
+              end
             end
+            crontab << line
           end
+          # Handle edge case where the Chef comment is the last line in the current crontab
+          crontab << newcron if cron_found
 
-          status = popen4("crontab -u #{@new_resource.user} -", :waitlast => true) do |pid, stdin, stdout, stderr|
-            crontab.each_line { |line| stdin.puts "#{line}" }
-          end
+          write_crontab crontab
           Chef::Log.info("#{@new_resource} updated crontab entry")
           @new_resource.updated_by_last_action(true)
         else
-          unless @cron_empty
-            status = popen4("crontab -l -u #{@new_resource.user}") do |pid, stdin, stdout, stderr|
-              stdout.each { |line| crontab << line }
-            end
-          end
+          crontab = read_crontab unless @cron_empty
 
           crontab << newcron
 
-          status = popen4("crontab -u #{@new_resource.user} -", :waitlast => true) do |pid, stdin, stdout, stderr|
-            crontab.each_line { |line| stdin.puts "#{line}" }
-          end
+          write_crontab crontab
           Chef::Log.info("#{@new_resource} added crontab entry")
           @new_resource.updated_by_last_action(true)
         end
@@ -150,27 +146,26 @@ class Chef
         if @cron_exists
           crontab = String.new
           cron_found = false
-          status = popen4("crontab -l -u #{@new_resource.user}") do |pid, stdin, stdout, stderr|
-            stdout.each_line do |line|
-              case line.chomp
-              when "# Chef Name: #{@new_resource.name}"
-                cron_found = true
+          read_crontab.each_line do |line|
+            case line.chomp
+            when "# Chef Name: #{@new_resource.name}"
+              cron_found = true
+              next
+            when ENV_PATTERN
+              next if cron_found
+            when CRON_PATTERN
+              if cron_found
+                cron_found = false
                 next
-              when CRON_PATTERN
-                if cron_found
-                  cron_found = false
-                  next
-                end
-              else
-                next if cron_found
               end
-              crontab << line
+            else
+              # We've got a Chef comment with no following crontab line
+              cron_found = false
             end
+            crontab << line
           end
 
-          status = popen4("crontab -u #{@new_resource.user} -", :waitlast => true) do |pid, stdin, stdout, stderr|
-            crontab.each_line { |line| stdin.puts "#{line}" }
-          end
+          write_crontab crontab
           Chef::Log.info("#{@new_resource} deleted crontab entry")
           @new_resource.updated_by_last_action(true)
         end
@@ -179,13 +174,32 @@ class Chef
       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)
+        if %w(MAILTO PATH SHELL HOME).include?(attr_name)
+          @current_resource.send(attr_name.downcase.to_sym, attr_value)
         else
           @current_resource.environment(@current_resource.environment.merge(attr_name => attr_value))
         end
       end
+
+      def read_crontab
+        crontab = nil
+        status = popen4("crontab -l -u #{@new_resource.user}") do |pid, stdin, stdout, stderr|
+          crontab = stdout.read
+        end
+        if status.exitstatus > 1
+          raise Chef::Exceptions::Cron, "Error determining state of #{@new_resource.name}, exit: #{status.exitstatus}"
+        end
+        crontab
+      end
+
+      def write_crontab(crontab)
+        status = popen4("crontab -u #{@new_resource.user} -", :waitlast => true) do |pid, stdin, stdout, stderr|
+          stdin.write crontab
+        end
+        if status.exitstatus > 0
+          raise Chef::Exceptions::Cron, "Error updating state of #{@new_resource.name}, exit: #{status.exitstatus}"
+        end
+      end
     end
   end
 end

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

@@ -19,165 +19,38 @@
 #
 
 require 'chef/log'
-require 'chef/mixin/command'
 require 'chef/provider'
 
 class Chef
   class Provider
     class Cron
       class Solaris < Chef::Provider::Cron
-      include Chef::Mixin::Command
 
-      CRON_PATTERN = /([-0-9*,\/]+)\s([-0-9*,\/]+)\s([-0-9*,\/]+)\s([-0-9*,\/]+)\s([-0-9*,\/]+)\s(.*)/
+        private
 
-      def initialize(new_resource, run_context)
-        super(new_resource, run_context)
-        @cron_exists = false
-        @cron_empty = false
-      end
-      attr_accessor :cron_exists, :cron_empty
-
-      def load_current_resource
-        crontab_lines = []
-        @current_resource = Chef::Resource::Cron.new(@new_resource.name)
-        @current_resource.user(@new_resource.user)
-        status = popen4("crontab -l #{@new_resource.user}") do |pid, stdin, stdout, stderr|
-          stdout.each_line { |line| crontab_lines << line }
-        end
-        if status.exitstatus > 1
-          raise Chef::Exceptions::Cron, "Error determining state of #{@new_resource.name}, exit: #{status.exitstatus}"
-        elsif status.exitstatus == 0
-          cron_found = false
-          crontab_lines.each do |line|
-            case line.chomp
-            when "# Chef Name: #{@new_resource.name}"
-              Chef::Log.debug("#{@new_resource} found cron '#{@new_resource.name}'")
-              cron_found = true
-              @cron_exists = true
-              next
-            when /^(\S*)=(\S*)/
-              set_environment_var($1, $2) if cron_found
-              next
-            when CRON_PATTERN
-              if cron_found
-                @current_resource.minute($1)
-                @current_resource.hour($2)
-                @current_resource.day($3)
-                @current_resource.month($4)
-                @current_resource.weekday($5)
-                @current_resource.command($6)
-                cron_found=false
-              end
-              next
-            else
-              next
-            end
-          end
-          Chef::Log.debug("#{@new_resource} cron '#{@new_resource.name}' not found") unless @cron_exists
-        elsif status.exitstatus == 1
-          Chef::Log.debug("#{@new_resource} cron empty for '#{@new_resource.user}'")
-          @cron_empty = true
-        end
-
-        @current_resource
-      end
-
-      def write_crontab(crontab)
-        tempcron = Tempfile.new("chef-cron")
-        tempcron << crontab
-        tempcron.flush
-        tempcron.chmod(0644)
-        status = run_command(:command => "/usr/bin/crontab #{tempcron.path}",:user => @new_resource.user)
-        if(status == 0)
-          @new_resource.updated_by_last_action(true)
-        else
-          @new_resource.updated_by_last_action(false)
-        end
-        tempcron.close!
-        return status
-      end
-
-      def action_create
-        crontab = String.new
-        newcron = String.new
-        cron_found = false
-
-        newcron << "# Chef Name: #{new_resource.name}\n"
-        [ :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
-          unless compare_cron
-            Chef::Log.debug("#{@new_resource} skipping existing cron entry '#{@new_resource.name}'")
-            return
-          end
+        def read_crontab
+          crontab = nil
           status = popen4("crontab -l #{@new_resource.user}") do |pid, stdin, stdout, stderr|
-            stdout.each_line do |line|
-              case line.chomp
-              when "# Chef Name: #{@new_resource.name}"
-                cron_found = true
-                next
-              when CRON_PATTERN
-                if cron_found
-                  cron_found = false
-                  crontab << newcron
-                  next
-                end
-              else
-                next if cron_found
-              end
-              crontab << line
-            end
+            crontab = stdout.read
           end
-
-          status = write_crontab(crontab)
-          Chef::Log.info("#{@new_resource} updated crontab entry")
-        else
-          unless @cron_empty
-            status = popen4("crontab -l #{@new_resource.user}") do |pid, stdin, stdout, stderr|
-              stdout.each { |line| crontab << line }
-            end
+          if status.exitstatus > 1
+            raise Chef::Exceptions::Cron, "Error determining state of #{@new_resource.name}, exit: #{status.exitstatus}"
           end
-
-          crontab << newcron
-          status = write_crontab(crontab)
-          Chef::Log.info("#{@new_resource} added crontab entry")
+          crontab
         end
-      end
 
-      def action_delete
-        if @cron_exists
-          crontab = String.new
-          cron_found = false
-          status = popen4("crontab -l #{@new_resource.user}") do |pid, stdin, stdout, stderr|
-            stdout.each_line do |line|
-              case line.chomp
-              when "# Chef Name: #{@new_resource.name}"
-                cron_found = true
-                next
-              when CRON_PATTERN
-                if cron_found
-                  cron_found = false
-                  next
-                end
-              else
-                next if cron_found
-              end
-              crontab << line
-            end
+        def write_crontab(crontab)
+          tempcron = Tempfile.new("chef-cron")
+          tempcron << crontab
+          tempcron.flush
+          tempcron.chmod(0644)
+          status = run_command(:command => "/usr/bin/crontab #{tempcron.path}",:user => @new_resource.user)
+          tempcron.close!
+          if status.exitstatus > 0
+            raise Chef::Exceptions::Cron, "Error updating state of #{@new_resource.name}, exit: #{status.exitstatus}"
           end
-
-          status = write_crontab(crontab)
-          Chef::Log.info("#{@new_resource} deleted crontab entry")
         end
       end
     end
   end
 end
-end

data/lib/chef/provider/deploy.rb

@@ -42,6 +42,7 @@ class Chef
       end
 
       def load_current_resource
+        @scm_provider.load_current_resource
         @release_path = @new_resource.deploy_to + "/releases/#{release_slug}"
       end
 
@@ -205,7 +206,6 @@ class Chef
       end
 
       def update_cached_repo
-        @scm_provider.load_current_resource
         if @new_resource.svn_force_export
           svn_force_export
         else

data/lib/chef/provider/group/groupadd.rb

@@ -78,10 +78,7 @@ class Chef
 
         def groupadd_options
           opts = ''
-          case node[:platform]
-          when "centos", "redhat", "scientific", "fedora"
-            opts << " -r" if @new_resource.system
-          end
+          opts << " -r" if @new_resource.system
           opts
         end
 

data/lib/chef/provider/mdadm.rb

@@ -51,7 +51,7 @@ class Chef
 
       def action_create
         unless @current_resource.exists
-          command = "yes | mdadm --create #{@new_resource.raid_device} --chunk=#{@new_resource.chunk} --level #{@new_resource.level} --metadata=#{@new_resource.metadata} --raid-devices #{@new_resource.devices.length} #{@new_resource.devices.join(" ")}"
+          command = "yes | mdadm --create #{@new_resource.raid_device} --chunk=#{@new_resource.chunk} --level #{@new_resource.level} --metadata=#{@new_resource.metadata} --bitmap=#{@new_resource.bitmap} --raid-devices #{@new_resource.devices.length} #{@new_resource.devices.join(" ")}"
           Chef::Log.debug("#{@new_resource} mdadm command: #{command}")
           #pid, stdin, stdout, stderr = popen4(command)
           shell_out!(command)