harbr 0.1.32 → 0.1.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74be5b198005311fab95e570ef40ea3b8c8951cae8685e51a505109ec8778efd
-  data.tar.gz: bd9062554967c6b79c7736031a432836e4488ca5126c297a6bcf5ac0c0bda1c3
+  metadata.gz: 3d18bb11eb763f6b9ebd02f4cf707e798b1614362a718e2fc5d4aa3a8714dacc
+  data.tar.gz: 4d393921baddbee40f815d4821f81822d5282bf0d6aa6147c68394c88642a017
 SHA512:
-  metadata.gz: 60f3b2377e0b1d17429f94924061074569e0a866987744dc76500a5a1b68a05532ec3479a64524d675797a9f94ff75122d868c4cd9fe438ef4fd5f2222033c82
-  data.tar.gz: 3c211d61a277f0bd87e895bbb5b692dae59ffb75fd5aab4d8067f0d350f7d04786e2961c098304368a4da5f7e3bfbd5a2fc45ffa1b3470c067c0c32a62db559c
+  metadata.gz: 2f0d979c6328591abad69510944e6b8f76403cec48e14049f030ee550e675bec8e7a721e62acaa3d94c8aea3feeff55afb04f716217b32fef6bb91bcb5e9c739
+  data.tar.gz: ae098eff09b1a4df3b058ecad33ad8c74f472ef927589b36de65d2113a2b66b717541ee13af09042d283975dcc59c03db5e1a7c5610c0b18fac5981bedeaeb4c

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,33 +128,38 @@ module Harbr
     end
 
     def perform(name, version)
-      Dir.chdir "/var/harbr/containers/#{name}/versions/#{version}" do
-        manifest = load_manifest(name, version)
-        port = `port assign #{manifest.port}`.strip
-        system "sv stop #{name}" if File.exist?("/etc/service/#{name}")
-        if File.exist?("Gemfile")
-          `bundle config set --local path 'vendor/bundle'`
-          system "bundle install"
-        end
 
-        `mkdir -p /etc/sv/harbr/#{name}`
-        `mkdir -p /etc/sv/harbr/#{name}/log`
-        `mkdir -p /var/log/harbr/#{name}`
+      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
+          system "sv stop #{name}" if File.exist?("/etc/service/#{name}")
+          if File.exist?("Gemfile")
+            `bundle config set --local path 'vendor/bundle'`
+            system "bundle install"
+          end
+
+          `mkdir -p /etc/sv/harbr/#{name}`
+          `mkdir -p /etc/sv/harbr/#{name}/log`
+          `mkdir -p /var/log/harbr/#{name}`
 
-        write_to_file "/etc/sv/harbr/#{name}/run", Runit::Run.new(name, port).to_s
-        write_to_file "/etc/sv/harbr/#{name}/finish", Runit::Finish.new(port).to_s
-        write_to_file "/etc/sv/harbr/#{name}/log/run", Runit::Log.new(name).to_s
+          write_to_file "/etc/sv/harbr/#{name}/run", Runit::Run.new(name, port).to_s
+          write_to_file "/etc/sv/harbr/#{name}/finish", Runit::Finish.new(port).to_s
+          write_to_file "/etc/sv/harbr/#{name}/log/run", Runit::Log.new(name).to_s
 
-        `chmod +x /etc/sv/harbr/#{name}/run`
-        `chmod +x /etc/sv/harbr/#{name}/log/run`
-        `chmod +x /etc/sv/harbr/#{name}/finish`
+          `chmod +x /etc/sv/harbr/#{name}/run`
+          `chmod +x /etc/sv/harbr/#{name}/log/run`
+          `chmod +x /etc/sv/harbr/#{name}/finish`
 
-        system "ln -sf /var/harbr/containers/#{name}/versions/#{version} /var/harbr/containers/#{name}/current"
-        system "ln -sf /etc/sv/harbr/#{name} /etc/service/#{name}"
+          system "ln -sf /var/harbr/containers/#{name}/versions/#{version} /var/harbr/containers/#{name}/current"
+          system "ln -sf /etc/sv/harbr/#{name} /etc/service/#{name}"
+
+          containers = collate_containers(name, manifest.host, port)
+          create_traefik_config(containers)
+          puts "process #{version} of #{name}"
+        end
 
-        containers = collate_containers(name, manifest.host, port)
-        create_traefik_config(containers)
-        puts "process #{version} of #{name}"
       end
     end
   end

data/lib/harbr/next/job.rb

@@ -165,7 +165,7 @@ module Harbr
 
       def perform(name, version)
 
-        Harbr.notifiable do
+        Harbr.notifiable(name,version) do
           manifest = load_manifest(name, version)
           current_path = "/var/harbr/containers/#{name}/versions/#{version}"
 

data/lib/harbr/version.rb

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

data/lib/harbr.rb

@@ -19,21 +19,11 @@ module Harbr
   DEFAULT_DIRECTORY_DATA_DIR = "#{DEFAULT_DIRECTORY}/.data"
   class Error < StandardError; end
 
-  def self.notifiable
-    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>
-              <p>harbr: #{version} of #{name} failed to deploy</p>"
-      Harbr.send_notification("Harbr: #{name} failed to deploy",html_content)
-    end
-  end
-
   def self.send_notification(subject, body)
     begin
+      
       Resend.api_key = ENV['RESEND_API_KEY']
+
       params = {
         from: ENV['RESEND_FROM'],
         to: ENV['RESEND_TO'],
@@ -44,11 +34,22 @@ module Harbr
       Resend::Emails.send(params)
     rescue => e
       puts "Error sending notification: #{e.message}"
-      return
     end
     
   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>
+              <p>harbr: #{version} of #{name} failed to deploy</p>"
+      send_notification("Harbr: #{name} failed to deploy",html_content)
+    end
+  end
+
 end
 
 Dddr.configure do |config|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: harbr
 version: !ruby/object:Gem::Version
-  version: 0.1.32
+  version: 0.1.34
 platform: ruby
 authors:
 - Delaney Kuldvee Burke
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-12-29 00:00:00.000000000 Z
+date: 2023-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: listen
@@ -174,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.21
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: A server-side tool for managing and deploying Rack applications.