harbr 0.0.82 → 0.0.84

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1e6917d2f26c5e1bbecbccf6fae440750a6aa6122add836527318cd4dd76d30
-  data.tar.gz: 72a41fc3e526b57ce6fa029b0fd46a6821c6608f880f070971a0092038666c3f
+  metadata.gz: 96ab1b5d943067768cbd7f23242bf835e5adb880fb8d71878b0edb4e82d0ac58
+  data.tar.gz: f0bd6d423bf0c6a4355cfa53d86a25374d963c883bdb819135104f8111738559
 SHA512:
-  metadata.gz: f7010e30a615b6b876630875744c3b56f4aafceb31506c86ff20e9a07c1593d75fd5e4ad07cce0543ae1c068aafccc9db3848572a50a0ad5db7d1b9f15c684ed
-  data.tar.gz: 5ce94ff7548ccd37336bf2626499810d9fde3b581df7bcf2fa54d372d7e4a1748337021eeb5c12aa7e447cfff809ad666e371edd40a34233cc03f662db6d8094
+  metadata.gz: 671b7505922d68ace46ff3f90d8b025d55612b97764dbf8e31a96c8ecc3a27890c598a6e112c6150effdd9b941de1187effa92f73900244df0e4400660e94a27
+  data.tar.gz: 406145cda2859a5d230ea8f2894fb8870a85a89bd83b76a9b4b5a93ba1f3447198b54c19e1188fc3a6f6211f9de8f184886fa2b6fb693cbe79628944a01efcc0

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
@@ -110,44 +110,12 @@ module Harbr
         def to_s
           script_template = <<~SCRIPT
               #!/bin/sh
-              exec svlogd -tt /var/log/harbr/#{@container_name}/next/
+              exec svlogd -tt /var/log/harbr/#{@container_name}
           SCRIPT
         end
     
       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)
@@ -164,30 +132,35 @@ module Harbr
     end
 
     def perform(name,version)
+      
       Dir.chdir "/var/harbr/containers/#{name}/versions/#{version}" do
-      `bundle config set --local path 'vendor/bundle'`
-      manifest = load_manifest(name, version)
-      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}/finish", Runit::Finish.new(port).to_s
-      write_to_file "/etc/sv/harbr/#{name}/log/run", Runit::Next::Log.new(name).to_s
+        `bundle config set --local path 'vendor/bundle'`
+        manifest = load_manifest(name, version)
+        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`
 
-      `chmod +x /etc/sv/harbr/#{name}/run`
-      `chmod +x /etc/sv/harbr/#{name}/log/run`
-      `chmod +x /etc/sv/harbr/#{name}/finish`
+        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::Log.new(name).to_s
 
-      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}"
+        `chmod +x /etc/sv/harbr/#{name}/run`
+        `chmod +x /etc/sv/harbr/#{name}/log/run`
+        `chmod +x /etc/sv/harbr/#{name}/finish`
 
-      containers = collate_containers(name, manifest.host, port)
-      create_traefik_config(containers)
-      puts "process #{version} of #{name}"
+        system "ln -sf /var/harbr/containers/#{name}/versions/#{version} /var/harbr/containers/#{name}/current"
+        system "ln -sf /etc/sv/harbr/#{name}/current /etc/service/#{name}"
+
+        containers = collate_containers(name, manifest.host, port)
+        create_traefik_config(containers)
+        puts "process #{version} of #{name}"
       end
+
     end
 
   end

data/lib/harbr/version.rb

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

metadata

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