harbr 0.1.49 → 0.1.52

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afa50fa2d13cb27fe66aac3529c34dca995c6793c47ffab0c0ad49f48b3afbed
-  data.tar.gz: 5b8c161f835b4d86479f2282376cd3cb04cd5fd7b8c9d4e99a6bdb27502a8dae
+  metadata.gz: a31eedc9d45cc5968cb05e2287c2686b9c25627a5a31b4dea46e93ffa92ed82b
+  data.tar.gz: 5ee4e173c8c1daa6425d6909be7f3389b88ca295153e27b36f1c18ed2783ef65
 SHA512:
-  metadata.gz: 4b68f72d961341d55439471b40f2ef033565450f8762c0195cb9e2746e818956c9a2d5d4f3f0686277ea29bb7b14dfb3c54f43e03549bcc936cdfb4504ec150b
-  data.tar.gz: 78c8792d6b110d4617f468df52db82c09be14cb7c23eb0e8aebedc3d8b176e3e2b8679bd8e72486a156e581117b917455813203b72e0de2399803c56ef711d6d
+  metadata.gz: 8af7d7b58ba8944153bacd29e374bcd7dceee42d9f9495e6bd5b541964f75e3d7dc46495175dd8f35a3c8db1a34104e08c312cd42888cdff9c75e472bf9389ed
+  data.tar.gz: d298bc7ee67bd56e7dac7b9fbb3a38f95c09cb2c4d923073ee96553837dd04806948fbc3028af0fb359e0efadd5cb2536cf9b8f1dd9c167809f95727b04c0e38

data/exe/harbr

@@ -83,13 +83,8 @@ class HarbrCLI < Thor
 
     def run_jobs(container, version)
       puts "Running tasks for container: #{container}, version: #{version}"
-      if version.to_i == 0
-        Harbr::Job.perform_async(container, version, "current")
-        puts "deploy current version #{version} of #{container}"
-      else
-        Harbr::Job.perform_async(container, version, "next")
-        puts "deploy next version #{version} of #{container}"
-      end
+      Harbr::Job.perform_async(container, version, "next")
+      puts "deploy next version #{version} of #{container}"
     end
 
     def create_traefik_config(containers)
@@ -192,19 +187,15 @@ class HarbrCLI < Thor
 
   desc "deploy", "deploy a container to production"
   def deploy(name)
-    Dir.chdir("/var/harbr/containers/#{name}/") do
-      /(?:. * -> (?:.*))/ =~ `ls -l /var/harbr/containers/#{name}/current`
+    /versions\/(?<version>\d*)/.match(`ls -l /var/harbr/containers/#{name}/next`)
+    version = $1
+    raise "Ooops! next version not found!" if version.nil?
 
-      `rm -r rollback`
-      `ln -sf #{$2} rollback`
+    Harbr::Job.perform_async(name, version, "current")
+    puts "deploy current version #{version} of #{name}"
 
-      /(?:. * -> (?:.*))/ =~ `ls -l /var/harbr/containers/#{name}/next`
-      `rm -r current`
-      `ln -sf #{$2} current`
-      `sv restart #{name}`
-    end
   end
-
+  
   desc "rollback", "rollback last deploy"
   def rollback(name)
     Dir.chdir("/var/harbr/containers/#{name}") do

data/lib/harbr/job.rb

@@ -115,11 +115,14 @@ module Harbr
       link_directories(name, version, env)
       sync_live_data_if_next(name) if env == "next"
 
-      containers = collate_containers("#{env}.#{name}", "#{env}.#{manifest.host}", port)
+      containers = collate_containers("#{name}", "#{manifest.host}", port) if env == "current"
+      containers = collate_containers("#{env}.#{name}", "#{env}.#{manifest.host}", port) if env == "next"
+
       create_traefik_config(containers)
 
       system "sv start #{env}.#{name}" if env == "next"
       system "sv start #{name}" if env == "current"
+      
 
 
       puts "harbr: #{version} of #{name} in #{env} environment"
@@ -139,19 +142,38 @@ module Harbr
       finish_script = Runit::Script.new(name, port, env).finish_script
       log_script = Runit::Script.new(name, port, env).log_script
 
-      write_to_file "/etc/sv/harbr/#{name}/#{env}/run", run_script
-      write_to_file "/etc/sv/harbr/#{name}/#{env}/log/run", 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
+        `chmod +x /etc/sv/harbr/#{name}/#{env}/run`
+        `chmod +x /etc/sv/harbr/#{name}/#{env}/log/run`
+      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
+        `chmod +x /etc/sv/harbr/#{name}/run`
+        `chmod +x /etc/sv/harbr/#{name}/log/run`
+      end
 
-      `chmod +x /etc/sv/harbr/#{name}/#{env}/run`
-      `chmod +x /etc/sv/harbr/#{name}/#{env}/log/run`
+      
     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}`
+      `ln -sf /var/harbr/containers/#{name}/versions/#{version} /var/harbr/containers/#{name}`
+      `ln -sf /etc/sv/harbr/#{name}/#{env} /etc/service/#{name}`
+      end
+            
     end
 
     def sync_live_data_if_next(name)

data/lib/harbr/version.rb

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

metadata

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