danarchy_deploy 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4665ec27120f6fda4337da5a2b2cb465511534cef96b47c2a11791076012f64
-  data.tar.gz: e12104840e0273bf38d37a0465752ebc5bacc53d2d0f4a5b5783a936f5810afb
+  metadata.gz: 7e103704d84bcb50319a7f6dae091e4655159c1ee83e0b28ae599280ab1c325d
+  data.tar.gz: '084b77c73e50c58af4f38d8cd81be5cdbbcd6923a046b944f3b1c3eafaacb248'
 SHA512:
-  metadata.gz: 4bc766ba4a3e8f6e0e691dd1904029f9c08cd6b040146214ae31fb0c18b3a779bae3258b033b1b50205f70c02ebfdbc1fcdd5756ae5ef7b727ce8225397cb4b4
-  data.tar.gz: 7b22f9218392944730cec707bbf62cf9cc9c696fd411eccf02e6d7ceff54748b141c76b2b3de6750867287e9221a17f0be08be524a29c58e14b38b6741da4036
+  metadata.gz: b24d195152bfd8ce9e63e946d393f6699c56914e6880b431e5ab93b4c557a292b73f3c6a5c6d21fa35fd3cf70f531daced888e1192bea86f0bcef6947e571b9e
+  data.tar.gz: bcf97212adde19fbb712efb9b9864e1f8f26e22370ed5fd0ff435ea1a04cd065d78b9530ee1b2989afd2aadc4c72eeecbdfc67f52b698dd08af0d7ee5d1be930

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+patch_0.2.7
+- Patch Templater ERB.new for Ruby versions higher than 2.6
+- Allow builtin:: templates in Templater
+- System: allow :system:updates in template to control what to install/update
+- System: do not return if :system is not defined in template
+
 patch_0.2.6
 - DanarchyDeploy: gem install --bindir
 - DanarchyDeploy: return from each class if not defined in a deployment

data/lib/danarchy_deploy/system.rb

@@ -10,27 +10,34 @@ module DanarchyDeploy
   module System
     def self.new(deployment, options)
       abort('Operating System not defined! Exiting!') if !deployment[:os]
-      return deployment if ! deployment[:system]
       puts "\n" + self.name
 
       installer, updater, cleaner = prep_operating_system(deployment, options)
       install_result = nil
-      if deployment[:packages] && !deployment[:packages].empty?
+
+      puts "\n > Package Installation"
+      if deployment[:packages].any? && ['all', 'packages', nil].include?(deployment[:system][:update])
         packages = deployment[:packages].join(' ')
-        puts "\nInstalling packages..."
+        puts "\n   - Installing packages..."
         install_result = DanarchyDeploy::Helpers.run_command("#{installer} #{packages}", options)
         puts install_result[:stdout] if install_result[:stdout]
       else
-        puts "\nNo packages to install."
+        puts "\n   - Not installing packages."
+        puts "       |_ Packages selected: #{deployment[:packages].count}"
+        puts "       |_ Updates  selected: #{deployment[:system][:update]}"
       end
 
-      if !options[:pretend]
-        puts "\nRunning system updates..."
+      puts "\n > #{deployment[:os].capitalize} System Updates"
+      if ['all', 'system', nil].include?(deployment[:system][:update])
+        puts "\n   - Running system updates..."
         updater_result = DanarchyDeploy::Helpers.run_command(updater, options)
         puts updater_result[:stdout] if updater_result[:stdout]
-        puts "\nCleaning up unused packages..."
+        puts "\n   - Cleaning up unused packages..."
         cleanup_result = DanarchyDeploy::Helpers.run_command(cleaner, options)
         puts cleanup_result[:stdout] if cleanup_result[:stdout]
+      else
+        puts "\n   - Not running #{deployment[:os].capitalize} system updates."
+        puts "       |_ Updates selected: #{deployment[:system][:update]}"
       end
 
       deployment

data/lib/danarchy_deploy/templater.rb

@@ -3,6 +3,15 @@ require 'fileutils'
 
 module DanarchyDeploy
   class Templater
+    def self.load_source(source)
+      if source =~ /^builtin::/
+        source = File.expand_path('../../',  __dir__) + '/templates/' + source.split('::').last
+      end
+
+      abort("Source file does not exist at: #{source}") if ! File.exist?(source)
+      source
+    end
+
     def self.new(templates, options)
       puts "\n" + self.name
 
@@ -13,12 +22,17 @@ module DanarchyDeploy
 
       templates.each do |template|
         next if template[:remove]
-        abort("No target destination set for template: #{template[:source]}!") if !template[:target]
-        abort("No source or data for template: #{template[:target]}") if !template[:source] && !template[:data]
-        abort("Source file does not exist at: #{template[:source]}") if ! File.exist?(template[:source])
+        source = if !template[:target]
+                   abort("No target destination set for template: #{template[:source]}!")
+                 elsif template[:source].nil? && template[:data].nil?
+                   abort("No source or data for template: #{template[:target]}")
+                 elsif template[:data]
+                   '-- encoded data --'
+                 else
+                   load_source(template[:source])
+                 end
 
         target = template[:target]
-        source = template[:source] || '-- encoded data --'
         dir_perms = template[:dir_perms]
         file_perms = template[:file_perms]
         @variables = template[:variables] || nil
@@ -43,7 +57,11 @@ module DanarchyDeploy
         end
 
         File.open(tmpfile, 'w') do |f|
-          result = ERB.new(File.read(source), nil, '-').result(binding)
+          result = if RUBY_VERSION >= '2.6'
+                     ERB.new(File.read(source), trim_mode: '-').result(binding)
+                   else
+                     ERB.new(File.read(source), nil, '-').result(binding)
+                   end
           f.write(result)
           f.close
         end
@@ -54,7 +72,7 @@ module DanarchyDeploy
           puts "\n    - Fake Run: Not changing '#{target}'."
           result[:verify_permissions][File.dirname(tmpfile)] = verify_permissions(File.dirname(tmpfile), dir_perms, options)
           result[:verify_permissions][tmpfile] = verify_permissions(tmpfile, file_perms, options)
-        elsif md5sum(target,tmpfile) == true
+        elsif files_identical?(target,tmpfile)
           puts "\n    - No change in '#{target}': Nothing to update here."
           result[:verify_permissions][File.dirname(target)] = verify_permissions(File.dirname(target), dir_perms, options)
           result[:verify_permissions][target] = verify_permissions(target, file_perms, options)
@@ -141,7 +159,7 @@ module DanarchyDeploy
       [owner, uid, group, gid]
     end
 
-    def self.md5sum(target, tmpfile)
+    def self.files_identical?(target, tmpfile)
       if File.exist?(target) && File.exist?(tmpfile)
         FileUtils.identical?(target, tmpfile)
       elsif File.exist?(target) && !File.exist?(tmpfile)

data/lib/danarchy_deploy/version.rb

@@ -1,3 +1,3 @@
 module DanarchyDeploy
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

data/templates/deploy_template.json

