envirobly-orchestra 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27540543de48daec3396d69ad5ce05079fefd25a0f76a092c914a8e2873a80e7
-  data.tar.gz: 96d0c5e27e028b8c0cc06df90c81bc111a5efe4d591c1926d201773443bc9e11
+  metadata.gz: 7a146603656b0f7d989daba62fac148bed321781ad26c5a822da7ec1b75bcc18
+  data.tar.gz: 7c8d3a88177da3422c850bc371c821ced7704413bcfcc5d3b475d7c812939083
 SHA512:
-  metadata.gz: 803c22a7247aa5e69a133436924146cb94d2d7d7f56258e446154fac304fcfdba4d4b60f84a1b9407af1505d12eb40946bb515ce19f1a6354b6ae73f178fc82a
-  data.tar.gz: d16b2d572fbb2acd1357c733af6083ea5020cc82eee376c771ffcab3ec5a795bccd9cb948f558247fcec5c27e02950a44add0d7247d0f497da8bb1f856d6bb55
+  metadata.gz: cdfee431c6e723f79c5cfb647104f974cb12ca40b1975bfe1b1c1a43528cf51f84cf7dc110b1bd9549c520cd93f79210be674484787a5b9077bf9b21c407fb72
+  data.tar.gz: d16acac39984a4d0d15dd2de18cf0460c7b1b4973449774a904c87ed521fa89062bd36995b276b532f20bed69148720ee7e95e03ce43d9380896dc09341b77d0

data/lib/orchestra/base.rb

@@ -1,4 +1,5 @@
 require "thor"
+require "logger"
 
 class Orchestra::Base < Thor
   def self.exit_on_failure?
@@ -27,13 +28,16 @@ class Orchestra::Base < Thor
     end
 
     def log(text)
-      Orchestra::Logger.instance.log "inv-#{Thread.current[:invocation]} #{text}"
+      # Size-based rotated logging: 3 10-megabyte files.
+      @logger ||= Logger.new("/var/log/orchestra.log", 3, 10485760)
+
+      @logger.info text
     end
 
     def execute(cmd, exit_on_failure: true)
       stdout_and_err, status = Open3.capture2e *cmd
 
-      log stdout_and_err unless stdout_and_err.blank?
+      log stdout_and_err unless stdout_and_err.nil? || stdout_and_err.empty?
 
       if exit_on_failure && status.to_i > 0
         exit 1

data/lib/orchestra/cli/services.rb

@@ -1,6 +1,8 @@
 require "open3"
 # require "httpx"
 require "pathname"
+require "yaml"
+require "erb"
 
 class Orchestra::Cli::Services < Orchestra::Base
   desc "up", "Start services based on config synced from config bucket"
@@ -99,7 +101,7 @@ class Orchestra::Cli::Services < Orchestra::Base
 
     def initialize_data_volumes
       compose_definition["services"].each do |_, service|
-        next if service.dig("labels", "envirobly.data-volume.pool").blank?
+        next unless service["labels"]
 
         zpool              = service["labels"]["envirobly.data-volume.pool"]
         mountpoint         = service["labels"]["envirobly.data-volume.pool.mountpoint"]
@@ -107,6 +109,8 @@ class Orchestra::Cli::Services < Orchestra::Base
         dataset_mountpoint = service["labels"]["envirobly.data-volume.dataset.mountpoint"]
         device             = service["labels"]["envirobly.data-volume.device"]
 
+        next if zpool.nil? || mountpoint.nil? || zfs_dataset.nil? || dataset_mountpoint.nil? || device.nil?
+
         if zfs_dataset_exist?(zfs_dataset)
           log " ZFS dataset exists"
           next

data/lib/orchestra/logger.rb

@@ -1,5 +1,6 @@
 require "singleton"
 
+# @deprecated in favor of Ruby's Logger
 class Orchestra::Logger
   include Singleton
 

data/lib/orchestra/version.rb

@@ -1,3 +1,3 @@
 module Orchestra
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/lib/orchestra.rb

@@ -1,8 +1,8 @@
 module Orchestra
 end
 
-require "active_support"
-require "active_support/core_ext"
+# require "active_support"
+# require "active_support/core_ext"
 require "zeitwerk"
 
 loader = Zeitwerk::Loader.for_gem

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: envirobly-orchestra
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Robert Starsi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-21 00:00:00.000000000 Z
+date: 2024-01-22 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '7.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement