danarchy_deploy 0.2.11 → 0.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e323bccc146729696cefbbe7783e779ccfee0c3e2f58c73149c64862dd1f1c95
-  data.tar.gz: 45602e1b2852556ab4cb48324af4b8bb25e580aca57646a006df08f20841d495
+  metadata.gz: 61637129e8f6974c029b38504bfc513e3284d4d5eef6dc54fa5e24cdf45709d1
+  data.tar.gz: 80ea5ff429b1ae44d3eb6aef9d7dea0cecac5fc717fcd3cd8bc0125c8e54788a
 SHA512:
-  metadata.gz: 76aca576a0734fbed266ea5c14070276019c73aa3e4d9671fde21eacd1362cd23cae7faa17df62132d3cdccf0b61f25994163b35b97e88978e79cd7c0003cb20
-  data.tar.gz: 43a9f174a9e1048546c17a6a8b88dbc6940d419fa087a1e3acb3d1aaf88c98fb3b1d2e6eb2bf60037ce070825fb7581fc1d907169cf1d2ce14e3dc0bb7bb64fa
+  metadata.gz: 337fde118724af946077e866fce15a6892cde02f99d46bcfaa9d1535d6ddca450cc2aefb54e2275d71e0b848cf8b562012d5ef1b03be903abfc5483f8159576c
+  data.tar.gz: '0868e979870026c5525318b5ccf06dadde9a3ae2b1e52fb2cbba238b1b18d56c5e7e84418abe2ef0bc617f0ff77e52aa4c5744142b9fde4f104345b1f2c592f4'

data/.asdf_versions.json

@@ -1,5 +1,5 @@
 {
   "ruby": [
-    "latest:3.2.2"
+    "latest:3.2.4"
   ]
 }

data/.tool-versions

@@ -1 +1 @@
-ruby 3.2.2
+ruby 3.2.4

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+patch_0.2.13
+- Pid class to return LocalDeploy if already running
+- remote_LocalDeploy parse options dynamically
+- portage_sync: log eclean output
+- fix @runlevel in init/openrc.rb
+- update builtin::portage/make.conf.erb with variable parsing
+
+patch_0.2.12
+- Rename bin/console
+- Change emerge --sync cron to /etc/cron.daily/
+- Init::OpenRC: cleanup service in wrong runlevels
+- add skip_install option
+
 patch_0.2.11
 - gentoo: fix portage cron permissions
 - restructure bin/exe dirs, update gemspec

data/README.md

