harbr 0.1.50 → 0.1.52

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2194f76f6826ebac55719cf284659c5df90236fc883e654a863465506233f6b1
-  data.tar.gz: 656cc2ccb446abf757b301ea6533a2b47c8f36e2fb31a0d9c97d35acefd4c063
+  metadata.gz: a31eedc9d45cc5968cb05e2287c2686b9c25627a5a31b4dea46e93ffa92ed82b
+  data.tar.gz: 5ee4e173c8c1daa6425d6909be7f3389b88ca295153e27b36f1c18ed2783ef65
 SHA512:
-  metadata.gz: 06b2f41d6c688caf22f5c8b91dfadbc1d8116b6d12b99b117ed6069e6896cb9779938d3d5884fc5434433473ba446c0021c8868a85e14644a5e4c90ffa8ee71e
-  data.tar.gz: 44b75738862cec2529b340c83cc77b02ef05cc508365222e8d11d06057b7432e4c06e6cc39634f8e86f0c300f8422538efcf770cc433bf7c60bbbeeb38b1c85f
+  metadata.gz: 8af7d7b58ba8944153bacd29e374bcd7dceee42d9f9495e6bd5b541964f75e3d7dc46495175dd8f35a3c8db1a34104e08c312cd42888cdff9c75e472bf9389ed
+  data.tar.gz: d298bc7ee67bd56e7dac7b9fbb3a38f95c09cb2c4d923073ee96553837dd04806948fbc3028af0fb359e0efadd5cb2536cf9b8f1dd9c167809f95727b04c0e38

data/exe/harbr

@@ -187,17 +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}/next`
-      version = $2      
-    end
-        
+    /versions\/(?<version>\d*)/.match(`ls -l /var/harbr/containers/#{name}/next`)
+    version = $1
+    raise "Ooops! next version not found!" if version.nil?
+
     Harbr::Job.perform_async(name, version, "current")
-    puts "deploy current version #{version} of #{container}"
+    puts "deploy current version #{version} of #{name}"
 
   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.50"
+  VERSION = "0.1.52"
 end

metadata

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