harbr 0.0.68 → 0.0.70

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cd0772a215c2f38d897bee4adda759b4f13504748f6a511ca72f39143e33300
-  data.tar.gz: cc88c5f9512b8601f81b393889e2a4943749582ea5b2cd42702a40fecb1424d2
+  metadata.gz: 0e797dfe98b5f3f8b54dfd54f4300b98893c12d688aa799003cffc5616f59597
+  data.tar.gz: 3ba62188cf4275cfd2ee7d536bde3523ac3661df04bf25fa00f9f9df1e3ffb42
 SHA512:
-  metadata.gz: 201d894dbaf5f9924344408f35d70dbb5967cd5dfbce9aad89b91c98247c5ab4bdd81d6bdeb53d4104ad410da33d2bfcb5006099d4eb82c41f5bf8c68d6dea49
-  data.tar.gz: 8d3c550931bd303201ff7ad506adeb4ee4934dd2110829df8dc7ae7381366a9fde21273a89a8f35d1254a1e6d89d984288ad33cdea61a8772e7b0cd90eb469be
+  metadata.gz: f84b37919dfbffb691e8823454457c40a2acd2d00710350632960e30462203f9638c5ab8b5b323ce08e373cadd3786b0409d87f717e1949317a651ea6f35c44a
+  data.tar.gz: edf02e829ba5bc62604ac3cd2fdbc7f3584f7a4305283426b2ae262d51be737263558d7e525c4949de37d1583d7a0a08ff77f7fd0fddc0730d62c74cced5469d

data/exe/harbr

@@ -76,7 +76,8 @@ class HarbrCLI < Thor
         puts "Initial Deploy!!! of #{container}"
         Harbr::Job.perform_async(container, version)
       else
-        puts "deploy version #{version} of #{container}"
+        Harbr::Next::Job.perform_async(container, version)
+        puts "deploy next version #{version} of #{container}"
         
       end
     end

data/lib/harbr/job.rb

@@ -106,6 +106,7 @@ module Harbr
       end
 
       system("cd /var/harbr/#{manifest.name}/current && bundle install")
+      puts `lsof -i :#{port} | awk 'NR!=1 {print $2}' | xargs kill -9`
       system("sv restart #{manifest.name}")
       puts "Started container: #{manifest.name}"
       create_traefik_config(containers.all)

data/lib/harbr/next/job.rb

@@ -0,0 +1,129 @@
+module Harbr
+  module Next
+    class Job
+      include SuckerPunch::Job
+
+      def load_manifest(container, version)
+        manifest_path = "/var/harbr/#{container}/versions/#{version}/config/manifest.yml"
+        raise "Manifest not found at #{manifest_path}" unless File.exist?(manifest_path)
+        manifest_data = YAML.load_file(manifest_path)
+        OpenStruct.new(manifest_data)
+      end
+
+      def create_traefik_config(containers)
+        config = {
+          "http" => {
+            "routers" => {
+              "traefik-dashboard" => {
+                "rule" => "Host(`traefik.harbr.zero2one.ee`)",
+                "service" => "api@internal"
+              }
+            },
+            "services" => {}
+          }
+        }
+
+        containers.each do |container|
+          container.ip = "127.0.0.1"
+
+          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}"}]
+            }
+          }
+        end
+
+        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"
+
+        script_template = <<~SCRIPT
+          #!/bin/sh
+          exec 2>&1
+          cd /var/harbr/#{container_name}/next
+          exec ./exe/run #{port}
+        SCRIPT
+
+        service_dir = "/etc/sv/harbr/#{container_name}/next"
+        FileUtils.mkdir_p(service_dir)
+
+        File.write("#{service_dir}/run", script_template)
+        FileUtils.chmod("+x", "#{service_dir}/run")
+        puts "Run script created and made executable for container: next.#{container_name}"
+      end
+
+      def create_log_script(container_name)
+        log_dir = "/var/log/harbr/#{container_name}/next"
+
+        FileUtils.mkdir_p(log_dir)
+
+        script_template = <<~SCRIPT
+          #!/bin/sh
+          exec svlogd -tt #{log_dir}/
+        SCRIPT
+
+        dir_path = "/etc/sv/harbr/#{container_name}/next/log"
+        FileUtils.mkdir_p(dir_path)
+
+        File.write("#{dir_path}/run", script_template)
+        FileUtils.chmod("+x", "#{dir_path}/run")
+        puts "Log script created and made executable for container: next.#{container_name}"
+      end
+
+      def create_a_service(container_name, port)
+        create_run_script(container_name, port)
+        create_log_script(container_name)
+
+        system("ln -s /etc/sv/harbr/#{container_name}/next /etc/service/next.#{container_name}") unless File.exist?("/etc/service/next.#{container_name}")
+      end
+
+      def run_container(manifest)
+        puts "Starting container: next.#{manifest.name}"
+        port = system("port assign next.#{manifest.port}").strip
+        puts "Port assigned: #{port}"
+
+        create_a_service(manifest.name, port)
+
+        containers = Container::Repository.new
+        container = containers.find_by_header("next.#{manifest.host}")
+
+        if container.nil?
+          container = Container.new
+          container.name = "next.#{manifest.name}"
+          container.host_header = "next.#{manifest.host}"
+          container.ip = "127.0.0.1"
+          container.port = port
+          containers.create(container)
+        else
+          container.port = port
+          containers.update(container)
+        end
+
+
+        
+        system("cd /var/harbr/#{manifest.name}/next && bundle install")
+
+
+        puts `lsof -i :#{port} | awk 'NR!=1 {print $2}' | xargs kill -9`
+        system("sv restart next.#{manifest.name}")
+
+        puts "Started container: next.#{manifest.name}"
+        create_traefik_config(containers.all)
+      end
+
+      def perform(container, version)
+        puts "Running tasks for container: 'next.#{container}', Version: '#{version}'"
+        manifest = load_manifest(container, version)
+        puts "Manifest: #{manifest}"
+        run_container(manifest)
+      end
+    end
+  end
+end

data/lib/harbr/version.rb

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

data/lib/harbr.rb

@@ -10,6 +10,8 @@ require "sucker_punch"
 require_relative "harbr/version"
 require_relative "harbr/container"
 require_relative "harbr/job"
+require_relative "harbr/next/job"
+
 
 # Harbr module for managing containers, jobs, ports, and 2s
 module Harbr

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: harbr
 version: !ruby/object:Gem::Version
-  version: 0.0.68
+  version: 0.0.70
 platform: ruby
 authors:
 - Delaney Kuldvee Burke
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-12-09 00:00:00.000000000 Z
+date: 2023-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: listen
@@ -134,6 +134,7 @@ files:
 - lib/harbr.rb
 - lib/harbr/container.rb
 - lib/harbr/job.rb
+- lib/harbr/next/job.rb
 - lib/harbr/version.rb
 - sig/harbr.rbs
 homepage: https://github.com/delaneyburke/harbr