danarchy_deploy 0.2.10 → 0.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf92e113ddbc42b8b0ce95baf0a4fe1652d1f51e66c749ef1b073c38f92deb83
-  data.tar.gz: 9badea3a6da5ccec2d5f3c481211533abc3a46b53493611b4c945905e6f960ae
+  metadata.gz: e323bccc146729696cefbbe7783e779ccfee0c3e2f58c73149c64862dd1f1c95
+  data.tar.gz: 45602e1b2852556ab4cb48324af4b8bb25e580aca57646a006df08f20841d495
 SHA512:
-  metadata.gz: 97ff0fee694f105fe796e0be5e73b40e44fe9aff9f63b28e4aff327bfcae4573420f90ea92e3b93bbc8f168abb4e0ab1a3dcfb532e2ef9ab0b99e15f5fde82ba
-  data.tar.gz: 43ce70a9b2d80697feaaee119ebbb5dbe93f6e2270fb381718ccef0a97f29dd041fa80c54372119a14553f748e76b632a86e8dacb48eac14c76faacd54f0dfa5
+  metadata.gz: 76aca576a0734fbed266ea5c14070276019c73aa3e4d9671fde21eacd1362cd23cae7faa17df62132d3cdccf0b61f25994163b35b97e88978e79cd7c0003cb20
+  data.tar.gz: 43a9f174a9e1048546c17a6a8b88dbc6940d419fa087a1e3acb3d1aaf88c98fb3b1d2e6eb2bf60037ce070825fb7581fc1d907169cf1d2ce14e3dc0bb7bb64fa

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+patch_0.2.11
+- gentoo: fix portage cron permissions
+- restructure bin/exe dirs, update gemspec
+- cleanup emerge --sync tmpdir on failure
+
 patch_0.2.10
 - fix set_hostname in debian, centos, opensuse
 

data/lib/danarchy_deploy/system/bsd.rb

@@ -0,0 +1,24 @@
+
+module DanarchyDeploy
+  module System
+    class BSD
+      def self.new(deployment, options)
+        puts "\n" + self.name
+        puts 'BSD detected! Using pkg.'
+
+        set_hostname(deployment[:hostname]) if !options[:pretend]
+        installer = 'pkg install -y '
+        update    = 'pkg upgrade -y '
+        cleaner   = 'pkg clean -y '
+
+        puts "\n Updating Pkg repos..."
+        DanarchyDeploy::Helpers.run_command('pkg update -q',options)
+        [installer, updater, cleaner]
+      end
+
+      private
+      def self.set_hostname(hostname)
+        `hostname #{hostname}`
+      end
+    end
+end

data/lib/danarchy_deploy/system/gentoo.rb

@@ -37,8 +37,8 @@ module DanarchyDeploy
 
       private
       def self.emerge_sync_in_progress
-        repo_path = `emerge --info | grep location`.chomp.split(': ').last
-        Dir.exist?(repo_path + '/.tmp-unverified-download-quarantine')
+        @repo_path = `emerge --info | grep location`.chomp.split(': ').last
+        Dir.exist?(@repo_path + '/.tmp-unverified-download-quarantine')
       end
 
       def self.emerge_sync_wait
@@ -57,7 +57,14 @@ module DanarchyDeploy
           install_sync_cron(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)
+          begin
+            DanarchyDeploy::Helpers.run_command('emerge --sync &>/var/log/emerge-sync.log', options)
+          ensure
+            if Dir.exist?("#{@repo_path}/.tmp-unverified-download-quarantine")
+              puts "\n    ! emerge --sync may have failed: cleaning up tmp path."
+              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
           install_sync_cron(sync, options)
         else
