harbr 0.1.28 → 0.1.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90622c50ae9ea60aabd48e690c6afa8828e19655463388cc36b27ca7773754d3
-  data.tar.gz: 81e0e3746b3a94418b797c413bb116dc7bafef3f31048c08f5d8f256397fbe1d
+  metadata.gz: 2588c43ae55e0764c8425290704320a29efb66a8c0e2082730354d9a3a7b7f9b
+  data.tar.gz: 789193e3987ac30e15017dfc0f02d7d945e0f73df3cf51d75445e057395312df
 SHA512:
-  metadata.gz: 03feed9249a19f8c535122f0129e07142fff7fa2ba4a8e65f9b1280a898e8af900c2219eddc1598a5330b3ed973c3b49078642b6b31640edd4f8cc33e0e53109
-  data.tar.gz: e1653e96cf2c1b8c06cc26cd8e148997a52e2981d868a221c0b908bfb251da501cd9112d31cd6f3adfc31cfd4db4470254973186bb9270185d39818066088045
+  metadata.gz: 2065f4f5527f2425094a8dea877301fb6ca6ab778e427f7deac6386658a9115ba98707680832591c5b37221921edd0a1e1127e72968f54c8f91d03f38e62b54c
+  data.tar.gz: 36c0febbdab8d272e150a6a75e1491330e9072409e1dc1d427d70a3cc89fbf07174e6b02cdc69d1309ed6399d1c2d448e2e94b87b359f1b6ebb211e4d242a3f0

data/exe/harbr

@@ -70,8 +70,10 @@ class HarbrCLI < Thor
       sleep 1
       if version.to_i == 0
         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
 
@@ -118,16 +120,15 @@ class HarbrCLI < Thor
     [name, "next.#{name}"].each do |container_name|
       container = container_repo.find_by_name(container_name)
       if container
-        `port release #{container.port}` 
+        `port release #{container.port}`
         puts "released port #{container.port} successfully."
         container_repo.delete(container)
       end
 
       `rm -rf /etc/service/#{container_name}`
       `rm -rf /etc/sv/harbr/#{container_name}`
-      
+
       puts "Container #{container_name} destroyed successfully."
-      
     end
 
     `rm -rf /var/harbr/containers/#{name}`
@@ -177,12 +178,12 @@ class HarbrCLI < Thor
   desc "deploy", "deploy a container to production"
   def deploy(name)
     Dir.chdir("/var/harbr/containers/#{name}/") do
-      /(?<current>. * -> (?<path>.*))/ =~ `ls -l /var/harbr/containers/#{name}/current`
+      /(?:. * -> (?:.*))/ =~ `ls -l /var/harbr/containers/#{name}/current`
 
       `rm -r rollback`
       `ln -sf #{$2} rollback`
 
-      /(?<next>. * -> (?<path>.*))/ =~ `ls -l /var/harbr/containers/#{name}/next`
+      /(?:. * -> (?:.*))/ =~ `ls -l /var/harbr/containers/#{name}/next`
       `rm -r current`
       `ln -sf #{$2} current`
       `sv restart #{name}`
@@ -194,7 +195,7 @@ class HarbrCLI < Thor
     Dir.chdir("/var/harbr/containers/#{name}") do
       if File.exist?("rollback")
         Dir.chdir("/var/harbr/containers/#{name}/") do
-          /(?<current>. * -> (?<path>.*))/ =~ `ls -l /var/harbr/containers/#{name}/rollback`
+          /(?:. * -> (?:.*))/ =~ `ls -l /var/harbr/containers/#{name}/rollback`
           `rm -r current`
           `ln -sf #{$2} current`
           `sv restart #{name}`

data/lib/harbr/job.rb

@@ -75,7 +75,7 @@ module Harbr
         end
 
         def to_s
-          script_template = <<~SCRIPT
+          <<~SCRIPT
             #!/bin/sh
             exec 2>&1    
             cd /var/harbr/containers/#{@container_name}/current
@@ -94,7 +94,7 @@ module Harbr
         end
 
         def to_s
-          script_template = <<~SCRIPT
+          <<~SCRIPT
             #!/bin/sh
             sleep 3
             `lsof -i :#{@port} | awk 'NR!=1 {print $2}' | xargs kill`
@@ -108,7 +108,7 @@ module Harbr
         end
 
         def to_s
-          script_template = <<~SCRIPT
+          <<~SCRIPT
             #!/bin/sh
             exec svlogd -tt /var/log/harbr/#{@container_name}
           SCRIPT
@@ -129,13 +129,12 @@ module Harbr
 
     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" 
+          system "bundle install"
         end
 
         `mkdir -p /etc/sv/harbr/#{name}`

data/lib/harbr/next/job.rb

@@ -80,11 +80,11 @@ module Harbr
           end
 
           def to_s
-            script_template = <<~SCRIPT
-              #!/bin/sh
-              exec 2>&1
-              cd /var/harbr/#{@container_name}/current
-              exec ./exe/run #{@port} live
+            <<~SCRIPT
+            #!/bin/sh
+            exec 2>&1
+            cd /var/harbr/#{@container_name}/current
+            exec ./exe/run #{@port} live
             SCRIPT
           end
 
@@ -99,10 +99,10 @@ module Harbr
           end
 
           def to_s
