harbr 0.1.94 → 0.1.96

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c12d70a94d93a674f98400063ed06d8ca6ed5825dd76a11c2d757332489cbb0
-  data.tar.gz: 10439e2d4bbd58192cf7ea3d6b68d9f17384e04987b2a972cb649c5cab513ec1
+  metadata.gz: 3c08916d7fe5471c23cdfa15e0cdd3cd5837e9ea2707a9d2cd7f208d660b9bf0
+  data.tar.gz: b81709797c73e85cc6b81d8107a88897fc05cc958506e65363770ff775ef84b7
 SHA512:
-  metadata.gz: 36ef93e13793e7379af5641567dc4c53985ecf3726ff909c7c25dd721c5147adfaeb6c185056eea0cd723be1c03e1b9f418cb843c3dc128c928008c4e759912b
-  data.tar.gz: 3cdfa64de1505181668a6f99b7eaf0eb608658b93d4a63142ed64506f739bd844f1170eff3ac7d91cae7b21465d54a505126a81c92ed700622a28a4d63755ed9
+  metadata.gz: 8e623c9751a79d4c706ffa0e467e4c4aab4e3178a739e1aae869a16fa9f375480907de3fd98c5f5d82db4c63f374ff2e7ee800f994d2b92dfbeb83431974d1e4
+  data.tar.gz: 30413ebd34547749790e3bb0158bbddb5093594b4b60d6dec791ad18ae9b645375ffc9735c8341dfc561f4bbce5606323f04071e58f4b4859975f694a75bf865

data/exe/harbr

@@ -88,9 +88,7 @@ class HarbrCLI < Thor
     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}"
+      `harbr deploy #{container} #{version} --next`
     end
 
     def create_traefik_config(containers)
@@ -134,7 +132,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 +210,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"
+    end
 
-    puts "deploy version #{version} of #{name} to live environment"
+    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 = remove_dot_from_string(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.94"
+  VERSION = "0.1.96"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: harbr
 version: !ruby/object:Gem::Version
-  version: 0.1.94
+  version: 0.1.96
 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