harbr 0.0.29 → 0.0.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05f9f6f2cfa6a6e47b98bf065594b68346c8348b8ec770265cd0f4e4c0f143c4
-  data.tar.gz: 9c0196f50e7c60f93dc0666511dc80243949408a5f8247f09daf162f9941edd2
+  metadata.gz: aa8e693bce29b6b9d7d8140321e675ff673db168804972ed2e0e81d9b6840254
+  data.tar.gz: 3392caeb344b34ffc0c068918a406c93feb7e8f2a7abf48cce9368d07ce73386
 SHA512:
-  metadata.gz: b0f056c312eee44919da4409680f25c28933892d09a44f83c563c7566480a54917d43f330246196112f9c50f884d823a7bcf80281c3e1b87c00b32e6a1604b5a
-  data.tar.gz: 7f50616e3a8134dbacef6ecbdbc8d5376961bf088a18fc00cd7497d7f6ffe6ed9bfcb294e7b26966e71cf03b237170fc293f606fe31e959c40204b891870c7f0
+  metadata.gz: f44d0dd7e4941374ad502a3bd46ff2926540df7eee8e5e60f388d626c71fc498097177c5978b4cea1cccf4db607796b146e51006a9498f90e3c2d40347bec6ce
+  data.tar.gz: 97745289088960ae6ff286ab2bb7b77d0d2ad3bb1e624f67568d3c4dfc8d4f8a3cdfa65305b4c577879efc1cf47c6dce9a2dc1407b73787a2f3a078681276ab2

data/exe/harbr

@@ -1,13 +1,5 @@
 #!/usr/bin/env ruby
-require "thor"
-require "dddr"
-require "harbr"
-require "sucker_punch"
-require "terminal-table"
-require "yaml"
-require "toml-rb"
-require "fileutils"
-require "ostruct"
+require_relative "../lib/harbr"
 
 class HarbrCLI < Thor
   DEFAULT_DIRECTORY = "/var/harbr"

data/lib/harbr/container.rb

@@ -7,5 +7,10 @@ module Harbr
         all.find { |container| container.host_header.downcase == host_header.downcase }
       end
     end
+    
+    def number
+      port
+    end
+
   end
 end

data/lib/harbr/job.rb

@@ -1,123 +1,121 @@
 module Harbr
-  module Harbr
-    class Container
-      class Job
-        include SuckerPunch::Job
-        def create_traefik_config(containers)
-          config = {
-            "http" => {
-              "routers" => {
-                "traefik-dashboard" => {
-                  "rule" => "Host(`traefik.harbr.zero2one.ee`)",
-                  "service" => "api@internal"
-                }
-              },
-              "services" => {}
-            }
+  class Container
+    class Job
+      include SuckerPunch::Job
+      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"
+        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}"}]
-              }
+          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}"
-          if File.directory?(service_dir)
-            puts "Directory already exists: #{service_dir}"
-            return
-          end
-
-          script_template = <<~SCRIPT
-            #!/bin/sh
-            exec 2>&1
-            cd /var/harbr/#{container_name}/current
-            exec bundle install && bundle exec puma -p #{port}
-          SCRIPT
-
-          service_dir = "/etc/sv/harbr/#{container_name}"
-          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: #{container_name}"
-        end
+        File.write("/etc/traefik/harbr.toml", TomlRB.dump(config))
+        puts "Traefik configuration written to /etc/traefik/harbr.toml"
+      end
 
-        def create_log_script(container_name)
-          log_dir = "/var/log/harbr/#{container_name}"
+      def create_run_script(container_name, port)
+        service_dir = "/etc/sv/harbr/#{container_name}"
+        if File.directory?(service_dir)
+          puts "Directory already exists: #{service_dir}"
+          return
+        end
 
-          if File.directory?(log_dir)
-            puts "Directory already exists: #{log_dir}"
-            return
-          end
+        script_template = <<~SCRIPT
+          #!/bin/sh
+          exec 2>&1
+          cd /var/harbr/#{container_name}/current
+          exec bundle install && bundle exec puma -p #{port}
+        SCRIPT
 
-          FileUtils.mkdir_p(log_dir)
+        service_dir = "/etc/sv/harbr/#{container_name}"
+        FileUtils.mkdir_p(service_dir)
 