-            script_template = <<~SCRIPT
-              #!/bin/sh
-              sleep 3
-              `lsof -i :#{@port} | awk 'NR!=1 {print $2}' | xargs kill`
+            <<~SCRIPT
+            #!/bin/sh
+            sleep 3
+            `lsof -i :#{@port} | awk 'NR!=1 {print $2}' | xargs kill`
             SCRIPT
           end
         end
@@ -113,9 +113,9 @@ module Harbr
           end
 
           def to_s
-            script_template = <<~SCRIPT
-              #!/bin/sh
-              exec svlogd -tt /var/log/harbr/#{@container_name}/next/
+            <<~SCRIPT
+            #!/bin/sh
+            exec svlogd -tt /var/log/harbr/#{@container_name}/next/
             SCRIPT
           end
         end
@@ -128,11 +128,11 @@ module Harbr
             end
 
             def to_s
-              script_template = <<~SCRIPT
-                #!/bin/sh
-                exec 2>&1
-                cd /var/harbr/containers/#{@container_name}/next
-                exec ./exe/run #{@port} next
+              <<~SCRIPT
+              #!/bin/sh
+              exec 2>&1
+              cd /var/harbr/containers/#{@container_name}/next
+              exec ./exe/run #{@port} next
               SCRIPT
             end
           end
@@ -143,9 +143,9 @@ module Harbr
             end
 
             def to_s
-              script_template = <<~SCRIPT
-                #!/bin/sh
-                exec svlogd -tt /var/log/harbr/#{@container_name}/next/
+              <<~SCRIPT
+              #!/bin/sh
+              exec svlogd -tt /var/log/harbr/#{@container_name}/next/
               SCRIPT
             end
           end
@@ -164,46 +164,49 @@ module Harbr
       end
 
       def perform(name, version)
-        `bundle config set --local path 'vendor/bundle'`
 
-        manifest = load_manifest(name, version)
-        current_path = "/var/harbr/containers/#{name}/versions/#{version}"
+        Harbr.notifiable do
+          manifest = load_manifest(name, version)
+          current_path = "/var/harbr/containers/#{name}/versions/#{version}"
+
+          port = `port assign next.#{manifest.port}`.strip
 
-        port = `port assign next.#{manifest.port}`.strip
+          Dir.chdir current_path do
+            system "sv stop next.#{name}"
+            if File.exist?("Gemfile")
+              `bundle config set --local path 'vendor/bundle'`
+              system "bundle install"
+            end
 
-        Dir.chdir current_path do
-          system "sv stop next.#{name}"
-          system "bundle install" if File.exist?("Gemfile")
-          
+            `mkdir -p /etc/sv/harbr/#{name}/next`
+            `mkdir -p /etc/sv/harbr/#{name}/next/log`
+            `mkdir -p /var/log/harbr/#{name}/next/log`
 
-          `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/finish", Runit::Finish.new(port).to_s
+            write_to_file "/etc/sv/harbr/#{name}/next/log/run", Runit::Next::Log.new(name).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
+            `chmod +x /etc/sv/harbr/#{name}/next/run`
+            `chmod +x /etc/sv/harbr/#{name}/next/log/run`
+            `chmod +x /etc/sv/harbr/#{name}/next/finish`
 
-          `chmod +x /etc/sv/harbr/#{name}/next/run`
-          `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"
 
-          system "rm /etc/service/next.#{name}"
-          system "rm /var/harbr/containers/#{name}/next"
+            system "ln -sf /var/harbr/containers/#{name}/versions/#{version} /var/harbr/containers/#{name}/next"
+            system "ln -sf /etc/sv/harbr/#{name}/next /etc/service/next.#{name}"
 
-          system "ln -sf /var/harbr/containers/#{name}/versions/#{version} /var/harbr/containers/#{name}/next"
-          system "ln -sf /etc/sv/harbr/#{name}/next /etc/service/next.#{name}"
+            `rsync -av /var/dddr/#{name}/live  /var/dddr/#{name}/next`
+            puts "sync live data to next"
 
-          `rsync -av /var/dddr/#{name}/live  /var/dddr/#{name}/next`
-          puts "sync live data to next"
+            system "sv restart next.#{name}"
+          end
 
-          system "sv restart next.#{name}"
+          containers = collate_containers("next.#{name}", "next.#{manifest.host}", port)
+          create_traefik_config(containers)
+          puts "harbr: #{version} of #{name}"
         end
 
-        containers = collate_containers("next.#{name}", "next.#{manifest.host}", port)
-        create_traefik_config(containers)
-
-        puts "process #{version} of #{name}"
       end
     end
   end

data/lib/harbr/version.rb

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

data/lib/harbr.rb

@@ -6,6 +6,7 @@ require "toml-rb"
 require "fileutils"
 require "ostruct"
 require "sucker_punch"
+require 'resend'
 
 require_relative "harbr/version"
 require_relative "harbr/container"
@@ -17,6 +18,37 @@ module Harbr
   DEFAULT_DIRECTORY = "/var/harbr/containers"
   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
+
+  def self.send_notification(subject, body)
+    begin
+      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}"
+      return
+    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.28
+  version: 0.1.30
 platform: ruby
 authors:
 - Delaney Kuldvee Burke
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-12-23 00:00:00.000000000 Z
+date: 2023-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: listen