harbr 0.0.36 → 0.0.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cf8764c72f8d4226b5375bd51758bbb88a14efe6a8b0588c2fc49a515a9904b
-  data.tar.gz: ae5910f1ad66fa0bc5587b53b990303ddf3a9d62c969dea87dfe7b2c0420ba5a
+  metadata.gz: 0deb1db9d12d5db8012da650e94a8e00e42e22d2a737e7c72d8643f3639eb90e
+  data.tar.gz: 2244f98cb5d649fb3a3d69aebfb8f149afed4a0721bbe4ed6fb868086f46880b
 SHA512:
-  metadata.gz: f2ad2de2a4e45ff68c14697c60206f4fd11507193afd6951b596a633f28f911742c221fa2063098d4183c70fa6e53eb07f5c1cf4514cf0fb34f8ae71d22ecba0
-  data.tar.gz: c7bad4c0b6960034496f3613ba9540f8c1beb8deca0c87496f968034fb0d434aa4f06c4d75966c07401572de5e50da61dcd89f4c07bd95942b95ac20f61ba0d4
+  metadata.gz: 00d9d014e5ea856653de68efbe0b3f1d71660d809142f29acb52a1faa7a63edf681ca8550b7f86da5dfb14d845fd202b370da1b939380c39b8bca9bade0b4f8e
+  data.tar.gz: dc33ac266549d27ae583bf3b1338599f1ef22132fb87f7f06776dbe46324e8b5c6cf6de8a430d8fedacc4aa6bd66ccc8d5e27a1830ae93462d65d1ad00396cdd

data/exe/harbr

@@ -2,12 +2,7 @@
 require_relative "../lib/harbr"
 
 class HarbrCLI < Thor
-  DEFAULT_DIRECTORY = "/var/harbr"
-  DEFAULT_DIRECTORY_DATA_DIR = "#{DEFAULT_DIRECTORY}/.data"
-  Dddr.configure do |config|
-    config.data_dir = DEFAULT_DIRECTORY_DATA_DIR
-  end
-
+  
   no_commands do
     def load_manifest(container, version)
       manifest_path = "/var/harbr/#{container}/versions/#{version}/config/manifest.yml"

data/lib/harbr/container.rb

@@ -2,15 +2,13 @@ module Harbr
   class Container
     include Dddr::Entity
     attr_accessor :name, :host_header, :ip, :port
+
     queries do
       def find_by_header(host_header)
         all.find { |container| container.host_header.downcase == host_header.downcase }
       end
     end
-    
-    def number
-      port
-    end
+
 
   end
 end

data/lib/harbr/job.rb

@@ -1,118 +1,116 @@
 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 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 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 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
 
-        container = Container.new
-        containers = Container::Repository.new
+    def run_container(manifest)
+      puts "Starting container: #{manifest.name}"
 
-        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)        
-        system("cd /var/harbr/#{manifest.name}/current && bundle install")
-        system("sv restart #{manifest.name}")
-        puts "Started container: #{manifest.name}"
-        create_traefik_config(containers.all)
+      Dddr.configure do |config|
+        config.data_dir = Harbr::DEFAULT_DIRECTORY_DATA_DIR
       end
 
-      def perform(manifest)
-        run_container(manifest)
-      end
+      pool = Harbr::Pool.new
+      port = pool.get_port(manifest.host)
+
+      create_a_service(manifest.name, port.number)
+
+      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)
+      system("cd /var/harbr/#{manifest.name}/current && bundle install")
+      system("sv restart #{manifest.name}")
+      puts "Started container: #{manifest.name}"
+      create_traefik_config(containers.all)
+    end
+
+    def perform(manifest)
+      run_container(manifest)
     end
   end
 end

data/lib/harbr/pool.rb

@@ -1,39 +1,37 @@
 module Harbr
-  class Port
-    class Pool # rubocop:disable Style/Documentation
-      def initialize(port_range = 50000..51000)
-        @repository = Port::Repository.new
+  class Pool # rubocop:disable Style/Documentation
+    def initialize(port_range = 50000..51000)
+      @repository = Port::Repository.new
 
-        port_range.each do |number|
-          port = Port.new
-          port.number = number
+      port_range.each do |number|
+        port = Port.new
+        port.number = number
 
-          unless @repository.has_port_number? number
-            @repository.add(port)
-            puts port.number.to_s + " added!"
-          end
+        unless @repository.has_port_number? number
+          @repository.add(port)
+          puts port.number.to_s + " added!"
         end
       end
+    end
 
-      def get_port(host_header)
-        port = @repository.assigned_a_port?(host_header)
-        return port unless port.nil?
+    def get_port(host_header)
+      port = @repository.assigned_a_port?(host_header)
+      return port unless port.nil?
 
-        port = ports.shuffle.sample
-        port.host_header = host_header
-        @repository.update(port)
-        port
-      end
+      port = ports.shuffle.sample
+      port.host_header = host_header
+      @repository.update(port)
+      port
+    end
 
-      def return_port(port)
-        port.host_header = nil
-        @repository.update(port)
-        port.host_header.nil?
-      end
+    def return_port(port)
+      port.host_header = nil
+      @repository.update(port)
+      port.host_header.nil?
+    end
 
-      def ports
-        @repository.all
-      end
+    def ports
+      @repository.all
     end
   end
 end

data/lib/harbr/version.rb

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

data/lib/harbr.rb

@@ -1,6 +1,5 @@
 require "thor"
 require "dddr"
-require "harbr"
 require "terminal-table"
 require "yaml"
 require "toml-rb"
@@ -18,10 +17,10 @@ require_relative "harbr/pool"
 module Harbr
   DEFAULT_DIRECTORY = "/var/harbr"
   DEFAULT_DIRECTORY_DATA_DIR = "#{DEFAULT_DIRECTORY}/.data"
-
-  Dddr.configure do |config|
-    config.data_dir = DEFAULT_DIRECTORY_DATA_DIR
-  end
-
   class Error < StandardError; end
 end
+
+Dddr.configure do |config|
+  config.data_dir = Harbr::DEFAULT_DIRECTORY_DATA_DIR
+end
+

metadata

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