lib/danarchy_deploy/system/gentoo.rb in danarchy_deploy-0.2.7 vs lib/danarchy_deploy/system/gentoo.rb in danarchy_deploy-0.2.8

@@ -4,16 +4,11 @@
     class Gentoo
       def self.new(deployment, options)
         puts "\n" + self.name
         puts 'Gentoo detected! Using emerge.'
 
-        hostname = deployment[:hostname]
-        if check_hostname(hostname) == false
-          puts "Setting hostname to: #{hostname}"
-          set_hostname(hostname)
-        end
-
+        set_hostname(deployment[:hostname]) if !options[:pretend]
         installer  = 'emerge --usepkg --buildpkg --quiet --noreplace '
         # This needs cpuid2cpuflags to build make.conf; don't --pretend here.
         system("qlist -I cpuid2cpuflags &>/dev/null || #{installer} cpuid2cpuflags &>/dev/null")
         installer += '--pretend ' if options[:pretend]
 
@@ -21,46 +16,111 @@
         updater += ' --pretend' if options[:pretend]
 
         cleaner  = 'emerge --depclean --quiet '
         cleaner += '--pretend ' if options[:pretend]
 
+        if emerge_sync_in_progress
+          puts "\n >  Waiting for emerge sync to complete."
+          emerge_sync_wait
+        end
+
         if deployment[:portage]
           if deployment[:portage][:templates]
             puts "\nChecking Portage configs."
             DanarchyDeploy::Templater.new(deployment[:portage][:templates], options)
           end
 
-          emerge_sync(options) if deployment[:portage][:sync]
+          emerge_sync(deployment[:portage][:sync], options)
         end
 
         [installer, updater, cleaner]
       end
 
       private
+      def self.emerge_sync_in_progress
+        repo_path = `emerge --info | grep location`.chomp.split(': ').last
+        Dir.exist?(repo_path + '/.tmp-unverified-download-quarantine')
+      end
 
-      def self.emerge_sync(options)
-        File.open('/tmp/datetime', 'a+') do |f|
-          last_sync = f.getbyte ? DateTime.parse(f.read) : (DateTime.now - 2)
+      def self.emerge_sync_wait
+        while emerge_sync_in_progress
+          sleep 3
+        end
+        puts "     |> Continuing with emerge!"
+      end
 
-          if (DateTime.now - last_sync).to_i != 0
-            puts "\nUpdating Portage repo..."
-            DanarchyDeploy::Helpers.run_command('emerge --sync --quiet 2>/dev/null', options)
-            f.truncate(0)
-            f.write DateTime.now
-          end
-
-          f.close
+      def self.emerge_sync(sync, options)
+        if sync.nil?
+          install_cron_template(sync, options)
+        elsif sync == false
+          puts "\nNot running emerge sync; set to: #{sync}"
+          install_cron_template(sync, options)
+        elsif sync == true
+          File.delete('/var/spool/cron/crontabs/portage') if File.exist?('/var/spool/cron/crontabs/portage')
+          DanarchyDeploy::Helpers.run_command('emerge --sync &>/var/log/emerge-sync.log', options)
+        elsif sync =~ /([0-9]{1,2}|\*|\@[a-z]{4,7})/i
+          install_cron_template(sync, options)
+        else
+          puts "\nUnknown sync cron time: #{sync}. Not running emerge sync!"
         end
       end
 
       def self.set_hostname(hostname)
-        confd_hostname = "hostname=\"#{hostname}\""
-        File.write('/etc/conf.d/hostname', confd_hostname)
-        `hostname #{hostname}`
+        if `hostname`.chomp != hostname
+          puts "Setting hostname to: #{hostname}"
+          confd_hostname = "hostname=\"#{hostname}\""
+          File.write('/etc/conf.d/hostname', confd_hostname)
+          `hostname #{hostname}`
+        end
       end
 
-      def self.check_hostname(hostname)
-        `hostname`.chomp == hostname
+      def self.install_cron_template(sync, options)
+        templates = if sync.nil? || sync == false
+                      [
+                        {
+                          target: '/var/spool/cron/crontabs/portage',
+                          remove: true
+                        }
+                      ]
+                    else
+                      [
+                        {
+                          source: 'builtin::system/crontab.erb',
+                          target: '/var/spool/cron/crontabs/portage',
+                          dir_perms: {
+                            owner: 'root',
+                            group: 'crontab',
+                            mode: '1730'
+                          },
+                          file_perms: {
+                            owner: 'portage',
+                            group: 'crontab',
+                            mode: '0600'
+                          },
+                          variables: {
+                            shell: '/bin/bash',
+                            path: '/usr/local/sbin:/usr/local/bin:/usr/bin',
+                            env: '',
+                            jobs: [
+                              {
+                                schedule: sync,
+                                command: 'emerge --sync &>/var/log/emerge-sync.log'
+                              },
+                              {
+                                schedule: '@daily',
+                                command: 'eclean-dist &>/dev/null'
+                              },
+                              {
+                                schedule: '@daily',
+                                command: 'eclean-pkg &>/dev/null'
+                              }
+                            ]
+                          }
+                        }
+                      ]
+                    end
+
+        DanarchyDeploy::Templater.new(templates, options)
       end
     end
   end
 end