harbr 0.1.17 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bdeb351b67890252df89a99f18bdf2541540aca0033460f4fe8380254dccfaa
-  data.tar.gz: 3a5620d791e5eeae7c5cbe667bee6ea7ec040db00c8165ca703984328a3d45de
+  metadata.gz: f84f995e2f55490fd922cdf4328203e7c71000fd493e71a244965be25ac276ff
+  data.tar.gz: 3031f0493b7d188e1896ccef951bd227184912d8f54b219e0fec2a45fadee113
 SHA512:
-  metadata.gz: 0eac17e4dec14a0eb7635d91475f5facc5ce6d3ddce3c90d07aebebd8186803cf0ba59f1e81b994a6d089ab0c88969a6e57c14a47e2b65b3519e08941ea83891
-  data.tar.gz: d41bdc758f50ccbe1345046abb877b4ed72a1ed7f44b32d6fb9fc4a0fbcf137c4966202292035b5fed276719e8fe4cb279c9865fe13d276345829bf0bcf27037
+  metadata.gz: 95286884b0ed7a3188365a715fe7ad6f0242d9350c99bd68de4d25c730faa31c9a19be56cef432dfe16df8a47c38f9d9b972ab72a93f73dbc88368c41e574558
+  data.tar.gz: 8244ab88f087df540e5a27b038eaf087ee28f2c9b200eefd0f4beccba6d3db089c9022f1be796b5a5d8ea6a2421bdf5cc92f010a1dc4b5f8b06e38092e5d47db

data/exe/harbr

@@ -3,12 +3,6 @@ require_relative "../lib/harbr"
 
 class HarbrCLI < Thor
   no_commands do
-    def highest_numbered_directory(path)
-      directories = Dir.glob("#{path}/*").select { |entry| File.directory?(entry) }
-      directories.max_by { |entry| entry[/\d+/].to_i }
-    end
-
-
     def display_containers_table(containers)
       return puts "No containers available." if containers.empty?
 
@@ -73,16 +67,12 @@ class HarbrCLI < Thor
 
     def run_jobs(container, version)
       puts "Running tasks for container: #{container}, version: #{version}"
-      puts "waiting for 3 seconds"
-      sleep 3
-      puts "done waiting"
+      sleep 1
       if version.to_i == 0
-        puts "Initial Deploy!!! of #{container}"
         Harbr::Job.perform_async(container, version)
-      else
-        Harbr::Next::Job.perform_async(container, version)
-        puts "deploy next version #{version} of #{container}"
       end
+      Harbr::Next::Job.perform_async(container, version)
+      puts "deploy next version #{version} of #{container}"
     end
 
     def create_traefik_config(containers)
@@ -183,6 +173,13 @@ desc "peek CONTAINER", "Peek in a given container"
 
   desc "deploy", "deploy a container to production"
   def deploy(name)
+
+  
+    if version.to_i == 0
+      puts "Initial Deploy!!! of #{container}"
+      Harbr::Job.perform_async(container, version)
+    end
+        
     Dir.chdir("/var/harbr/containers/#{name}/") do
       
       /(?<current>. * -> (?<path>.*))/.match(`ls -l /var/harbr/containers/#{name}/current`)

data/lib/harbr/job.rb

@@ -2,12 +2,7 @@ require 'harbr'
 module Harbr
   class Job
     include SuckerPunch::Job
-
-    def highest_numbered_directory(path)
-      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

data/lib/harbr/next/job.rb

@@ -8,11 +8,6 @@ module Harbr
     class Job
       include SuckerPunch::Job
 
-      def highest_numbered_directory(path)
-        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

data/lib/harbr/version.rb

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

data/lib/harbr.rb

@@ -17,12 +17,6 @@ module Harbr
   DEFAULT_DIRECTORY = "/var/harbr/containers"
   DEFAULT_DIRECTORY_DATA_DIR = "#{DEFAULT_DIRECTORY}/.data"
   class Error < StandardError; end
-
-  def self.highest_numbered_directory(path)
-    directories = Dir.glob("#{path}/*").select { |entry| File.directory?(entry) }
-    directories.max_by { |entry| entry[/\d+/].to_i }
-  end
-  
 end
 
 Dddr.configure do |config|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: harbr
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.1.18
 platform: ruby
 authors:
 - Delaney Kuldvee Burke
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-12-18 00:00:00.000000000 Z
+date: 2023-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: listen
@@ -118,7 +118,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- "!"
 - ".data/development/Harbr::Port.dir"
 - ".data/development/Harbr::Port.pag"
 - ".rspec"

