harbr 0.0.73 → 0.0.75

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 710363b4f0ee2a30d0aed02b1caede2e9c85caeb3b76d70eb8a914b3d4733bdf
-  data.tar.gz: 01faa575952ff5e18574d0a264b275d2e6670aa01421655918d640b554b7eb7b
+  metadata.gz: 24c9a6c440b96bf2df8658095ee67d71f257f8d2ce1db94dbec1c0e6079a2c61
+  data.tar.gz: 535eb68733f63f8bb561cc2b84365f786dd6395a00d824b76907541a0226c673
 SHA512:
-  metadata.gz: e7ada50cc1e6ad02a3f509d44697a406e537154cd23de69746df97793622c2239f0e7cd3d9983c9eab62467063c08302bb82a842c319d2975c9214a1d3a5f017
-  data.tar.gz: 2bed190ddedaeaec6877e6d763b6950bfd6e721637799dea9cf453e79a561b30aa58a50a48fe6f8182d0dc1cd3e407a9d9eb78692a395e59988489d732f8f191
+  metadata.gz: 102dca943b77b5d715e2ae6cbe5b9eca8a5fda8b2657b477cce6e38c3b0660c0aa555e68842443262e6dd80b481d9c4efaed4bf6281ed7923025497dda639a0f
+  data.tar.gz: dbd8193d07ff643901d0c91dde8c1f5b7fca9627a96398082770c1a3d47fe35ca6ed83fb86d3ff73a3fc65a3d781fc45bd7fc89426a31a45dc52ed0a47e884b8

data/lib/harbr/next/job.rb

@@ -10,37 +10,55 @@ module Harbr
         OpenStruct.new(manifest_data)
       end
 
+      
       def create_traefik_config(containers)
-        config = {
-          "http" => {
-            "routers" => {
-              "traefik-dashboard" => {
-                "rule" => "Host(`traefik.harbr.zero2one.ee`)",
-                "service" => "api@internal"
+        config = initialize_config
+
+        containers.each do |container|
+          container.ip = '127.0.0.1'
+          add_router_to_config(config, container)
+          add_service_to_config(config, container)
+        end
+
+        write_config_to_file(config)
+      end
+
+      private
+
+      def initialize_config
+        {
+          'http' => {
+            'routers' => {
+              'traefik-dashboard' => {
+                'rule' => 'Host(`traefik.harbr.zero2one.ee`)',
+                'service' => 'api@internal'
               }
             },
-            "services" => {}
+            'services' => {}
           }
         }
+      end
 
-        containers.each do |container|
-          container.ip = "127.0.0.1"
+      def add_router_to_config(config, container)
+        config['http']['routers']["#{container.name}-router"] = {
+          'rule' => "Host(`#{container.host_header}`)",
+          'service' => "#{container.name}-service"
+        }
+      end
 
-          config["http"]["routers"]["#{container.name}-router"] = {
-            "rule" => "Host(`#{container.host_header}`)",
-            "service" => "#{container.name}-service"
-          }
-          config["http"]["services"]["#{container.name}-service"] = {
-            "loadBalancer" => {
-              "servers" => [{"url" => "http://#{container.ip}:#{container.port}"}]
-            }
+      def add_service_to_config(config, container)
+        config['http']['services']["#{container.name}-service"] = {
+          'loadBalancer' => {
+            'servers' => [{'url' => "http://#{container.ip}:#{container.port}"}]
           }
-        end
-
-        File.write("/etc/traefik/harbr.toml", TomlRB.dump(config))
-        puts "Traefik configuration written to /etc/traefik/harbr.toml"
+        }
       end
 
+      def write_config_to_file(config)
+        File.write('/etc/traefik/harbr.toml', TomlRB.dump(config))
+        puts 'Traefik configuration written to /etc/traefik/harbr.toml'
+      end
+      
       def create_run_script(container_name, port)
         service_dir = "/etc/sv/harbr/#{container_name}/next"
 
@@ -88,12 +106,8 @@ module Harbr
         port = `port assign next.#{manifest.port}`.strip
         puts "Port assigned: #{port}"
 
-        #puts `lsof -i :#{port} | awk 'NR!=1 {print $2}' | xargs kill -9`
-
         `rm -rf /etc/sv/harbr/#{manifest.name}/next`
-        system("ln -s /var/harbr/#{manifest.name}/versions/#{manifest.version}/ /etc/sv/harbr/#{manifest.name}/next")
-        puts "Linked to: /etc/sv/harbr/#{manifest.name}/next"
-        
+
         create_a_service(manifest.name, port)
 
         containers = Container::Repository.new
@@ -116,6 +130,12 @@ module Harbr
         system("cd /var/harbr/#{manifest.name}/next && bundle install")        
         system("sv restart next.#{manifest.name}")
         puts "Started container: next.#{manifest.name}"
+
+        system("ln -s /var/harbr/#{manifest.name}/versions/#{manifest.version}/ /etc/sv/harbr/#{manifest.name}/next")
+        puts "Linked to: /etc/sv/harbr/#{manifest.name}/next"
+
+
+        
         create_traefik_config(containers.all)
       end
 

data/lib/harbr/version.rb

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

metadata

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