@@ -75,50 +82,48 @@ module DanarchyDeploy
       end
 
       def self.install_sync_cron(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
+        templates = Array.new
+        if sync.nil? || sync == false
+          DanarchyDeploy::Helpers.run_command(
+            'id portage | grep cron >/dev/null && usermod -r -G cron portage',
+            options)
+
+          templates.push({ target: '/var/spool/cron/crontabs/portage',
+                           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',
+                           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

data/lib/danarchy_deploy/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danarchy_deploy
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.2.11
 platform: ruby
 authors:
 - Dan James
 autorequire:
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2024-09-12 00:00:00.000000000 Z
+date: 2024-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danarchy_couchdb
@@ -71,27 +71,19 @@ description: DanarchyDeploy intends to simplify Gentoo Linux (and other distro)
 email:
 - dan@danarchy.me
 executables:
-- console-dd
 - danarchy_deploy
-- setup-dd
 extensions: []
 extra_rdoc_files: []
 files:
 - ".asdf_versions.json"
-- ".gitignore"
 - ".rspec"
 - ".tool-versions"
 - ".travis.yml"
 - CHANGELOG.md
-- Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/console-dd
-- bin/danarchy_deploy
-- bin/setup-dd
-- danarchy_deploy.gemspec
+- exe/danarchy_deploy
 - lib/danarchy_deploy.rb
 - lib/danarchy_deploy/applicator.rb
 - lib/danarchy_deploy/applicator/nginx.rb
@@ -117,6 +109,7 @@ files:
 - lib/danarchy_deploy/services/mysql/new_server.rb
 - lib/danarchy_deploy/services/mysql/privileges.rb
 - lib/danarchy_deploy/system.rb
+- lib/danarchy_deploy/system/bsd.rb
 - lib/danarchy_deploy/system/centos.rb
 - lib/danarchy_deploy/system/cryptsetup.rb
 - lib/danarchy_deploy/system/debian.rb

data/.gitignore

@@ -1,12 +0,0 @@
-*~
-/.bundle/
-/.yardoc
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-
-# rspec failure tracking
-.rspec_status

data/Gemfile

@@ -1,6 +0,0 @@
-source "https://rubygems.org"
-
-# git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
-
-# Specify your gem's dependencies in danarchy_deploy.gemspec
-gemspec

data/Gemfile.lock

@@ -1,27 +0,0 @@
-PATH
-  remote: .
-  specs:
-    danarchy_deploy (0.2.8)
-      danarchy_couchdb (~> 0.1)
-      mongo (~> 2.20)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    bson (5.0.1)
-    danarchy_couchdb (0.1.3)
-    mongo (2.20.1)
-      bson (>= 4.14.1, < 6.0.0)
-    rake (13.2.1)
-
-PLATFORMS
-  ruby
-  x86_64-linux
-
-DEPENDENCIES
-  bundler (~> 2.5)
-  danarchy_deploy!
-  rake (~> 13.0)
-
-BUNDLED WITH
-   2.5.11

data/bin/console-dd

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "danarchy_deploy"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start(__FILE__)

data/bin/setup-dd

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here

data/danarchy_deploy.gemspec

@@ -1,37 +0,0 @@
-
-lib = File.expand_path("../lib", __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "danarchy_deploy/version"
-
-Gem::Specification.new do |spec|
-  spec.name          = "danarchy_deploy"
-  spec.version       = DanarchyDeploy::VERSION
-  spec.authors       = ["Dan James"]
-  spec.email         = ["dan@danarchy.me"]
-
-  spec.summary       = %q{Pushes deployments locally or remotely based on a JSON/YAML/CouchDB template.}
-  spec.description   = %q{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.}
-  spec.homepage      = "https://github.com/danarchy85/danarchy_deploy"
-  spec.license       = "MIT"
-
-  if spec.respond_to?(:metadata)
-    spec.metadata["allowed_push_host"] = "https://rubygems.org"
-  else
-    raise "RubyGems 2.0 or newer is required to protect against " \
-      "public gem pushes."
-  end
-
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
-  end
-  spec.bindir        = "bin"
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  spec.add_dependency 'danarchy_couchdb', '~> 0.1'
-
-  spec.add_development_dependency 'bundler', '~> 2.5'
-  spec.add_development_dependency 'rake', '~> 13.0'
-
-  spec.add_runtime_dependency 'mongo', '~> 2.20'
-end