harbr 0.0.107 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8e70f482635d3b1b64c52bb51739e14312704008cb68942552e2c67adcddb0e
-  data.tar.gz: c558200bca48af358ce3a87847c5a156b626ab34a03605ee4d49ffeeaeba5d5b
+  metadata.gz: f9c8544c1daf62daab459ca9f4d2953b5ad688b8856571326cea06fd486272b6
+  data.tar.gz: 2979d7301cd49b3477f38ab0293e37045027cb1d469731378132c2dc4cc59b3c
 SHA512:
-  metadata.gz: 43b3bc4c2e5af49eca364bca97f5a13afb88047aa022e023d8679aba4532eebffb4070a07d9fae4741f0bc38eeeb7c56fb372fd446cc21729e8e74a3394a974b
-  data.tar.gz: a56babd7d75c1c9a2c1840747d064cc3c0efe5a38862fd584d6270d675d4d80ed547ecfd3cf00a00a62f3c476ef2d0c583320347db5583883efd01207fbf88c2
+  metadata.gz: ceaf8c984d22e2e7e8faf87519601eefbafc8a598caae1e817ce6db6900bc12e2e0b2f20138459f78eaec423eb0f587ba828cbef292586b9ab4835070e2bcbad
+  data.tar.gz: 469ccc69aa021a4f141596dad901c2af9f386f44b2c9724843c5cb79690b1301065b9ac015c34873445d4afdb6f1e4011f96625b6c0f94feef93ad90e9977800

data/exe/harbr

@@ -7,10 +7,10 @@ class HarbrCLI < Thor
       return puts "No containers available." if containers.empty?
 
       # Define headers based on Container attributes
-      headers = ["Name", "Host Header", "IP", "Port", "Current Version", "Next Version", "Previous Version"]
+      headers = ["Name", "Host Header", "IP", "Port"]
 
       rows = containers.map do |container|
-        [container.name, container.host_header, container.ip.nil? ? "127.0.0.1" : container.ip, container.port.to_s, container.current_version, container.next_version, container.previous_version]
+        [container.name, container.host_header, container.ip.nil? ? "127.0.0.1" : container.ip, container.port]
       end
 
       table = ::Terminal::Table.new(headings: headers, rows: rows)
@@ -172,20 +172,22 @@ class HarbrCLI < Thor
   desc "deploy", "deploy a container to production"
   def deploy(name)
     Dir.chdir("/var/harbr/containers/#{name}/") do
-      `mv current rollback`
       `mv next current`
-      puts `sv restart #{name}`
+      puts `sv restart next.#{name}`
     end 
-
   end
 
   desc "rollback", "rollback last deploy"
   def rollback(name)
     Dir.chdir("/var/harbr/containers/#{name}") do
       if File.exist?("rollback")
-        `sv stop #{name}`
+        `cp -r current current.bak`
         `mv rollback current`
-        `sv start #{name}`
+        `cp -r current.bak next`
+        `rm -rf rollback`
+        `rm -rf current.bak`
+        `sv restart #{name}`
+        `sv restart next.#{name}`
         puts "rollback successful"
       end
     end 
@@ -210,5 +212,4 @@ class HarbrCLI < Thor
     end
   end
 end
-
 HarbrCLI.start(ARGV)

data/lib/harbr/container.rb

@@ -1,7 +1,7 @@
 module Harbr
   class Container
     include Dddr::Entity
-    attr_accessor :name, :host_header, :ip, :port,:current_version, :next_version,:previous_version
+    attr_accessor :name, :host_header, :ip, :port
 
     queries do
       def find_by_header(host_header)

data/lib/harbr/job.rb

@@ -56,7 +56,6 @@ module Harbr
         container.host_header =host
         container.ip = "127.0.0.1"
         container.port = port
-        container.current_version = 0
         containers.create(container)
       else
         container.port = port

data/lib/harbr/next/job.rb

@@ -50,16 +50,22 @@ module Harbr
         puts "Traefik configuration written to /etc/traefik/harbr.toml"
       end
       
-      def collate_containers(name,port, version)
+      def collate_containers(name,host,port)
       
         containers = Harbr::Container::Repository.new
-        container = containers.find_by_name(name)
+        container = containers.find_by_header(host)
       
-        container.port = port
-        container.next_version = version
-        container.previous_version = container.current_version     
-        containers.update(container)
-
+        if container.nil?
+          container = Harbr::Container.new
+          container.name = name
+          container.host_header =host
+          container.ip = "127.0.0.1"
+          container.port = port
+          containers.create(container)
+        else
+          container.port = port
+          containers.update(container)
+        end
         containers.all
       end
       
@@ -166,8 +172,7 @@ module Harbr
         `bundle config set --local path 'vendor/bundle'`
         
         manifest = load_manifest(name,version)
-        
-        current_path = "/var/harbr/containers/#{name}/current"
+        current_path = "/var/harbr/containers/#{name}/versions/#{version}"
       
         port = `port assign next.#{manifest.port}`.strip
     
@@ -190,12 +195,13 @@ module Harbr
           
           
           system "rm /etc/service/next.#{name}"
+          system "rm /var/harbr/containers/#{name}/next"
           
           system "ln -sf /var/harbr/containers/#{name}/versions/#{version} /var/harbr/containers/#{name}/next"
           system "ln -sf /etc/sv/harbr/#{name}/next /etc/service/next.#{name}"
           system "sv restart next.#{name}"
           
-          containers = collate_containers("next.#{name}",port,version)
+          containers = collate_containers("next.#{name}","next.#{manifest.host}",port)
           create_traefik_config(containers)
         end
       

data/lib/harbr/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: harbr
 version: !ruby/object:Gem::Version
-  version: 0.0.107
+  version: 0.1.1
 platform: ruby
 authors:
 - Delaney Kuldvee Burke
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-12-14 00:00:00.000000000 Z
+date: 2023-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: listen