harbr 0.1.82 → 0.1.84

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '028ba5825b5e4969fb9652aa83c380c31c25666f618da2c86a5d93613b209bc4'
-  data.tar.gz: 2f02b269e41fd999bc16ad0520d76f9ea772d7de1f256e0628da66c4f73e45a2
+  metadata.gz: 0eeb93a8a44b33d81585d43043fc3e87d8af4ca2b86b58b84e395edd9fdcc486
+  data.tar.gz: 4ab4e30f7811be94fa7d4c8ccd6a2f00b8ac441bfec0a33426c3f00dfde972f4
 SHA512:
-  metadata.gz: d9bb90fa673d5001a2ae395791c7a8ca2384a1ab90fb70b0ca8cf70a80ab0edd9b937459f68b5d3b7f1aac60dd2b72e8c083ecf3455c17763d1b86e136204db2
-  data.tar.gz: 55bc8fb8f271de72d974e7e2f45f66b7fd937652a5fc5c1018adcdc85c9a640b8092027005b41e3145adceb1264f51e886fb4844f6458e3edfde6c991ed8cb7f
+  metadata.gz: a2079550747b2693fdfbb9df75fb59044b9455cf66b422493d75de5255d3d274696ed345cc0ba5fee99b6865f0642507a17868d6319dbe9826c3977c44733e12
+  data.tar.gz: f80160a004bb2b406b9e21f4f20171b432181ee434b7bbaef3a3492b2996ec156d7858540e28cdfa942c72fe999344c199ac7b792a859d7050ee4b9d2862f56b

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`
+    /versions\/(?<version>\d*)/ =~ `ls -l /var/harbr/containers/#{name}/live`
     `ln -sf /var/harbr/containers/#{name}/version/#{$1} /var/harbr/containers/#{name}/rollback`
 
-    Harbr::Job.perform_async(name, version, "current")
+    Harbr::Job.perform_async(name, version, "live")
 
-    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

@@ -138,15 +138,13 @@ module Harbr
       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 +163,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,11 +212,10 @@ module Harbr
       end
 
       def log_script
-        @env = env == 'current' ? nil : env
         <<~SCRIPT
           #!/bin/sh
           echo "starting log for #{@container_name} on port #{@port}"
-          exec svlogd -tt /var/log/harbr/#{@container_name}/#{@env}
+          exec svlogd -tt /var/log/harbr/#{@container_name}/#{env}
         SCRIPT
       end
     end

data/lib/harbr/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Harbr
-  VERSION = "0.1.82"
+  VERSION = "0.1.84"
 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.82
+  version: 0.1.84
 platform: ruby
 authors:
 - Delaney Kuldvee Burke