harbr 0.1.80 → 0.1.81

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5bae4f7152798fe858e6e289a4926f104c30c8af4aff5d75690ac0a88d5bfc2
-  data.tar.gz: de87394363bc31c641a36622760f134bbea83d27564e1fc079a1a641a1f7203d
+  metadata.gz: c8e8c297255708987e6eb96de5b195a839e1e66b9ca42ad2b74bdea404350ed3
+  data.tar.gz: a01591319c5ac05400b18eda6c265055bb8187fa972524465d63e33b5efd30fc
 SHA512:
-  metadata.gz: badfc4d8ded68caddd793f5e1e957da3f30e8cf1f7d1d907e961a8c130ef0c8a55a2488d9a40aff962fe480ecf5fbc6a1de20b3c3c3fd63bafb6a44aae11c4d9
-  data.tar.gz: e6d645f4bbdf4e7acdd7da6e7bd5765b088364f0031fc16b25b84aeaeb96e6ae1f4a9760e9e28e90a2b7456a5b047cd32ce91dcb4771fa1d1170b29895c7f81c
+  metadata.gz: 74d90e8e3b0c260e62dfd640443b785162f5d637b6fe564ef0af1aabedb116ddfa86ccc89429eed88679844148fba9eeb4bd204a0104400dba62077b97662340
+  data.tar.gz: 293b1f07d5de4337fea92dd693fe83c61940e01c2a981449e5e8ef512b36a7ddf33af833055eb5da44b5ef5f03c01435e4bd9bb63aa27cc8fc25a27b3a6486dd

data/exe/harbr

@@ -134,7 +134,6 @@ class HarbrCLI < Thor
     container_repo = Harbr::Container::Repository.new
 
     [name, "next.#{name}"].each do |container_name|
-      
       container_repo.get_by_name(container_name).each do |container|
         `port release #{container.port}`
         puts "released port #{container.port} successfully."
@@ -189,18 +188,18 @@ class HarbrCLI < Thor
     SCRIPT
 
     log_script = <<~SCRIPT
-          #!/bin/sh
-          exec svlogd -tt /var/log/harbr/
-        SCRIPT
-    
+      #!/bin/sh
+      exec svlogd -tt /var/log/harbr/
+    SCRIPT
+
     write_to_file("/etc/sv/harbr/run", run_script)
     write_to_file("/etc/sv/harbr/log/run", log_script)
-    
+
     `chmod +x /etc/sv/harbr/run`
     `chmod +x /etc/sv/harbr/log/run`
     `mkdir -p /var/log/harbr`
     `ln -sf /etc/sv/harbr /etc/service/harbr`
-    `sv start harbr`   
+    `sv start harbr`
     puts "Harbr service started successfully."
 
     puts "Setup completed successfully."
@@ -214,20 +213,18 @@ class HarbrCLI < Thor
 
   desc "deploy", "deploy a container to production"
   def deploy(name)
-    /versions\/(?<version>\d*)/.match(`ls -l /var/harbr/containers/#{name}/next`)
+    /versions\/(?<version>\d*)/ =~ `ls -l /var/harbr/containers/#{name}/next`
     version = $1
     raise "Ooops! next version not found!" if version.nil?
-    
-    /versions\/(?<version>\d*)/.match(`ls -l /var/harbr/containers/#{name}/current`)
+
+    /versions\/(?<version>\d*)/ =~ `ls -l /var/harbr/containers/#{name}/current`
     `ln -sf /var/harbr/containers/#{name}/version/#{$1} /var/harbr/containers/#{name}/rollback`
 
     Harbr::Job.perform_async(name, version, "current")
 
     puts "deploy current version #{version} of #{name}"
-
   end
 
-  
   desc "rollback", "rollback last deploy"
   def rollback(name)
     Dir.chdir("/var/harbr/containers/#{name}") do

data/lib/harbr/container.rb

@@ -11,6 +11,7 @@ module Harbr
       def find_by_name(name)
         all.find { |container| container.name.downcase == name.downcase }
       end
+
       def get_by_name(name)
         all.select { |container| container.name.downcase.include? name.downcase }
       end

data/lib/harbr/job.rb

@@ -70,7 +70,6 @@ module Harbr
       containers.all
     end
 
-
     def write_to_file(path, contents)
       dirname = File.dirname(path)
       FileUtils.mkdir_p(dirname) unless File.directory?(dirname)
@@ -87,10 +86,10 @@ module Harbr
     end
 
     def perform(name, version, env)
-      Harbr.notifiable(name, version,env) do
+      Harbr.notifiable(name, version, env) do
         manifest = load_manifest(name, version)
         port = `port assign #{env}.#{manifest.port}`.strip
-        process_container(name,version,port,env,manifest)
+        process_container(name, version, port, env, manifest)
       end
     end
 
