danarchy_deploy 0.2.12 → 0.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d983a99ae7625895008802d7aefb21d055f45e3b70dfd365ca2881d2349a29d6
-  data.tar.gz: 55d5b7477a5d2b43bcffe6d86d11977add6739e49336cd963fde8141b374f13a
+  metadata.gz: 61637129e8f6974c029b38504bfc513e3284d4d5eef6dc54fa5e24cdf45709d1
+  data.tar.gz: 80ea5ff429b1ae44d3eb6aef9d7dea0cecac5fc717fcd3cd8bc0125c8e54788a
 SHA512:
-  metadata.gz: 4b42720a0e7433080ff22b9104bde15f347ba6fea32e405a37dc122c46527c27a0e022da4242ff4f44d3e810c82834aa745eb0df9673c4642901da7c726a5e4b
-  data.tar.gz: 8f0aab58a7132063b3383f9a4a7b310f2dc5fb026f15f0b7850325864098bac55900c1c6e0aacd8e628e620efcc593fdb4e3b26f25ad1741803f38bca41507eb
+  metadata.gz: 337fde118724af946077e866fce15a6892cde02f99d46bcfaa9d1535d6ddca450cc2aefb54e2275d71e0b848cf8b562012d5ef1b03be903abfc5483f8159576c
+  data.tar.gz: '0868e979870026c5525318b5ccf06dadde9a3ae2b1e52fb2cbba238b1b18d56c5e7e84418abe2ef0bc617f0ff77e52aa4c5744142b9fde4f104345b1f2c592f4'

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+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/

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/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

@@ -65,7 +65,7 @@ module DanarchyDeploy
         end
 
         def disable
-          cmd = "rc-update del #{@service} #{runlevel}"
+          cmd = "rc-update del #{@service} #{@runlevel}"
           DanarchyDeploy::Helpers.run_command(cmd, @options)
         end
 

data/lib/danarchy_deploy/version.rb

@@ -1,3 +1,3 @@
 module DanarchyDeploy
-  VERSION = "0.2.12"
+  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/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

@@ -1,5 +1,5 @@
 #!/bin/bash
 
-/usr/bin/emerge --sync &> /var/log/emerge-sync.log
-/usr/bin/eclean-dist
-/usr/bin/eclean-pkg
+/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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danarchy_deploy
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.2.13
 platform: ruby
 authors:
 - Dan James
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-03-07 00:00:00.000000000 Z
+date: 2025-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -114,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