harbr 0.0.81 → 0.0.83

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b35165cb2f91631af1af3f62bb4d32308d0ca1ca10b1325e984cb77d5685bc5
-  data.tar.gz: cd1214d2cf6c2ecb58592e90bc6de7f5e762f9b5a33da318549186ebbd9e5d7e
+  metadata.gz: 9d430278f6c0b2374000220255f6c4a9be3d197bc2fa9936e85b10c4cd4a7682
+  data.tar.gz: fe1c7d906c6d5bbce17d992702eb56758c39653f83bbf575157fe6faa71f1e6e
 SHA512:
-  metadata.gz: d9b79e33d8fc19698fc6b11b10c0e0f2796d709c9fdf4f7d41cfc1eeb8fc3430b47d90cd998bcbe73856dc7d63a6969488d7ec7a7c39814800a69ecaecc954d7
-  data.tar.gz: 682ebf832dc4649f42e60f1cc128df9dd1903ee6c2e435d125754f1026ac3c918d15fba1c2ac75d38811c7116e3928043c807163a6e4f4f4fea32e7945af702b
+  metadata.gz: e33577acec3ca405f68c21c00d6e74f40b8c3a89a81a7596acc16f2ff6afe201abc69c59b3192b2a3d8805c896c12143b63c2a9503c2c9e27653e13ea6925aee
+  data.tar.gz: 79332a0b2bd4cc7cf1ae681b0609aaae522766452af8117ea7c2bdb559578d3cc62507f5e3c467f633c36def1b3a723526078874a5fb46bfc1d646fbc7c9493f

data/lib/harbr/job.rb

@@ -77,7 +77,7 @@ module Harbr
           script_template = <<~SCRIPT
               #!/bin/sh
               exec 2>&1
-              cd /var/harbr/#{@container_name}/current
+              cd /var/harbr/containers/#{@container_name}/current
               exec ./exe/run #{@port}
           SCRIPT
         end
@@ -116,38 +116,6 @@ module Harbr
     
       end
     
-      module Next
-    
-        class Run
-          def initialize(container, port)
-            @container_name = container
-            @port = port
-          end
-    
-          def to_s
-            script_template = <<~SCRIPT
-                #!/bin/sh
-                exec 2>&1
-                cd /var/harbr/containers/#{@container_name}/next
-                exec ./exe/run #{@port}
-            SCRIPT
-          end
-        end
-    
-        class Log
-          def initialize(container)
-            @container_name = container
-          end
-    
-          def to_s
-            script_template = <<~SCRIPT
-                #!/bin/sh
-                exec svlogd -tt /var/log/harbr/#{@container_name}/next/
-            SCRIPT
-          end
-        end
-    
-      end
     end
     
     def write_to_file(path, contents)
@@ -167,22 +135,22 @@ module Harbr
       Dir.chdir "/var/harbr/containers/#{name}/versions/#{version}" do
       `bundle config set --local path 'vendor/bundle'`
       manifest = load_manifest(name, version)
-      port = `port assign next.#{manifest.port}`.strip
+      port = `port assign #{manifest.port}`.strip
       system "sv stop #{name}"
       system 'bundle install'
       `mkdir -p /etc/sv/harbr/#{name}`
       `mkdir -p /etc/sv/harbr/#{name}/log`
 
-      write_to_file "/etc/sv/harbr/#{name}/run", Runit::Next::Run.new(name, port).to_s
+      write_to_file "/etc/sv/harbr/#{name}/run", Runit::Run.new(name, port).to_s
       write_to_file "/etc/sv/harbr/#{name}/finish", Runit::Finish.new(port).to_s
-      write_to_file "/etc/sv/harbr/#{name}/log/run", Runit::Next::Log.new(name).to_s
+      write_to_file "/etc/sv/harbr/#{name}/log/run", Runit::Log.new(name).to_s
 
       `chmod +x /etc/sv/harbr/#{name}/run`
       `chmod +x /etc/sv/harbr/#{name}/log/run`
       `chmod +x /etc/sv/harbr/#{name}/finish`
 
-      system "ln -s /var/harbr/containers/#{name}/versions/#{version} /var/harbr/containers/#{name}/current"
-      system "ln -s /etc/sv/harbr/#{name}/next /etc/service/#{name}"
+      system "ln -sf /var/harbr/containers/#{name}/versions/#{version} /var/harbr/containers/#{name}/current"
+      system "ln -sf /etc/sv/harbr/#{name}/next /etc/service/#{name}"
 
       containers = collate_containers(name, manifest.host, port)
       create_traefik_config(containers)

data/lib/harbr/version.rb

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

metadata

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