@@ -1,13 +1,41 @@
 {
   "hostname": "hostname",
-  "os": "gentoo|debian|ubuntu",
-  "ipv4": "IPv4 to use for deployment",
-  "ssh_user": "deploy-user",
-  "ssh_key": "/home/path/to/deploy-user/ssh_key.",
+  "os": "gentoo || debian || fedora || ubuntu || opensuse",
+  "ipv4": "IPv4 to use for remote deployment",
+  "ssh_user": "ssh-user",
+  "ssh_key": "/home/path/to/ssh-user/ssh_key.",
   "packages": [
     "package1",
     "package2"
   ],
+  "system": {
+    "update": "all || system || packages || none",
+    "fstab": {
+      "source": "builtin::system/fstab_gentoo_client.erb",
+      "mounts": [
+        {
+          "filesystem": "/",
+          "mountpoint": "/dev/sda3",
+          "type": "ext4",
+          "opts": "defaults,noatime",
+          "dump/pass": "0 0"
+        }
+      ]
+    }
+  },
+  "portage": {
+    "sync": false,
+    "templates": [
+      {
+        "target": "/etc/portage/make.conf",
+        "source": "builtin::portage/make.conf.erb",
+        "variables": {
+          "use": "bindist logrotate",
+          "features": "distcc"
+        }
+      }
+    ]
+  },
   "users": [
     {
       "username": "username",
@@ -16,22 +44,21 @@
       "gid": int,
       "sudoer": "username ALL = NOPASSWD: ALL",
       "ssh-authorized_keys": [
-	"ssh-ed25519 it0C5o6GHC8lxqctpexakfdA5o7LeSe+QbMhIl+GYtZ2OCMFliLsODDrrazR+u2y user@hostname",
-	"ssh-rsa K0APeEvotGunpBrl/LvSAG/gLUldCnOrL60v47QYjuqoGJmM3Fk8V29+8jZPp9Dl user@hostname"
+        "ssh-ed25519 it0C5o6GHC8lxqctpexakfdA5o7LeSe+QbMhIl+GYtZ2OCMFliLsODDrrazR+u2y user@hostname",
+        "ssh-rsa K0APeEvotGunpBrl/LvSAG/gLUldCnOrL60v47QYjuqoGJmM3Fk8V29+8jZPp9Dl user@hostname"
       ],
       "groups": [
-	int,
-	int
+        int
       ],
       "archives": [
-	{
-	  "target": "/path/to/extract/to/",
-	  "source": "/path/to/tarball.(tar.{gz,bz2}|zip)"
-	},
-	{
-	  "target": "/path/to/extract/to/",
-	  "data": "couchdb:base64_encoded_data"
-	}
+        {
+          "target": "/path/to/extract/to/",
+          "source": "/path/to/tarball.(tar.{gz,bz2}|zip)"
+        },
+        {
+          "target": "/path/to/extract/to/",
+          "data": "couchdb::base64_encoded_data"
+        }
       ]
     }
   ],
@@ -50,48 +77,48 @@
         ]
       },
       "archives": [
-	{
-	  "target": "/path/to/extract/to/",
-	  "source": "/path/to/tarball.(tar.{gz,bz2}|zip)"
-	},
-	{
-	  "target": "/path/to/extract/to/",
-	  "data": "couchdb:base64_encoded_data"
-	}
+        {
+          "target": "/path/to/extract/to/",
+          "source": "/path/to/tarball.(tar.{gz,bz2}|zip)"
+        },
+        {
+          "target": "/path/to/extract/to/",
+          "data": "couchdb::base64_encoded_data"
+        }
       ],
       "templates": [
-	{
-	  "target": "/path/to/target/file",
-	  "source": "/path/to/source/erb",
-	  "dir_perms": {
+        {
+          "target": "/path/to/target/file",
+          "source": "/path/to/source/erb",
+          "dir_perms": {
             "owner": "username",
             "group": "groupname",
             "mode": "0755"
-	  },
-	  "file_perms": {
+          },
+          "file_perms": {
             "owner": "username",
             "group": "groupname",
             "mode": "0644"
-	  },
-	  "variables": {
-	    "var1": "value",
-	    "var2": "value"
-	  }
-	},
-	{
-	  "target": "/path/to/target/file",
-	  "data": "couchdb:base64_encoded_erb",
-	  "dir_perms": {
+          },
+          "variables": {
+            "var1": "value",
+            "var2": "value"
+          }
+        },
+        {
+          "target": "/path/to/target/file",
+          "data": "couchdb::base64_encoded_erb",
+          "dir_perms": {
             "owner": "username",
             "group": "groupname",
             "mode": "0755"
-	  },
-	  "file_perms": {
+          },
+          "file_perms": {
             "owner": "username",
             "group": "groupname",
             "mode": "0644"
-	  }
-	}
+          }
+        }
       ]
     }
   }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danarchy_deploy
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Dan James
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-16 00:00:00.000000000 Z
+date: 2023-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danarchy_couchdb
@@ -147,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Pushes deployments locally or remotely based on a JSON/YAML/CouchDB template.