data/!

@@ -1,177 +0,0 @@
-require 'harbr'
-module Harbr
-  class Job
-    include SuckerPunch::Job
-
-    def highest_numbered_directory(path)
-      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
-
-
-    def create_traefik_config(containers)
-      config = {
-        "http" => {
-          "routers" => {
-            "traefik-dashboard" => {
-              "rule" => "Host(`traefik.harbr.zero2one.ee`)",
-              "service" => "api@internal",
-              "tls" => {}  # Enable TLS for the dashboard
-            }
-          },
-          "services" => {}
-        }
-      }
-
-      containers.each do |container|
-        container.ip = "127.0.0.1"
-        name = container.name.gsub(".", "-")
-
-        # Create the router with TLS enabled
-        config["http"]["routers"]["#{name}-router"] = {
-          "rule" => "Host(`#{container.host_header}`)",
-          "service" => "#{name}-service",
-          "tls" => {
-            "certResolver" => "letsencrypt"  # Specify the certificate resolver for TLS
-          }
-        }
-
-        # Create the service
-        config["http"]["services"]["#{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 collate_containers(name,host,port)
-
-      containers = Harbr::Container::Repository.new
-      container = containers.find_by_header(host)
-
-      if container.nil?
-        container = Harbr::Container.new
-        container.name = name
-        container.host_header =host
-        container.ip = "127.0.0.1"
-        container.port = port
-        containers.create(container)
-      else
-        container.port = port
-        containers.update(container)
-      end
-      containers.all
-    end
-
-
-    module Runit
-
-      class Run
-        def initialize(container, port)
-          @container_name = container
-          @port = port
-        end
-
-        def to_s
-          script_template = <<~SCRIPT
-          #!/bin/sh
-          exec 2>&1    
-          cd /var/harbr/containers/#{@container_name}/current
-          exec ./exe/run #{@port} live 
-          SCRIPT
-        end
-
-        def link
-          "ln -s /etc/sv/harbr/#{@container_name} /etc/service/#{@container_name}"
-        end
-      end
-
-
-      class Finish
-        def initialize(port)
-          @port = port
-        end
-
-        def to_s
-          script_template = <<~SCRIPT
-          #!/bin/sh
-          sleep 3
-          `lsof -i :#{@port} | awk 'NR!=1 {print $2}' | xargs kill`
-          SCRIPT
-        end
-      end
-
-      class Log
-        def initialize(container)
-          @container_name = container
-        end
-
-        def to_s
-          script_template = <<~SCRIPT
-          #!/bin/sh
-          exec svlogd -tt /var/log/harbr/#{@container_name}
-          SCRIPT
-        end
-
-      end
-
-    end
-
-    def write_to_file(path, contents)
-      File.open(path, 'w') do |file|
-        file.write(contents)
-      end
-    end
-
-    def load_manifest(container, version)
-      manifest_path = "/var/harbr/containers/#{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 perform(name,version)
-
-      Dir.chdir "/var/harbr/containers/#{name}/versions/#{version}" do
-
-        `bundle config set --local path 'vendor/bundle'`
-        manifest = load_manifest(name, version)
-        port = `port assign #{manifest.port}`.strip
-        system "sv stop #{name}" if File.exist?("/etc/service/#{name}")
-        system 'bundle install'
-
-
-        `mkdir -p /etc/sv/harbr/#{name}`
-        `mkdir -p /etc/sv/harbr/#{name}/log`
-        `mkdir -p /var/log/harbr/#{name}`
-
-        write_to_file "/etc/sv/harbr/#{name}/run", Runit::Run.new(name, port).to_s
-        write_to_file "/etc/sv/harbr/#{name}/finish", Runit::Finish.new(port).to_s
-        write_to_file "/etc/sv/harbr/#{name}/log/run", Runit::Log.new(name).to_s
-
-        `chmod +x /etc/sv/harbr/#{name}/run`
-        `chmod +x /etc/sv/harbr/#{name}/log/run`
-        `chmod +x /etc/sv/harbr/#{name}/finish`
-
-        system "ln -sf /var/harbr/containers/#{name}/versions/#{version} /var/harbr/containers/#{name}/current"
-        system "ln -sf /etc/sv/harbr/#{name} /etc/service/#{name}"
-
-        containers = collate_containers(name, manifest.host, port)
-        create_traefik_config(containers)
-        puts "process #{version} of #{name}"
-      end
-
-    end
-
-  end
-
-end