@@ -131,7 +130,6 @@ module Harbr
     end
 
     def process_container(name, version, port, env, manifest)
-
       version_path = "/var/harbr/containers/#{name}/versions/#{version}"
 
       bundle_install_if_needed(version_path)
@@ -140,21 +138,18 @@ module Harbr
       link_directories(name, version, env)
       sync_live_data_if_next(name) if env == "next"
 
-      containers = collate_containers("#{name}", "#{manifest.host}", port,manifest.host_aliases) if env == "current"
-      containers = collate_containers("#{env}.#{name}", "#{env}.#{manifest.host}", port,manifest.host_aliases&.map{|host| "#{env}.#{host}"  }) if env == "next"
+      containers = collate_containers("#{name}", "#{manifest.host}", port, manifest.host_aliases) if env == "current"
+      containers = collate_containers("#{env}.#{name}", "#{env}.#{manifest.host}", port, manifest.host_aliases&.map { |host| "#{env}.#{host}" }) if env == "next"
 
       create_traefik_config(containers)
 
       system "sv restart #{env}.#{name}" if env == "next"
       system "sv restart #{name}" if env == "current"
 
-
-
       puts "harbr: #{version} of #{name} in #{env} environment"
     end
 
     def bundle_install_if_needed(path)
-
       check_dir_exists(path)
 
       Dir.chdir(path) do
@@ -190,8 +185,6 @@ module Harbr
         `mkdir -p /var/log/harbr/#{name}`
 
       end
-
-
     end
 
     def link_directories(name, version, env)
@@ -210,7 +203,6 @@ module Harbr
         `ln -sf /var/harbr/containers/#{name}/versions/#{version} /var/harbr/containers/#{name}/current`
         `ln -sf /etc/sv/harbr/#{name} /etc/service/#{name}`
       end
-
     end
 
     def sync_live_data_if_next(name)
@@ -224,32 +216,32 @@ module Harbr
       def initialize(container, port, env)
         @container_name = container
         @port = port
-        @env = env
+        @env = env == 'current' ? nil : env
       end
 
       def run_script
         <<~SCRIPT
-        #!/bin/sh
-        exec 2>&1
-        cd /var/harbr/containers/#{@container_name}/#{@env}
-        exec ./exe/run #{@port} #{@env}
-        echo "started #{@container_name} on port #{@port}"
+          #!/bin/sh
+          exec 2>&1
+          cd /var/harbr/containers/#{@container_name}/#{@env}
+          exec ./exe/run #{@port} #{@env}
+          echo "started #{@container_name} on port #{@port}"
         SCRIPT
       end
 
       def finish_script
         <<~SCRIPT
-        #!/bin/sh
-        lsof -i :#{@port} | awk 'NR!=1 {print $2}' | xargs kill
-        echo "killed #{@container_name} on port #{@port}"
+          #!/bin/sh
+          lsof -i :#{@port} | awk 'NR!=1 {print $2}' | xargs kill
+          echo "killed #{@container_name} on port #{@port}"
         SCRIPT
       end
 
       def log_script
         <<~SCRIPT
-        #!/bin/sh
-        echo "starting log for #{@container_name} on port #{@port}"
-        exec svlogd -tt /var/log/harbr/#{@container_name}/#{@env}/
+          #!/bin/sh
+          echo "starting log for #{@container_name} on port #{@port}"
+          exec svlogd -tt /var/log/harbr/#{@container_name}/#{@env}
         SCRIPT
       end
     end

data/lib/harbr/version.rb

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

data/lib/harbr.rb

@@ -39,15 +39,15 @@ module Harbr
     puts "Error sending notification: #{e.message}"
   end
 
-  def self.notifiable(name, version,env)
+  def self.notifiable(name, version, env)
     yield if block_given?
     env = "live" if env == "current"
     send_notification("Harbr: #{name} deployed to #{env} successfully", "<p>harbr: #{version} of #{name} deployed to #{env} successfully</p>")
   rescue => e
     html_content = <<~HTML
-    <p>Error: #{e.message}</p>
-              <p>#{e.backtrace.join("<br>")}</p>
-              <p>harbr: #{version} of #{env} #{name} failed to deploy</p>
+      <p>Error: #{e.message}</p>
+                <p>#{e.backtrace.join("<br>")}</p>
+                <p>harbr: #{version} of #{env} #{name} failed to deploy</p>
     HTML
 
     send_notification("Harbr: #{name} failed to deploy", html_content)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: harbr
 version: !ruby/object:Gem::Version
-  version: 0.1.80
+  version: 0.1.81
 platform: ruby
 authors:
 - Delaney Kuldvee Burke
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-01-03 00:00:00.000000000 Z
+date: 2024-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: listen