harbr 0.1.83 → 0.1.85

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: facdcd11bc99e8446e63f238f26887c463b3e43e1774a3d55e01b84db1deb544
-  data.tar.gz: 57e4363de2ae148056ae3c68b7bb5018e8860630cd54feda08d91d267e17f2e1
+  metadata.gz: be82c631f5f11bd9bd9b0e2f418a649a3c9be0c9917cc4659fbcaac615b4b44e
+  data.tar.gz: 8714e7e129b71d4db389959256b85f4d1d5786f07b65e9b83ad5396443eea2e6
 SHA512:
-  metadata.gz: 6916c71a469ab13b6c67ac85fff8f4668252ae8a670727f273bc71d9394dee07d3d3017f56128a27b49a70450504232338911d26fc1474c062124bfaecd14da9
-  data.tar.gz: 43fbf57d32578cfe257a65b5308f79607beb2eb50edf4942219852386c81e44d5c9a422b2952eaa1cc2a7683df78382f191b5dd83d57d66fef64873040469a5d
+  metadata.gz: 4f6e4de31bf787de45ba4239916ff00552f3bfebcae2e5111e438e5ebb458ccc01865b189d73722383d6ec695042ad2b5d723fdcfeb952c7ee1079de4f3cc7f8
+  data.tar.gz: fd75ef1823dcac1a36f1f4db2ceabd60a181253aa197b4a44766a3496d67aeb0fd8c3803e4b9017f4eec3ff095443a88fe65a9de6d070d492afa85cc55f3c184

data/exe/harbr

@@ -133,7 +133,8 @@ class HarbrCLI < Thor
 
     container_repo = Harbr::Container::Repository.new
 
-    [name, "next.#{name}"].each do |container_name|
+    ["live.#{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."
@@ -164,7 +165,7 @@ class HarbrCLI < Thor
     container_repo = Harbr::Container::Repository.new
     container = container_repo.find_by_name(container)
     if container
-      exec "tail -f /var/log/harbr/#{container.name}/current" if options[:live]
+      exec "tail -f /var/log/harbr/#{container.name}/live/current" if options[:live]
       exec "tail -f /var/log/harbr/#{container.name}/next/current" if options[:next]
     else
       puts "Container not recognized"
@@ -217,12 +218,12 @@ class HarbrCLI < Thor
     version = $1
     raise "Ooops! next version not found!" if version.nil?
 
-    /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, "live")
 
-    Harbr::Job.perform_async(name, version, "current")
+    /versions\/(?<version>\d*)/ =~ `ls -l /var/harbr/containers/#{name}/live`
+    `ln -sf /var/harbr/containers/#{name}/version/#{$1} /var/harbr/containers/#{name}/rollback`
 
-    puts "deploy current version #{version} of #{name}"
+    puts "deploy version #{version} of #{name} to live environment"
   end
 
   desc "rollback", "rollback last deploy"
@@ -231,9 +232,9 @@ class HarbrCLI < Thor
       if File.exist?("rollback")
         Dir.chdir("/var/harbr/containers/#{name}/") do
           /(?:. * -> (?:.*))/ =~ `ls -l /var/harbr/containers/#{name}/rollback`
-          `rm -r current`
-          `ln -sf #{$2} current`
-          `sv restart #{name}`
+          `rm -r live`
+          `ln -sf #{$2} live`
+          `sv restart live.#{name}`
         end
         puts "rollback successful"
       end

data/lib/harbr/job.rb

@@ -132,21 +132,24 @@ module Harbr
     def process_container(name, version, port, env, manifest)
       version_path = "/var/harbr/containers/#{name}/versions/#{version}"
 
+      if env == "live"
+        `rm -f /var/harbr/containers/#{name}/live` if Dir.exist?("/var/harbr/containers/#{name}/live")
+        `ln -sf /var/harbr/containers/#{name}/versions/#{version} /var/harbr/containers/#{name}/live`                
+      end
+      
       bundle_install_if_needed(version_path)
 
       create_runit_scripts(name, port, env)
       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("#{env}.#{name}", "#{env}.#{manifest.host}", port, manifest.host_aliases&.map { |host| "#{env}.#{host}" })
 
       create_traefik_config(containers)
 
-      system "sv restart #{env}.#{name}" if env == "next"
-      system "sv restart #{name}" if env == "current"
+      system "sv restart #{env}.#{name}"
 
-      puts "harbr: #{version} of #{name} in #{env} environment"
+      puts "harbr: #{version} of #{name} deployed to #{env} environment"
     end
 
     def bundle_install_if_needed(path)
@@ -165,44 +168,20 @@ module Harbr
       finish_script = Runit::Script.new(name, port, env).finish_script
       log_script = Runit::Script.new(name, port, env).log_script
 
-      if env == "next"
-        write_to_file "/etc/sv/harbr/#{name}/#{env}/run", run_script
-        write_to_file "/etc/sv/harbr/#{name}/#{env}/log/run", log_script
-        write_to_file "/etc/sv/harbr/#{name}/#{env}/finish", finish_script
-        `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}/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
+      write_to_file "/etc/sv/harbr/#{name}/#{env}/run", run_script
+      write_to_file "/etc/sv/harbr/#{name}/#{env}/log/run", log_script
+      write_to_file "/etc/sv/harbr/#{name}/#{env}/finish", finish_script
+      `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
 
     def link_directories(name, version, env)
-      if env == "next"
-        `rm -f /etc/service/#{env}.#{name}`
-        `rm -f /var/harbr/containers/#{name}/#{env}`
-        `ln -sf /var/harbr/containers/#{name}/versions/#{version} /var/harbr/containers/#{name}/#{env}`
-        `ln -sf /etc/sv/harbr/#{name}/#{env} /etc/service/#{env}.#{name}`
-      end
-
-      if env == "current"
-
-        `rm -f /etc/service/#{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}`
-      end
+      `rm -f /etc/service/#{env}.#{name}`
+      `rm -f /var/harbr/containers/#{name}/#{env}`
+      `ln -sf /var/harbr/containers/#{name}/versions/#{version} /var/harbr/containers/#{name}/#{env}`
+      `ln -sf /etc/sv/harbr/#{name}/#{env} /etc/service/#{env}.#{name}`
     end
 
     def sync_live_data_if_next(name)
@@ -238,7 +217,6 @@ module Harbr
       end
 
       def log_script
-        env = @env == 'current' ? nil : @env
         <<~SCRIPT
           #!/bin/sh
           echo "starting log for #{@container_name} on port #{@port}"

data/lib/harbr/version.rb

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

data/lib/harbr.rb

@@ -41,7 +41,6 @@ module Harbr
 
   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

metadata

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