harbr 0.1.19 → 0.1.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b584af86b43ec89938ea427ffb14918c6b6e74aad600266b9b0b09d45b9c80e4
-  data.tar.gz: 1ce98abc55439996b3d228cf5ca48b01e8a0cad8cd615ba969b934787590c12e
+  metadata.gz: c4ca6570daeb86eb833723ce24c8efde8d457af059b8c15f801aea62c134bfd5
+  data.tar.gz: 4c9fd5523d6f73d14871ac5bbf8b6ca7b659e31513fa0654649eee19045546bd
 SHA512:
-  metadata.gz: 532b7b8e256b8d5e53b3096085230e7807b4617bd6973023b7e4971fc80a8d15740bbcbfea7abbe27b7d8ba5ce447dc25fb35e13bb4b116e9b2f1f621b541583
-  data.tar.gz: 172a6396c837b15edfacb39280aec97d230c3ec41f7396f964bae2ea9b3253a648cdd47520216a073bee90c617c60b5e8e9d536206109d6d220331b146490ca3
+  metadata.gz: 28161c6842f7c0b904b8863a2d122ffb0c0a934a72f5778f29f20f882757b8ed876f28dc686a136225107b1feedb911ebbee5dac39c15adf2567424d62d08f47
+  data.tar.gz: e2996597d6be9bccc59471f04e791b4b721717965bde619882b593be4b76f2b554c5d466f5d485984c4cf5a7a40254d028e06cf5903365a61bc7622340d8c199

data/exe/harbr

@@ -110,37 +110,36 @@ class HarbrCLI < Thor
   end
 
   desc "destroy", "Destroy a container and remove all traces"
-  def destroy(container_name)
-    puts "Destroying container: #{container_name}"
-    puts `sv stop #{container_name}`
+  def destroy(name)
+    puts "Destroying container: #{name}"
 
     container_repo = Harbr::Container::Repository.new
-    container = container_repo.find_by_name(container_name)
-    if container
-      puts `port release #{container.port}`
-      create_traefik_config(container_repo.all)
 
-      `rm -rf /var/harbr/#{container_name}`
+    [name, "next.#{name}"].each do |container_name|
+      container = container_repo.find_by_name(container_name)
+
       `rm -rf /etc/service/#{container_name}`
       `rm -rf /etc/sv/harbr/#{container_name}`
-      `rm -rf /var/log/harbr/#{container_name}`
 
-      `lsof -i :#{container.port} | awk 'NR!=1 {print $2}' | xargs kill`
       container_repo.delete(container)
-
       puts "Container #{container_name} destroyed successfully."
-
-    else
-      puts "Container #{container_name} not found."
+      `port release #{container.port}`
+      puts "released port #{container.port} successfully."
     end
+    
+    `rm -rf /var/harbr/containers/#{name}`
+    `rm -rf /var/log/harbr/#{name}`
+
+    create_traefik_config(container_repo.all)
+
   end
 
   desc "logs", "Show logs"
   def logs
-      exec "tail -f /var/log/harbr/current"
+    exec "tail -f /var/log/harbr/current"
   end
 
-desc "peek CONTAINER", "Peek in a given container"
+  desc "peek CONTAINER", "Peek in a given container"
   def peek(container)
     container_repo = Harbr::Container::Repository.new
     container = container_repo.find_by_name(container)
@@ -151,7 +150,6 @@ desc "peek CONTAINER", "Peek in a given container"
     end
   end
 
-
   desc "setup", "Set up Harbr environment"
   def setup
     # Check and create /var/harbr directory
@@ -173,19 +171,17 @@ desc "peek CONTAINER", "Peek in a given container"
 
   desc "deploy", "deploy a container to production"
   def deploy(name)
-            
     Dir.chdir("/var/harbr/containers/#{name}/") do
-      
-      /(?<current>. * -> (?<path>.*))/.match(`ls -l /var/harbr/containers/#{name}/current`)
-      
+      /(?<current>. * -> (?<path>.*))/ =~ `ls -l /var/harbr/containers/#{name}/current`
+
       `rm -r rollback`
       `ln -sf #{$2} rollback`
 
-      /(?<next>. * -> (?<path>.*))/.match(`ls -l /var/harbr/containers/#{name}/next`)
+      /(?<next>. * -> (?<path>.*))/ =~ `ls -l /var/harbr/containers/#{name}/next`
       `rm -r current`
       `ln -sf #{$2} current`
       `sv restart #{name}`
-    end 
+    end
   end
 
   desc "rollback", "rollback last deploy"
