harbr 0.1.34 → 0.1.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d18bb11eb763f6b9ebd02f4cf707e798b1614362a718e2fc5d4aa3a8714dacc
-  data.tar.gz: 4d393921baddbee40f815d4821f81822d5282bf0d6aa6147c68394c88642a017
+  metadata.gz: 5762c6a052b16be2ea5e87ed5ee7bbfd7b596b6956f1891cd1312d1aaeec215e
+  data.tar.gz: 0c84419e9fc169e4fc1f31447bce2011b0d2d676f6106a26d5e09e10de1ea23c
 SHA512:
-  metadata.gz: 2f0d979c6328591abad69510944e6b8f76403cec48e14049f030ee550e675bec8e7a721e62acaa3d94c8aea3feeff55afb04f716217b32fef6bb91bcb5e9c739
-  data.tar.gz: ae098eff09b1a4df3b058ecad33ad8c74f472ef927589b36de65d2113a2b66b717541ee13af09042d283975dcc59c03db5e1a7c5610c0b18fac5981bedeaeb4c
+  metadata.gz: 320532e3e19ad46172e7c5329c81ec3619984de5b3434747a58f4a14d70156be25b29375f1e96d232bd45a7dd56d1dd62932717086b5d0355a1bcf2dff394863
+  data.tar.gz: 8ddcdb22469dadd5192a01d4e2504f93f4177bc638d484d7687268f7969bd5a027444b5f3a4510c1f6a5fd6bca9f54d3038bbbd2c630adbf4acb03f124154646

data/exe/harbr

@@ -67,13 +67,15 @@ class HarbrCLI < Thor
 
     def run_jobs(container, version)
       puts "Running tasks for container: #{container}, version: #{version}"
+
       sleep 1
-      if version.to_i == 0
+
+      if !File.exist?("/var/harbr/containers/#{container}/current")
         Harbr::Job.perform_async(container, version)
-      else
-        Harbr::Next::Job.perform_async(container, version)
       end
 
+      Harbr::Next::Job.perform_async(container, version)
+
       puts "deploy next version #{version} of #{container}"
     end
 

data/lib/harbr/job.rb

@@ -76,10 +76,10 @@ module Harbr
 
         def to_s
           <<~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
 
@@ -95,9 +95,9 @@ module Harbr
 
         def to_s
           <<~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
@@ -109,8 +109,8 @@ module Harbr
 
         def to_s
           <<~SCRIPT
-          #!/bin/sh
-          exec svlogd -tt /var/log/harbr/#{@container_name}
+            #!/bin/sh
+            exec svlogd -tt /var/log/harbr/#{@container_name}
           SCRIPT
         end
       end
@@ -128,9 +128,7 @@ module Harbr
     end
 
     def perform(name, version)
-
-      Harbr.notifiable(name,version) do
-
+      Harbr.notifiable(name, version) do
         Dir.chdir "/var/harbr/containers/#{name}/versions/#{version}" do
           manifest = load_manifest(name, version)
           port = `port assign #{manifest.port}`.strip
@@ -159,7 +157,6 @@ module Harbr
           create_traefik_config(containers)
           puts "process #{version} of #{name}"
         end
-
       end
     end
   end

data/lib/harbr/next/job.rb

@@ -81,10 +81,10 @@ module Harbr
 
           def to_s
             <<~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
 
@@ -100,9 +100,9 @@ module Harbr
 
           def to_s
             <<~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,8 +114,8 @@ module Harbr
 
           def to_s
             <<~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
@@ -129,10 +129,10 @@ module Harbr
 
             def to_s
               <<~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
@@ -144,8 +144,8 @@ module Harbr
 
             def to_s
               <<~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
@@ -164,8 +164,7 @@ module Harbr
       end
 
       def perform(name, version)
-
-        Harbr.notifiable(name,version) do
+        Harbr.notifiable(name, version) do
           manifest = load_manifest(name, version)
           current_path = "/var/harbr/containers/#{name}/versions/#{version}"
 
@@ -206,7 +205,6 @@ module Harbr
           create_traefik_config(containers)
           puts "harbr: #{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.34"
+  VERSION = "0.1.36"
 end

data/lib/harbr.rb

@@ -6,7 +6,7 @@ require "toml-rb"
 require "fileutils"
 require "ostruct"
 require "sucker_punch"
-require 'resend'
+require "resend"
 
 require_relative "harbr/version"
 require_relative "harbr/container"
@@ -20,36 +20,29 @@ module Harbr
   class Error < StandardError; end
 
   def self.send_notification(subject, body)
-    begin
-      
-      Resend.api_key = ENV['RESEND_API_KEY']
+    Resend.api_key = ENV["RESEND_API_KEY"]
 
-      params = {
-        from: ENV['RESEND_FROM'],
-        to: ENV['RESEND_TO'],
-        subject: subject,
-        html: body
-      }
-      
-      Resend::Emails.send(params)
-    rescue => e
-      puts "Error sending notification: #{e.message}"
-    end
-    
+    params = {
+      from: ENV["RESEND_FROM"],
+      to: ENV["RESEND_TO"],
+      subject: subject,
+      html: body
+    }
+
+    Resend::Emails.send(params)
+  rescue => e
+    puts "Error sending notification: #{e.message}"
   end
 
-  def self.notifiable(name,version)
-    begin
-      yield if block_given?
-      send_notification("Harbr: #{name} deployed successfully","<p>harbr: #{version} of #{name} deployed successfully</p>")
-    rescue => e
-      html_content = "<p>Error: #{e.message}</p>
-              <p>#{e.backtrace.join('<br>')}</p>
+  def self.notifiable(name, version)
+    yield if block_given?
+    send_notification("Harbr: #{name} deployed successfully", "<p>harbr: #{version} of #{name} deployed successfully</p>")
+  rescue => e
+    html_content = "<p>Error: #{e.message}</p>
+              <p>#{e.backtrace.join("<br>")}</p>
               <p>harbr: #{version} of #{name} failed to deploy</p>"
-      send_notification("Harbr: #{name} failed to deploy",html_content)
-    end
+    send_notification("Harbr: #{name} failed to deploy", html_content)
   end
-
 end
 
 Dddr.configure do |config|

metadata

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