@@ -40,8 +40,7 @@ Usage: sudo bin/danarchy_deploy (local|remote) --json /path/to/deployment.json [
 	--dev-gem    			 Build dAnarchy_deploy gem locally and push to target host in RemoteDeploy.
 	--ssh-verbose                	 Verbose SSH stdout/stderr output.
 	--vars-verbose                	 Verbose template variable output.
+	--skip-install                   Skip package installation and updates.
 	--version                    	 Print bin/danarchy_deploy version.
 	-h, --help                       Print this help info.
 ```
-
-More documentation incoming...

data/exe/danarchy_deploy

@@ -4,13 +4,16 @@ require 'danarchy_couchdb'
 require 'optparse'
 
 deployment = nil
-options = { couchdb: "#{ENV['HOME']}/.danarchy/danarchy_deploy/danarchy_couchdb.json",
-            deploy_dir: '/danarchy/deploy',
-            deploy_file: nil,
-            first_run: false,
-            pretend: false,
-            ssh_verbose: false,
-            vars_verbose: false }
+options = {
+  couchdb: "#{ENV['HOME']}/.danarchy/danarchy_deploy/danarchy_couchdb.json",
+  deploy_dir: '/danarchy/deploy',
+  deploy_file: nil,
+  first_run: false,
+  pretend: false,
+  ssh_verbose: false,
+  vars_verbose: false,
+  skip_install: false
+}
 
 ARGV.push('--help') if ARGV.empty?
 optparse = OptionParser.new do |opts|
@@ -53,6 +56,10 @@ optparse = OptionParser.new do |opts|
     options[:vars_verbose] = true
   end
 
+  opts.on('--skip-install', "Skip package installation and updates.") do |val|
+    options[:skip_install] = true
+  end
+
   opts.on('--version', "Print #{$PROGRAM_NAME} version.") do |val|
     puts "DanarchyDeploy: #{DanarchyDeploy::VERSION}"
     exit 1
@@ -101,7 +108,7 @@ elsif location == 'local'
     puts ' ! Ctrl-c out if this is not what you want to do!'
     10.downto(0) do |i|
       trap('SIGINT') { abort("\nExiting!") }
-      print "\rDeploying in #{i} seconds"
+      print "\rDeploying in #{i} seconds. "
       sleep(1)
     end
 

data/lib/danarchy_deploy/pid.rb

@@ -0,0 +1,38 @@
+module DanarchyDeploy
+  class Pid
+    attr_reader :pid
+    attr_reader :locked
+    attr_reader :message
+
+    def initialize
+      @pidfile = '/var/run/danarchy_deploy.pid'
+      @pid = File.exist?(@pidfile) ? File.read(@pidfile).chomp.to_i : nil
+      @locked = false
+
+      if @pid
+        begin
+          Process.getpgid(@pid)
+          @locked = true
+          @message = "dAnarchy Deploy is already running as PID: #{@pid}"
+        rescue Errno::ESRCH => e
+          @locked = false
+          @message = "dAnarchy Deploy is not currently running."
+        end
+      end
+
+      if @locked == false
+        @pid = Process.pid
+        @locked = false
+        @message = "dAnarchy Deploy has started as PID: #{@pid}"
+        File.write(@pidfile, @pid)
+      end
+    end
+
+    def cleanup
+      File.delete(@pidfile)
+      @pid = nil
+      @locked = false
+      @message = "dAnarchy Deploy has completed. Cleaning up PID"
+    end
+  end
+end  

data/lib/danarchy_deploy/services/init/openrc.rb

@@ -3,10 +3,11 @@ module DanarchyDeploy
   module Services
     class Init
       class Openrc
-        def initialize(service, runlevel, options)
+        def initialize(service, runlevel='default', options)
           @service  = service
           @runlevel = runlevel
           @options  = options
+          cleanup_runlevels
         end
 
         def status
@@ -64,10 +65,19 @@ module DanarchyDeploy
         end
 
         def disable
-          Dir["/etc/runlevels/*/#{@service}"].each do |svc|
-            runlevel, service = svc.split('/')[3,4]
-            cmd = "rc-update del #{service} #{runlevel}"
-            DanarchyDeploy::Helpers.run_command(cmd, @options)
+          cmd = "rc-update del #{@service} #{@runlevel}"
+          DanarchyDeploy::Helpers.run_command(cmd, @options)
+        end
+
+        private
+        def cleanup_runlevels
+          Dir["/etc/runlevels/*/#{@service}"].each do |dir|
+            runlevel = File.basename(File.dirname(dir))
+            if runlevel != @runlevel
+              puts "    |> Removing #{@service} from wrong runlevel: #{runlevel}"
+              cmd = "rc-update del #{@service} #{runlevel}"
+              DanarchyDeploy::Helpers.run_command(cmd, @options)
+            end
           end
         end
       end

data/lib/danarchy_deploy/system/fstab.rb

@@ -47,8 +47,8 @@ module DanarchyDeploy
             abort("    ! Failed to run mkfs: #{mkfs[:stderr]}") if mkfs[:stderr]
           end
 
-          FileUtils.mkdir_p(mount[:mountpoint]) if !options[:pretend] &&
-                                                   !Dir.exist?(mount[:mountpoint])
+          FileUtils.mkdir_p(mount[:mountpoint]) unless options[:pretend] &&
+                                                       Dir.exist?(mount[:mountpoint])
         end
       end
 

data/lib/danarchy_deploy/system/gentoo.rb

@@ -48,7 +48,7 @@ module DanarchyDeploy
         puts "     |> Continuing with emerge!"
       end
 
-      def self.emerge_sync(sync, options)
+      def self.emerge_sync(sync=false, options)
         puts "\n >  Gentoo Emerge Sync"
         if sync.nil?
           install_sync_cron(sync, options)
@@ -65,7 +65,7 @@ module DanarchyDeploy
               DanarchyDeploy::Helpers.run_command("rm -rf #{@repo_path}/.tmp-unverified-download-quarantine", options)
             end
           end
-        elsif sync =~ /([0-9]{1,2}|\*|\@[a-z]{4,7})/i
+        elsif sync =~ /(cron|schedule)/i
           install_sync_cron(sync, options)
         else
           puts "\n   ! Unknown sync cron time: #{sync}. Not running emerge sync!"
@@ -88,41 +88,21 @@ module DanarchyDeploy
             'id portage | grep cron >/dev/null && usermod -r -G cron portage',
             options)
 
-          templates.push({ target: '/var/spool/cron/crontabs/portage',
+          templates.push({ target: '/etc/cron.daily/portage_sync.sh',
                            remove: true })
         else
           DanarchyDeploy::Helpers.run_command(
             'id portage | grep cron >/dev/null || usermod -a -G cron portage',
             options)
 
-          # User must be a member of the 'cron' group.
-          # User's actual crontab file is chown'd as ${user}:crontab
-          templates.push({ source: 'builtin::system/crontab.erb',
-                           target: '/var/spool/cron/crontabs/portage',
+          templates.push({ source: 'builtin::portage/portage_sync.sh',
+                           target: '/etc/cron.daily/portage_sync.sh',
                            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'
-                               }
-                             ]
-                           } })
+                             owner: 'root',
+                             group: 'root',
+                             mode: '0740'
+                           }
+                         })
         end
 
         DanarchyDeploy::Templater.new(templates, options)

data/lib/danarchy_deploy/system.rb

@@ -15,6 +15,11 @@ module DanarchyDeploy
       installer, updater, cleaner = prep_operating_system(deployment, options)
       install_result, updater_result = nil, nil
 
+      if options[:skip_install]
+        puts "\n > Skipping package installation due to --skip-install"
+        return deployment
+      end
+
       puts "\n > Package Installation"
       if [true, 'all', 'selected', nil].include?(deployment[:system][:update]) &&
          deployment[:packages].any?
@@ -87,23 +92,5 @@ module DanarchyDeploy
 
       [installer, updater, cleaner]
     end
-
-    def self.fstab_mount(deployment, options)
-      fstab = deployment[:system][:templates].collect { |t| t if t[:target] == '/etc/fstab' }.compact
-      fstab.each do |t|
-        t[:variables].each do |v|
-          if !Dir.exist?(v[:mountpoint])
-            puts "Creating mountpoint: #{v[:mountpoint]}"
-            FileUtils.mkdir_p(v[:mountpoint]) if !options[:pretend]
-          end
-        end
-      end
-
-      puts "\n > Mounting Filesystems"
-      if !options[:pretend]
-        mount_result = DanarchyDeploy::Helpers.run_command('mount -a', options)
-        abort('   |! Failed to mount filesystems!') if mount_result[:stderr]
-      end
-    end
   end
 end

data/lib/danarchy_deploy/version.rb

@@ -1,3 +1,3 @@
 module DanarchyDeploy
-  VERSION = "0.2.11"
+  VERSION = "0.2.13"
 end

data/lib/danarchy_deploy.rb

@@ -4,6 +4,7 @@ module DanarchyDeploy
   require_relative 'danarchy_deploy/groups'
   require_relative 'danarchy_deploy/hash_deep_merge'
   require_relative 'danarchy_deploy/helpers'
+  require_relative 'danarchy_deploy/pid'
   require_relative 'danarchy_deploy/services'
   require_relative 'danarchy_deploy/system'
   require_relative 'danarchy_deploy/templater'
@@ -14,8 +15,15 @@ module DanarchyDeploy
   class LocalDeploy
     def self.new(deployment, options)
       puts "\n" + self.name
+
+      pid = Pid.new
+      puts pid.message
+      if pid.locked
+        return deployment
+      end
+
       puts "Pretend run! Not making any changes." if options[:pretend]
-        
+
       puts 'Begining Deployment:'
       printf("%12s %0s\n", 'Hostname:', deployment[:hostname])
       printf("%12s %0s\n", 'OS:', deployment[:os])
@@ -36,6 +44,8 @@ module DanarchyDeploy
         File.write(options[:deploy_file], deployment.to_yaml)
       end
 
+      pid.cleanup
+      puts pid.message
       deployment
     end
   end
@@ -159,7 +169,7 @@ module DanarchyDeploy
       gem_dir = File.expand_path('../../', __FILE__)
 
       abort('ERROR: Need to be in development gem directory for --dev-gem!') if Dir.pwd != gem_dir
-      
+
       gem_path = "#{gem_dir}/pkg/#{gem}"
       build_cmd = "cd #{gem_dir} && git add . && rake build"
       build_result = DanarchyDeploy::Helpers.run_command(build_cmd, options)
@@ -183,7 +193,7 @@ module DanarchyDeploy
       else
         puts '   |+ Gem pushed!'
       end
-      
+
       puts "\n > Installing gem: #{gem} on #{connector[:hostname]}"
       install_cmd    = _ssh_command(connector, "sudo -i gem install --bindir /usr/local/bin -f #{options[:deploy_dir]}/#{File.basename(gem)}")
       install_result = DanarchyDeploy::Helpers.run_command(install_cmd, options)
@@ -204,14 +214,16 @@ module DanarchyDeploy
 
     def self.push_templates(connector, options)
       template_dir = options[:deploy_dir] + '/templates'
-      puts "\n > Pushing templates: #{template_dir}"
-      push_cmd    = _rsync_push(connector, template_dir, template_dir)
-      push_result = DanarchyDeploy::Helpers.run_command(push_cmd, options)
-      
-      if push_result[:stderr]
-        abort('   ! Templates push failed!')
-      else
-        puts "   |+ Templates pushed to '#{template_dir}'!"
+      if Dir.exist?(template_dir)
+        puts "\n > Pushing templates: #{template_dir}"
+        push_cmd    = _rsync_push(connector, template_dir, template_dir)
+        push_result = DanarchyDeploy::Helpers.run_command(push_cmd, options)
+
+        if push_result[:stderr]
+          abort('   ! Templates push failed!')
+        else
+          puts "   |+ Templates pushed to '#{template_dir}'!"
+        end
       end
     end
 
@@ -231,15 +243,23 @@ module DanarchyDeploy
       puts "\n > Running LocalDeploy on #{connector[:hostname]}.\n\n"
 
       deploy_cmd  = "sudo -i #{gem_binary} local "
-      deploy_cmd += '--first-run '    if options[:first_run]
-      deploy_cmd += '--ssh-verbose '  if options[:ssh_verbose]
-      deploy_cmd += '--vars-verbose ' if options[:vars_verbose]
-      deploy_cmd += '--pretend '      if options[:pretend]
-      deploy_cmd += '--json '         if options[:deploy_file].end_with?('.json')
-      deploy_cmd += '--yaml '         if options[:deploy_file].end_with?('.yaml')
-      deploy_cmd += options[:deploy_file]
-
-      deploy_command = _ssh_command(connector, deploy_cmd)
+      opts = Array.new
+      options.each do |k,v|
+        next if [:couchdb, :dev_gem, :deploy_dir].include?(k)
+        if k == :deploy_file
+          if v.end_with?('.json')
+            opts.insert(-1, '--json ' + v)
+          elsif v.end_with?('.yaml')
+            opts.insert(-1, '--yaml ' + v)
+          else
+            abort("   ! Unknown deploy_file type: #{v}")
+          end
+        elsif v == true
+          opts.insert(0, '--' + k.to_s.gsub('_', '-'))
+        end
+      end
+
+      deploy_command = _ssh_command(connector, deploy_cmd + opts.join(' '))
       system(deploy_command)
     end
 
@@ -247,7 +267,7 @@ module DanarchyDeploy
       puts "\n > Pulling deployment: #{options[:deploy_file]}"
       pull_cmd = _scp_pull(connector, options[:deploy_file], options[:deploy_file])
       pull_result = DanarchyDeploy::Helpers.run_command(pull_cmd, options)
-      
+
       if pull_result[:stderr]
         abort('   ! Deployment pull failed!')
       else

data/templates/deploy_template.json

@@ -24,7 +24,7 @@
     }
   },
   "portage": {
-    "sync": false,
+    "sync": false || false || "cron || schedule",
     "templates": [
       {
         "target": "/etc/portage/make.conf",
@@ -70,9 +70,10 @@
   "services": {
     "service_name": {
       "init": {
-        "service": [
+        "runlevel": "default",
+        "actions": [
           "enable",
-          "restart"
+          "start"
         ]
       },
       "archives": [

data/templates/portage/make.conf.erb

@@ -5,20 +5,19 @@ CXXFLAGS="${COMMON_FLAGS}"
 FCFLAGS="${COMMON_FLAGS}"
 FFLAGS="${COMMON_FLAGS}"
 
-MAKEOPTS="-j<%= `nproc`.to_i * 2 + 1 %> -l<%= `nproc`.to_i %>"
+MAKEOPTS="-j<%= @variables[:MAKEOPTS_J] ? @variables[:MAKEOPTS_J] : `nproc`.to_i + 1 %> -l<%= (`nproc`.to_f * 0.85) %>"
 CPU_FLAGS_X86="<%= `cpuid2cpuflags`.split(': ').last.chomp %>"
 
-<% if !@variables -%>
-USE="bindist logrotate"
-INPUT_DEVICES="evdev keyboard"
-<% else -%>
-<%= @variables[:use] ? 'USE=' + "\"bindist logrotate #{@variables[:use]}\"\n" : "USE=\"bindist logrotate\"\n" -%>
-<%= @variables[:grub] ? 'GRUB_PLATFORMS=' + "\"#{@variables[:grub]}\"\n" : '' -%>
-<%= @variables[:ruby] ? 'RUBY_TARGETS=' + "\"#{@variables[:ruby]}\"\n" : '' -%>
-<%= @variables[:php] ? 'PHP_TARGETS=' + "\"#{@variables[:php]}\"\n" : '' -%>
-<%= @variables[:features] ? 'FEATURES=' + "\"#{@variables[:features]}\"\n" : '' -%>
-<%= @variables[:videocards] ? 'VIDEO_CARDS=' + "\"#{@variables[:videocards]}\"\n" : '' -%>
-<%= @variables[:input] ? 'INPUT_DEVICES=' + "\"#{@variables[:input]}\"\n" : "INPUT_DEVICES=\"evdev keyboard\"\n" -%>
+<%
+defaults = {
+  :USE => "bindist logrotate",
+  :INPUT_DEVICES => "evdev keyboard"
+}
+
+variables = defaults.merge(@variables) if @variables.any?
+
+variables.each do |k, v| -%>
+<%= k.to_s + "=\"#{v}\"" %>
 <% end -%>
 
 # This sets the language of build output to English.

data/templates/portage/portage_sync.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+/usr/bin/emerge --sync &>  /var/log/emerge-sync.log
+/usr/bin/eclean-dist   &>  /var/log/emerge-clean.log
+/usr/bin/eclean-pkg    &>> /var/log/emerge-clean.log

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: danarchy_deploy
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.2.13
 platform: ruby
 authors:
 - Dan James
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-28 00:00:00.000000000 Z
+date: 2025-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: danarchy_couchdb
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :runtime
+        version: '2.6'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '2.6'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: danarchy_couchdb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
+        version: '0.1'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: mongo
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.20'
+- !ruby/object:Gem::Dependency
+  name: openssl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
 description: DanarchyDeploy intends to simplify Gentoo Linux (and other distro) deployments
   down to a single template from an input JSON or YAML file, or from a CouchDB file.
 email:
@@ -100,6 +114,7 @@ files:
 - lib/danarchy_deploy/hash_deep_merge.rb
 - lib/danarchy_deploy/helpers.rb
 - lib/danarchy_deploy/installer.rb
+- lib/danarchy_deploy/pid.rb
 - lib/danarchy_deploy/services.rb
 - lib/danarchy_deploy/services/init.rb
 - lib/danarchy_deploy/services/init/openrc.rb
@@ -131,6 +146,7 @@ files:
 - templates/portage/make.conf.erb
 - templates/portage/package.use/bindist
 - templates/portage/package.use/documentation
+- templates/portage/portage_sync.sh
 - templates/services/memcached/memcached.erb
 - templates/services/mysql/my.cnf.erb
 - templates/services/mysql/root_my.cnf.erb
@@ -173,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Pushes deployments locally or remotely based on a JSON/YAML/CouchDB template.