harbr 0.0.77 → 0.0.78

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f40ae935a661bc9e3999ca1083921bbad577ec219b1270eb7bda6c15bcfaf785
-  data.tar.gz: 8ccc4d896eccf86d8f94ab9f11f8836d0dfb0c7072ed5e5306b1257742b80540
+  metadata.gz: 3cfbe8ee63ba9673159a4cbe99bff5508886e603274bdfe7eca373e4fad1cf1d
+  data.tar.gz: 27e468bb49b774ecb556fa6553e9b2134a98a06c7e3bd3a312cb45c848ddfc5d
 SHA512:
-  metadata.gz: f4273c533d657ba4f96a3d896b1400a1ca9f7451f39a4233eb77b1f8ec29bb1d2fa44027a875202642d185beb5e1bd003dc7b41090de3eb6fac26970c8b00b88
-  data.tar.gz: cb7b2910e9f39ef1f35c360f83ca0a63221658001a56313b4456c51be61513024750be379be3b41b9d8da6ecc74a0c5465984b619c2c265fb791df495ff31aa9
+  metadata.gz: 53e4d7f9397d59ecfd496c717b1fb983f29cd6b1c2a81ba9225cae566c8c1f09d8f99ab1e3c3bb5ed3c4897eee7f738f76a65b79b6b2216ad4d6fc1521c75783
+  data.tar.gz: 1dca696d45363ca0645f94b8b6813d9f8c6e1e3d4b86e734a8f585c0371cd86867c1e06dc0fb817bde2c3bc9fbe92b2cbd1c39c1d3480323d6f7fb9d8f65b3b3

data/exe/harbr

@@ -43,7 +43,7 @@ class HarbrCLI < Thor
     end
 
     def scan_for_containers
-      Dir.glob("/var/harbr/*").each_with_object({}) do |container_path, hash|
+      Dir.glob("/var/harbr/containers/*").each_with_object({}) do |container_path, hash|
         next unless File.directory?(container_path)
         container_name = File.basename(container_path)
         versions = Dir.glob("#{container_path}/versions/*").select { |path| File.directory?(path) }
@@ -76,7 +76,6 @@ class HarbrCLI < Thor
       else
         Harbr::Next::Job.perform_async(container, version)
         puts "deploy next version #{version} of #{container}"
-
       end
     end
 
@@ -154,7 +153,7 @@ class HarbrCLI < Thor
   desc "setup", "Set up Harbr environment"
   def setup
     # Check and create /var/harbr directory
-    check_and_create_directory("/var/harbr")
+    check_and_create_directory("/var/harbr/containers")
 
     # Check for Ruby, Traefik, and runit, and install if necessary
     install_with_snap("ruby") unless command_exists?("ruby")
@@ -170,14 +169,14 @@ class HarbrCLI < Thor
     display_containers_table(container_repo.all)
   end
 
-  desc "monitor", "Monitor /var/harbr for new container versions"
+  desc "monitor", "Monitor /var/harbr/comtainers for new container versions"
   def monitor
-    puts "Monitoring /var/harbr for new container versions..."
+    puts "Monitoring /var/harbr/containers for new container versions..."
     last_known_state = {}
 
     loop do
       current_state = scan_for_containers
-      new_versions = current_state.keys - last_known_state.keys
+      new_versions = current_state.keys - last_known_state.keysß
 
       new_versions.each do |container_version|
         container, version = container_version.split("/versions/")

data/lib/harbr/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Harbr
-  VERSION = "0.0.77"
+  VERSION = "0.0.78"
 end

data/lib/harbr.rb

@@ -14,7 +14,7 @@ require_relative "harbr/next/job"
 
 # Harbr module for managing containers, jobs, ports, and 2s
 module Harbr
-  DEFAULT_DIRECTORY = "/var/harbr"
+  DEFAULT_DIRECTORY = "/var/harbr/containers"
   DEFAULT_DIRECTORY_DATA_DIR = "#{DEFAULT_DIRECTORY}/.data"
   class Error < StandardError; end
 
@@ -22,84 +22,7 @@ module Harbr
     directories = Dir.glob("#{path}/*").select { |entry| File.directory?(entry) }
     directories.max_by { |entry| entry[/\d+/].to_i }
   end
-
-  module Runit
-    class Run
-      def initialize(container, port)
-        @container_name = container
-        @port = port
-      end
-
-      def to_s
-        <<~SCRIPT
-          #!/bin/sh
-          exec 2>&1
-          cd /var/harbr/#{@container_name}/current
-          exec ./exe/run #{@port}
-        SCRIPT
-      end
-
-      def link
-        "ln -s /etc/sv/harbr/#{@container_name} /etc/service/#{@container_name}"
-      end
-    end
-
-    class Log
-      def initialize(container, port)
-        @container_name = container
-      end
-
-      def to_s
-        <<~SCRIPT
-          #!/bin/sh
-          exec svlogd -tt /var/log/harbr/#{@container_name}/next/
-        SCRIPT
-      end
-
-      def link
-        "ln -s /etc/sv/harbr/#{@container_name}/log /etc/service/#{@container_name}/log"
-      end
-    end
-
-    module Next
-      class Run
-        def initialize(container, port)
-          @container_name = container
-          @port = port
-        end
-
-        def to_s
-          <<~SCRIPT
-            #!/bin/sh
-            exec 2>&1
-            cd /var/harbr/#{@container_name}/next
-            exec ./exe/run #{@port}
-          SCRIPT
-        end
-
-        def link
-          "ln -s /etc/sv/harbr/#{@container_name}/next /etc/service/next.#{@container_name}"
-        end
-      end
-
-      class Log
-        def initialize(container, port)
-          @container_name = container
-        end
-
-        def to_s
-          <<~SCRIPT
-            #!/bin/sh
-            exec svlogd -tt /var/log/harbr/#{@container_name}/next/
-          SCRIPT
-        end
-
-        def link
-          "ln -s /etc/sv/harbr/#{container_name}/next/log/ /etc/service/next.#{container_name}/log"
-        end
-      end
-    end
-  end
+  
 end
 
 Dddr.configure do |config|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: harbr
 version: !ruby/object:Gem::Version
-  version: 0.0.77
+  version: 0.0.78
 platform: ruby
 authors:
 - Delaney Kuldvee Burke
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-12-13 00:00:00.000000000 Z
+date: 2023-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: listen