@@ -193,15 +189,14 @@ desc "peek CONTAINER", "Peek in a given container"
     Dir.chdir("/var/harbr/containers/#{name}") do
       if File.exist?("rollback")
         Dir.chdir("/var/harbr/containers/#{name}/") do
-          /(?<current>. * -> (?<path>.*))/.match(`ls -l /var/harbr/containers/#{name}/rollback`)
+          /(?<current>. * -> (?<path>.*))/ =~ `ls -l /var/harbr/containers/#{name}/rollback`
           `rm -r current`
           `ln -sf #{$2} current`
           `sv restart #{name}`
-        end 
+        end
         puts "rollback successful"
       end
-    end 
-
+    end
   end
   desc "monitor", "Monitor /var/harbr/comtainers for new container versions"
   def monitor

data/lib/harbr/job.rb

@@ -1,13 +1,12 @@
-require 'harbr'
+require "harbr"
 module Harbr
   class Job
     include SuckerPunch::Job
-    
+
     def get_container_name(path)
       File.basename(path)
     end
 
-
     def create_traefik_config(containers)
       config = {
         "http" => {
@@ -24,7 +23,7 @@ module Harbr
 
       containers.each do |container|
         container.ip = "127.0.0.1"
-        name = container.name.gsub(".", "-")
+        name = container.name.tr(".", "-")
 
         # Create the router with TLS enabled and specific format
         router_key = "#{name}-router-secure"
@@ -50,15 +49,14 @@ module Harbr
       puts "Traefik configuration written to /etc/traefik/harbr.toml"
     end
 
-    def collate_containers(name,host,port)
-
+    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.host_header = host
         container.ip = "127.0.0.1"
         container.port = port
         containers.create(container)
@@ -69,9 +67,7 @@ module Harbr
       containers.all
     end
 
-
     module Runit
-
       class Run
         def initialize(container, port)
           @container_name = container
@@ -80,10 +76,10 @@ module Harbr
 
         def to_s
           script_template = <<~SCRIPT
-          #!/bin/sh
-          exec 2>&1    
-          cd /var/harbr/containers/#{@container_name}/current
-          exec ./exe/run #{@port} live 
+            #!/bin/sh
+            exec 2>&1    
+            cd /var/harbr/containers/#{@container_name}/current
+            exec ./exe/run #{@port} live 
           SCRIPT
         end
 
@@ -92,7 +88,6 @@ module Harbr
         end
       end
 
-
       class Finish
         def initialize(port)
           @port = port
@@ -100,9 +95,9 @@ module Harbr
 
         def to_s
           script_template = <<~SCRIPT
-          #!/bin/sh
-          sleep 3
-          `lsof -i :#{@port} | awk 'NR!=1 {print $2}' | xargs kill`
+            #!/bin/sh
+            sleep 3
+            `lsof -i :#{@port} | awk 'NR!=1 {print $2}' | xargs kill`
           SCRIPT
         end
       end
@@ -114,19 +109,15 @@ module Harbr
 
         def to_s
           script_template = <<~SCRIPT
-          #!/bin/sh
-          exec svlogd -tt /var/log/harbr/#{@container_name}
+            #!/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
+      File.write(path, contents)
     end
 
     def load_manifest(container, version)
@@ -136,16 +127,13 @@ module Harbr
       OpenStruct.new(manifest_data)
     end
 
-    def perform(name,version)
-
+    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'
-
+        system "bundle install"
 
         `mkdir -p /etc/sv/harbr/#{name}`
         `mkdir -p /etc/sv/harbr/#{name}/log`
@@ -166,9 +154,6 @@ module Harbr
         create_traefik_config(containers)
         puts "process #{version} of #{name}"
       end
-
     end
-
   end
-
 end

data/lib/harbr/next/job.rb

@@ -1,8 +1,8 @@
-require 'yaml'
-require 'ostruct'
-require 'sucker_punch'
+require "yaml"
+require "ostruct"
+require "sucker_punch"
 
-require 'harbr'
+require "harbr"
 module Harbr
   module Next
     class Job
@@ -28,7 +28,7 @@ module Harbr
 
         containers.each do |container|
           container.ip = "127.0.0.1"
-          name = container.name.gsub(".", "-")
+          name = container.name.tr(".", "-")
 
           # Create the router with TLS enabled and specific format
           router_key = "#{name}-router-secure"
@@ -54,17 +54,14 @@ module Harbr
         puts "Traefik configuration written to /etc/traefik/harbr.toml"
       end
 
-
-
-      def collate_containers(name,host,port)
-
+      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.host_header = host
           container.ip = "127.0.0.1"
           container.port = port
           containers.create(container)
@@ -75,9 +72,7 @@ module Harbr
         containers.all
       end
 
-
       module Runit
-
         class Run
           def initialize(container, port)
             @container_name = container
@@ -86,10 +81,10 @@ module Harbr
 
           def to_s
             script_template = <<~SCRIPT
-            #!/bin/sh
-            exec 2>&1
-            cd /var/harbr/#{@container_name}/current
-            exec ./exe/run #{@port} live
+              #!/bin/sh
+              exec 2>&1
+              cd /var/harbr/#{@container_name}/current
+              exec ./exe/run #{@port} live
             SCRIPT
           end
 
@@ -98,7 +93,6 @@ module Harbr
           end
         end
 
-
         class Finish
           def initialize(port)
             @port = port
@@ -106,9 +100,9 @@ module Harbr
 
           def to_s
             script_template = <<~SCRIPT
-            #!/bin/sh
-            sleep 3
-            `lsof -i :#{@port} | awk 'NR!=1 {print $2}' | xargs kill`
+              #!/bin/sh
+              sleep 3
+              `lsof -i :#{@port} | awk 'NR!=1 {print $2}' | xargs kill`
             SCRIPT
           end
         end
@@ -120,15 +114,13 @@ module Harbr
 
           def to_s
             script_template = <<~SCRIPT
-            #!/bin/sh
-            exec svlogd -tt /var/log/harbr/#{@container_name}/next/
+              #!/bin/sh
+              exec svlogd -tt /var/log/harbr/#{@container_name}/next/
             SCRIPT
           end
-
         end
 
         module Next
-
           class Run
             def initialize(container, port)
               @container_name = container
@@ -137,10 +129,10 @@ module Harbr
 
             def to_s
               script_template = <<~SCRIPT
-              #!/bin/sh
-              exec 2>&1
-              cd /var/harbr/containers/#{@container_name}/next
-              exec ./exe/run #{@port} next
+                #!/bin/sh
+                exec 2>&1
+                cd /var/harbr/containers/#{@container_name}/next
+                exec ./exe/run #{@port} next
               SCRIPT
             end
           end
@@ -152,19 +144,16 @@ module Harbr
 
             def to_s
               script_template = <<~SCRIPT
-              #!/bin/sh
-              exec svlogd -tt /var/log/harbr/#{@container_name}/next/
+                #!/bin/sh
+                exec svlogd -tt /var/log/harbr/#{@container_name}/next/
               SCRIPT
             end
           end
-
         end
       end
 
       def write_to_file(path, contents)
-        File.open(path, 'w') do |file|
-          file.write(contents)
-        end
+        File.write(path, contents)
       end
 
       def load_manifest(container, version)
@@ -177,21 +166,20 @@ module Harbr
       def perform(name, version)
         `bundle config set --local path 'vendor/bundle'`
 
-        manifest = load_manifest(name,version)
+        manifest = load_manifest(name, version)
         current_path = "/var/harbr/containers/#{name}/versions/#{version}"
 
         port = `port assign next.#{manifest.port}`.strip
 
         Dir.chdir current_path do
-
           system "sv stop next.#{name}"
-          system "bundle install" 
+          system "bundle install"
 
           `mkdir -p /etc/sv/harbr/#{name}/next`
           `mkdir -p /etc/sv/harbr/#{name}/next/log`
           `mkdir -p /var/log/harbr/#{name}/next/log`
 
-          write_to_file "/etc/sv/harbr/#{name}/next/run", Runit::Next::Run.new(name,port).to_s
+          write_to_file "/etc/sv/harbr/#{name}/next/run", Runit::Next::Run.new(name, port).to_s
           write_to_file "/etc/sv/harbr/#{name}/next/finish", Runit::Finish.new(port).to_s
           write_to_file "/etc/sv/harbr/#{name}/next/log/run", Runit::Next::Log.new(name).to_s
 
@@ -199,7 +187,6 @@ module Harbr
           `chmod +x /etc/sv/harbr/#{name}/next/log/run`
           `chmod +x /etc/sv/harbr/#{name}/next/finish`
 
-
           system "rm /etc/service/next.#{name}"
           system "rm /var/harbr/containers/#{name}/next"
 
@@ -212,14 +199,11 @@ module Harbr
           system "sv restart next.#{name}"
         end
 
-        containers = collate_containers("next.#{name}","next.#{manifest.host}",port)
+        containers = collate_containers("next.#{name}", "next.#{manifest.host}", port)
         create_traefik_config(containers)
 
-        puts "process #{version} of #{name}"         
-
+        puts "process #{version} of #{name}"
       end
-
     end
-
   end
 end

data/lib/harbr/version.rb

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

metadata

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