harbr 0.1.61 → 0.1.63

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1981cd906aad0aa7276bcf5a4000bca22a4c64c60d5c65fb6035938fc4752af
-  data.tar.gz: d1085ae8703b5f65ebed446d75072886df693d6dfa44c64a1dc7170e8794f059
+  metadata.gz: 23cc716ac1aedc9f3bd0128a8e1d56241af336f933f77c87afb88565f7843a58
+  data.tar.gz: d2ef42f3f6414833be7a966ab334b2253f783047eb73a8f4690628fe926d63c5
 SHA512:
-  metadata.gz: 16cc4ec3fb5e405eaf03c472336913f5be3ae8071aaf95c3379a2bd124219164f8b66588729117c24c2d94508ee4c9f8085b19774c1ab8793956d4fe1b4a7523
-  data.tar.gz: acd9c634875e20c3b0a8bacc14e4f91ebfc68f6ae799306e481eed2799bdf77d5f228714df79d61f46246b33161b534db62a41b1614f725be055701b1b2e38a1
+  metadata.gz: b68fd3136881017c533a35f9c1faa859de11e73898560545d8081a74c588ae244ea056aed6750a9c79f417cb0be93958cf1b43d97e3e42b5fc2b8c3aee5f43d9
+  data.tar.gz: e7ed5f67e867797d39396579673c4475558b8ab127ace975f1ad342931b4fdb9a90257ad7cd114117353660b109fe8a35e237e311d94639ea6debf51da242ac9

data/exe/harbr

@@ -190,14 +190,10 @@ class HarbrCLI < Thor
     /versions\/(?<version>\d*)/.match(`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`)
     `ln -sf /var/harbr/containers/#{name}/version/#{$1} /var/harbr/containers/#{name}/rollback`
 
-
-    `rm -rf /var/harbr/containers/#{name}/current`
-
     Harbr::Job.perform_async(name, version, "current")
 
     puts "deploy current version #{version} of #{name}"

data/lib/harbr/job.rb

@@ -76,7 +76,7 @@ module Harbr
     end
 
     def perform(name, version, env)
-      Harbr.notifiable(name, version) 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)
@@ -197,7 +197,7 @@ module Harbr
       if env == "current"
       
       `rm -f /etc/service/#{name}`
-      `rm -f /var/harbr/containers/#{name}`
+      `rm -f /var/harbr/containers/#{name}/current`
 
       `ln -sf /var/harbr/containers/#{name}/versions/#{version} /var/harbr/containers/#{name}/current`
       `ln -sf /etc/sv/harbr/#{name} /etc/service/#{name}`

data/lib/harbr/version.rb

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

data/lib/harbr.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: harbr
 version: !ruby/object:Gem::Version
-  version: 0.1.61
+  version: 0.1.63
 platform: ruby
 authors:
 - Delaney Kuldvee Burke
@@ -132,7 +132,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- "!"
 - ".data/development/Harbr::Port.dir"
 - ".data/development/Harbr::Port.pag"
 - ".rspec"

data/!

@@ -1,51 +0,0 @@
-release 0.1.60
-
-add logging and fix finisg script
-# Please enter the commit message for your changes. Lines starting
-# with '#' will be ignored, and an empty message aborts the commit.
-#
-# On branch main
-# Your branch is up to date with 'origin/main'.
-#
-# Changes to be committed:
-#	modified:   lib/harbr/job.rb
-#	modified:   lib/harbr/version.rb
-#
-# ------------------------ >8 ------------------------
-# Do not modify or remove the line above.
-# Everything below it will be ignored.
-diff --git a/lib/harbr/job.rb b/lib/harbr/job.rb
-index 747fa75..6ece813 100644
---- a/lib/harbr/job.rb
-+++ b/lib/harbr/job.rb
-@@ -169,15 +169,18 @@ module Harbr
-         `chmod +x /etc/sv/harbr/#{name}/#{env}/run`
-         `chmod +x /etc/sv/harbr/#{name}/#{env}/finish`
-         `chmod +x /etc/sv/harbr/#{name}/#{env}/log/run`
-+        `mkdir -p /var/log/harbr/#{name}/#{env}`
-       end
- 
-       if env == "current"
-         write_to_file "/etc/sv/harbr/#{name}/run", run_script
-         write_to_file "/etc/sv/harbr/#{name}/log/run", log_script
--        write_to_file "/etc/sv/harbr/#{name}/log/finish", finish_script
-+        write_to_file "/etc/sv/harbr/#{name}/finish", finish_script
-         `chmod +x /etc/sv/harbr/#{name}/run`
-         `chmod +x /etc/sv/harbr/#{name}/finish`
-         `chmod +x /etc/sv/harbr/#{name}/log/run`
-+        `mkdir -p /var/log/harbr/#{name}`
-+        
-       end
- 
-       
-diff --git a/lib/harbr/version.rb b/lib/harbr/version.rb
-index 89cc745..88176bf 100644
---- a/lib/harbr/version.rb
-+++ b/lib/harbr/version.rb
-@@ -1,5 +1,5 @@
- # frozen_string_literal: true
- 
- module Harbr
--  VERSION = "0.1.59"
-+  VERSION = "0.1.60"
- end