harbr 0.1.95 → 0.1.97

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5deda148fd004720248f93466e9a63066acaf37facae18a5982b82ade03e16fb
-  data.tar.gz: 9104a70061f3f0ead6243d52a5bd8c3158d9bbd30a4144c66b7a2ed76ab93d75
+  metadata.gz: 6523337d1554b46139ffb2f876b7b6a2370ae7ee20446cd2e97f9c3f92ead769
+  data.tar.gz: 64ed1fdda1a29df228e1ce3131966a14dd2d588e52d8b1728a37f0d91766c272
 SHA512:
-  metadata.gz: 58f55fe7801cc3e9fe18461c689db319b6d85aabcabd35101997664adb0ff57359f1b7400bbaff571b9c867e8645f8901ba8d1094b1097f27a51a75bc30b9544
-  data.tar.gz: 332fb0f0fbb1d6351213ab073ef2ce058e40715da46e01cf20a1fd6ee3fe9f711e685b2c22c35a897569fb1871ec26e88383296f156206f114758ffb8d271aa9
+  metadata.gz: fd8a9c7b340d50d75ad4504c391a9c94ddba5e2b442ecfb0042c8b88fe153b90d412a853ac8b7e3e236c5593aba5c597295e36c08f2feec24c63f4f86287c4e5
+  data.tar.gz: e14a7cdadc6f73879df16e52012e9104e8f6f0d208f4a597bb596bb1b7cd2cec256167e15dca6d98ef5b400961f02f2b3debd3542380c3b67d7ecfe7d5bf9f6f

data/exe/harbr

@@ -86,11 +86,10 @@ class HarbrCLI < Thor
         puts "Error: #{e.message}"
       end
     end
-
     def run_jobs(container, version)
-      puts "Running tasks for container: #{container}, version: #{version}"
-      Harbr::Job.perform_async(container, version, "next")
-      puts "deploy next version #{version} of #{container}"
+      check_file_exists("/var/harbr/containers/#{container}/versions/#{version}/config/manifest.yml") do
+        `harbr deploy #{container} #{version} --next`
+      end
     end
 
     def create_traefik_config(containers)
@@ -134,7 +133,6 @@ class HarbrCLI < Thor
     container_repo = Harbr::Container::Repository.new
 
     ["live.#{name}", "next.#{name}", 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."
@@ -213,17 +211,29 @@ class HarbrCLI < Thor
   end
 
   desc "deploy", "deploy a container to production"
-  def deploy(name)
-    /versions\/(?<version>\d*)/ =~ `ls -l /var/harbr/containers/#{name}/next`
-    version = $1
-    raise "Ooops! next version not found!" if version.nil?
+  method_option :live, type: :boolean, default: false, aliases: "-l", desc: "deploy to live environment"
+  method_option :next, type: :boolean, default: false, aliases: "-n", desc: "deploy to next environment"
+  def deploy(name,version=nil)
+    
+    if options[:live]
+      /versions\/(?<version>\d*)/ =~ `ls -l /var/harbr/containers/#{name}/next`
+      version = $1
+      raise "Ooops! next version not found!" if version.nil?
 
-    Harbr::Job.perform_async(name, version, "live")
+      Harbr::Job.perform_async(name, version, "live")
 
-    /versions\/(?<version>\d*)/ =~ `ls -l /var/harbr/containers/#{name}/live`
-    `ln -sf /var/harbr/containers/#{name}/version/#{$1} /var/harbr/containers/#{name}/rollback`
+      /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 version #{version} of #{name} to live environment"
+      puts "deploy version #{version} of #{name} to live environment"
+    end
+
+    if options[:next]
+      `ln -sf /var/harbr/containers/#{name}/version/#{version} /var/harbr/containers/#{name}/next`
+      Harbr::Job.perform_async(name, version, "next")
+      puts "deploy version #{version} of #{name} to next environment"      
+    end
+      
   end
 
   desc "rollback", "rollback last deploy"

data/lib/harbr/job.rb

@@ -42,7 +42,7 @@ module Harbr
     def collate_containers(name, host, port, host_header_aliases = [])
       containers = Harbr::Container::Repository.new
       container = containers.find_by_header(host)
-      
+
       if container.nil?
         container = Harbr::Container.new
         container.name = name
@@ -56,10 +56,8 @@ module Harbr
         containers.update(container)
       end
 
-      
       if host_header_aliases
         host_header_aliases.each do |host_header_alias|
-          
           container = Harbr::Container.new
           container.name = "#{name} -> #{host_header_alias}"
           container.host_header = host_header_alias
@@ -67,30 +65,26 @@ module Harbr
           container.port = port
           containers.create(container) unless containers.find_by_header(host_header_alias)
 
-          if(container.name.start_with?("live"))
+          if container.name.start_with?("live")
 
-            plain_name = host_header_alias.gsub("live.","")
+            plain_name = host_header_alias.gsub("live.", "")
             container = Harbr::Container.new
             container.name = "#{name} -> #{plain_name}"
             container.host_header = plain_name
             container.ip = "127.0.0.1"
-            container.port = port 
-
+            container.port = port
 
             unless containers.find_by_header(container.host_header)
               containers.create(container)
             end
 
           end
-
         end
       end
 
       containers.all
     end
 
-
-
     def write_to_file(path, contents)
       dirname = File.dirname(path)
       FileUtils.mkdir_p(dirname) unless File.directory?(dirname)
@@ -117,7 +111,7 @@ module Harbr
     private
 
     def remove_dot_from_string(str)
-      str.sub('.', '')
+      str.sub(".", "")
     end
 
     def check_file_exists(path)
@@ -159,14 +153,14 @@ module Harbr
 
       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`                
+        `ln -sf /var/harbr/containers/#{name}/versions/#{version} /var/harbr/containers/#{name}/live`
       end
-      
+
       if env == "next"
         `rm -f /var/harbr/containers/#{name}/next` if Dir.exist?("/var/harbr/containers/#{name}/next")
-        `ln -sf /var/harbr/containers/#{name}/versions/#{version} /var/harbr/containers/#{name}/next`                
+        `ln -sf /var/harbr/containers/#{name}/versions/#{version} /var/harbr/containers/#{name}/next`
       end
-      
+
       bundle_install_if_needed(version_path)
 
       create_runit_scripts(name, port, env)

data/lib/harbr/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: harbr
 version: !ruby/object:Gem::Version
-  version: 0.1.95
+  version: 0.1.97
 platform: ruby
 authors:
 - Delaney Kuldvee Burke
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-01-06 00:00:00.000000000 Z
+date: 2024-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: listen