harbr 0.0.77 → 0.0.80

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f40ae935a661bc9e3999ca1083921bbad577ec219b1270eb7bda6c15bcfaf785
-  data.tar.gz: 8ccc4d896eccf86d8f94ab9f11f8836d0dfb0c7072ed5e5306b1257742b80540
+  metadata.gz: faf169d8747490a5212c404ba4ae0ccf82009544bb5d0b6b0e888d425cba64a4
+  data.tar.gz: 35b2f2767321282d31d24bd37b6e6d811c235dde939eed1c50e4ae2fad8e3f98
 SHA512:
-  metadata.gz: f4273c533d657ba4f96a3d896b1400a1ca9f7451f39a4233eb77b1f8ec29bb1d2fa44027a875202642d185beb5e1bd003dc7b41090de3eb6fac26970c8b00b88
-  data.tar.gz: cb7b2910e9f39ef1f35c360f83ca0a63221658001a56313b4456c51be61513024750be379be3b41b9d8da6ecc74a0c5465984b619c2c265fb791df495ff31aa9
+  metadata.gz: d61e0272279a4c362d282771e0b155022b47dc40ef514a760b51e4d5c90e1785891e02e806da5261c1845d411d5a5ab8abce4e2bf5af24ee6b7db6fc6aef8a3d
+  data.tar.gz: cedb23c1d39e632d24d4cfbeb377474a763b5bfdcc2d7430ee49c120c672fb70e6704d954f8bf724b506289f051fd3f30a842f887db326156f52712c083a1feb

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) }
@@ -60,12 +60,12 @@ class HarbrCLI < Thor
         puts "Container '#{container}', Version '#{version}' is already placed."
       else
         puts "Placing container: '#{container}', Version: '#{version}'"
-        run_tasks(container, version)
+        run_jobs(container, version)
         File.open(PLACED_FILE, "a") { |file| file.puts("#{container}/#{version}") }
       end
     end
 
-    def run_tasks(container, version)
+    def run_jobs(container, version)
       puts "Running tasks for container: #{container}, version: #{version}"
       puts "waiting for 3 seconds"
       sleep 3
@@ -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,9 +169,9 @@ 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

data/lib/harbr/next/job.rb

@@ -12,7 +12,7 @@ module Harbr
         directories = Dir.glob("#{path}/*").select { |entry| File.directory?(entry) }
         directories.max_by { |entry| entry[/\d+/].to_i }
       end
-      
+
       def get_container_name(path)
         File.basename(path)
       end
@@ -182,51 +182,46 @@ module Harbr
         OpenStruct.new(manifest_data)
       end
 
-      def perform
+      def perform(name, version)
         `bundle config set --local path 'vendor/bundle'`
-        
-        Dir.glob('/var/harbr/containers/*').select { |f| File.directory? f }.each do |container_path|
-          latest_version = highest_numbered_directory("#{container_path}/versions")
+    
+        container_path = "/var/harbr/containers/#{name}/versions/#{version}"
+        latest_version = highest_numbered_directory("#{container_path}/versions")
           
-          version = get_container_name(latest_version)
-          name = get_container_name(container_path)
-          manifest = load_manifest(name,version)
-        
-          check_container_version(name, version) do
-        
-            current_path = "/var/harbr/containers/#{name}/versions/#{version}"
-        
-            port = `port assign next.#{manifest.port}`.strip
-        
-            Dir.chdir current_path do
-        
-              system "sv stop #{name}"
-              system "bundle install" 
-        
-              `mkdir -p /etc/sv/harbr/#{name}/next`
-              `mkdir -p /etc/sv/harbr/#{name}/next/log`
-              `mkdir -p /var/log/harbr/#{name}/next/log`
-        
-              write_to_file "/etc/sv/harbr/#{name}/next/run", Runit::Next::Run.new(name,port).to_s
-              write_to_file "/etc/sv/harbr/#{name}/next/finish", Runit::Finish.new(port).to_s
-              write_to_file "/etc/sv/harbr/#{name}/next/log/run", Runit::Next::Log.new(name).to_s
-              
-              `chmod +x /etc/sv/harbr/#{name}/next/run`
-              `chmod +x /etc/sv/harbr/#{name}/next/log/run`
-              `chmod +x /etc/sv/harbr/#{name}/next/finish`
-              
-              
-              system "ln -s /var/harbr/containers/#{name}/versions/#{version} /var/harbr/containers/#{name}/next"
-              system "ln -s /etc/sv/harbr/#{name}/next /etc/service/next.#{name}"
-        
-              containers = collate_containers("next.#{name}","next.#{manifest.host}",port)
-              create_traefik_config(containers)
-            end
-        
-            puts "process #{version} of #{name}" 
-          end
+        version = get_container_name(latest_version)
+        name = get_container_name(container_path)
+        manifest = load_manifest(name,version)
+        current_path = "/var/harbr/containers/#{name}/versions/#{version}"
+      
+        port = `port assign next.#{manifest.port}`.strip
+    
+        Dir.chdir current_path do
+    
+          system "sv stop #{name}"
+          system "bundle install" 
+    
+          `mkdir -p /etc/sv/harbr/#{name}/next`
+          `mkdir -p /etc/sv/harbr/#{name}/next/log`
+          `mkdir -p /var/log/harbr/#{name}/next/log`
+    
+          write_to_file "/etc/sv/harbr/#{name}/next/run", Runit::Next::Run.new(name,port).to_s
+          write_to_file "/etc/sv/harbr/#{name}/next/finish", Runit::Finish.new(port).to_s
+          write_to_file "/etc/sv/harbr/#{name}/next/log/run", Runit::Next::Log.new(name).to_s
+          
+          `chmod +x /etc/sv/harbr/#{name}/next/run`
+          `chmod +x /etc/sv/harbr/#{name}/next/log/run`
+          `chmod +x /etc/sv/harbr/#{name}/next/finish`
+          
+          
+          system "ln -s /var/harbr/containers/#{name}/versions/#{version} /var/harbr/containers/#{name}/next"
+          system "ln -s /etc/sv/harbr/#{name}/next /etc/service/next.#{name}"
+    
+          containers = collate_containers("next.#{name}","next.#{manifest.host}",port)
+          create_traefik_config(containers)
         end
-
+      
+        puts "process #{version} of #{name}"         
+        
       end
 
     end

data/lib/harbr/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Harbr
-  VERSION = "0.0.77"
+  VERSION = "0.0.80"
 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.80
 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