-          script_template = <<~SCRIPT
-            #!/bin/sh
-            exec svlogd -tt #{log_dir}/
-          SCRIPT
+        File.write("#{service_dir}/run", script_template)
+        FileUtils.chmod("+x", "#{service_dir}/run")
+        puts "Run script created and made executable for container: #{container_name}"
+      end
 
-          dir_path = "/etc/sv/harbr/#{container_name}/log"
-          FileUtils.mkdir_p(dir_path)
+      def create_log_script(container_name)
+        log_dir = "/var/log/harbr/#{container_name}"
 
-          File.write("#{dir_path}/run", script_template)
-          FileUtils.chmod("+x", "#{dir_path}/run")
-          puts "Log script created and made executable for container: #{container_name}"
+        if File.directory?(log_dir)
+          puts "Directory already exists: #{log_dir}"
+          return
         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} /etc/service/#{container_name}") unless File.exist?("/etc/service/#{container_name}")
-        end
+        FileUtils.mkdir_p(log_dir)
 
-        def run_container(manifest)
-          puts "Starting container: #{manifest.name}"
+        script_template = <<~SCRIPT
+          #!/bin/sh
+          exec svlogd -tt #{log_dir}/
+        SCRIPT
 
-          Dddr.configure do |config|
-            config.data_dir = Harbr::DEFAULT_DIRECTORY_DATA_DIR
-          end
+        dir_path = "/etc/sv/harbr/#{container_name}/log"
+        FileUtils.mkdir_p(dir_path)
 
-          pool = Harbr::Port::Pool.new
-          port = pool.get_port(manifest.host)
+        File.write("#{dir_path}/run", script_template)
+        FileUtils.chmod("+x", "#{dir_path}/run")
+        puts "Log script created and made executable for container: #{container_name}"
+      end
 
-          create_a_service(manifest.name, port.number)
+      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} /etc/service/#{container_name}") unless File.exist?("/etc/service/#{container_name}")
+      end
 
-          sleep 5
-          system("sv restart #{manifest.name}")
-          sleep 5
-          system("sv status #{manifest.name}")
-          puts "Started container: #{manifest.name}"
+      def run_container(manifest)
+        puts "Starting container: #{manifest.name}"
 
-          container = Container.new
-          containers = Container::Repository.new
+        Dddr.configure do |config|
+          config.data_dir = Harbr::DEFAULT_DIRECTORY_DATA_DIR
+        end
 
-          container.name = manifest.name
-          container.host_header = manifest.host
-          container.ip = manifest.ip.nil?
-          container.port = port.number
-          containers.add(container) unless containers.find_by_header(manifest.host)
+        pool = Harbr::Port::Pool.new
+        port = pool.get_port(manifest.host)
 
-          create_traefik_config(containers.all)
-        end
+        create_a_service(manifest.name, port.number)
 
-        def perform(manifest)
-          run_container(manifest)
-        end
+        sleep 5
+        system("sv restart #{manifest.name}")
+        sleep 5
+        system("sv status #{manifest.name}")
+        puts "Started container: #{manifest.name}"
+
+        container = Container.new
+        containers = Container::Repository.new
+
+        container.name = manifest.name
+        container.host_header = manifest.host
+        container.ip = manifest.ip.nil?
+        container.port = port.number
+        containers.add(container) unless containers.find_by_header(manifest.host)
+
+        create_traefik_config(containers.all)
+      end
+
+      def perform(manifest)
+        run_container(manifest)
       end
     end
   end

data/lib/harbr/version.rb

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

data/lib/harbr.rb

@@ -1,5 +1,12 @@
-require "sucker_punch"
+require "thor"
+require "dddr"
+require "harbr"
+require "terminal-table"
+require "yaml"
 require "toml-rb"
+require "fileutils"
+require "ostruct"
+require "sucker_punch"
 
 require_relative "harbr/version"
 require_relative "harbr/container"
@@ -17,4 +24,4 @@ module Harbr
   end
 
   class Error < StandardError; end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: harbr
 version: !ruby/object:Gem::Version
-  version: 0.0.29
+  version: 0.0.32
 platform: ruby
 authors:
 - Delaney Kuldvee Burke