harbr 0.1.47 → 0.1.49

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e30ca645f50357661159b9fa98d2399df44ec9ee226319e3e3b282dfaffc9257
-  data.tar.gz: 312660acc631c1abef17c966c52acc7fc386f990c86dabdfddaaf304348e0b14
+  metadata.gz: afa50fa2d13cb27fe66aac3529c34dca995c6793c47ffab0c0ad49f48b3afbed
+  data.tar.gz: 5b8c161f835b4d86479f2282376cd3cb04cd5fd7b8c9d4e99a6bdb27502a8dae
 SHA512:
-  metadata.gz: 8aad4ccb58ed38c42bdf5c9a6f9decd19721cd902f3fa6b24362e8148449c87aabd4a16b9352ef561ceab0b8f70b2ca53e4803908c494dbe5f33ebc47efee090
-  data.tar.gz: ed9cda3e02ecd191aac8df3a2fd883ad974ef6f9c8b91d3793507c2a965e44495b27c7d7e3da75ea7c4b9aa5de1d4a4c72043e7ccee4ecee80cddefa5d55e5d4
+  metadata.gz: 4b68f72d961341d55439471b40f2ef033565450f8762c0195cb9e2746e818956c9a2d5d4f3f0686277ea29bb7b14dfb3c54f43e03549bcc936cdfb4504ec150b
+  data.tar.gz: 78c8792d6b110d4617f468df52db82c09be14cb7c23eb0e8aebedc3d8b176e3e2b8679bd8e72486a156e581117b917455813203b72e0de2399803c56ef711d6d

data/lib/harbr/job.rb

@@ -58,12 +58,17 @@ module Harbr
       containers.all
     end
 
+
     def write_to_file(path, contents)
+      dirname = File.dirname(path)
+      FileUtils.mkdir_p(dirname) unless File.directory?(dirname)
+
       File.write(path, contents)
     end
 
-    def load_manifest(container, version)
-      manifest_path = "/var/harbr/containers/#{container}/versions/#{version}/config/manifest.yml"
+    def load_manifest(name, version)
+      manifest_path = "/var/harbr/containers/#{name}/versions/#{version}/config/manifest.yml"
+      check_file_exists(manifest_path)
       raise "Manifest not found at #{manifest_path}" unless File.exist?(manifest_path)
 
       manifest_data = YAML.load_file(manifest_path)
@@ -74,21 +79,21 @@ module Harbr
       Harbr.notifiable(name, version) do
         manifest = load_manifest(name, version)
         port = `port assign #{env}.#{manifest.port}`.strip
-
-        current_path = "/var/harbr/containers/#{name}/versions/#{version}"
-        check_dir_exists(current_path)
-
-        process_container(name, version, port, env, manifest)
+        process_container(name,version,port,env,manifest)
       end
     end
 
     private
 
-    def check_dir_exists(path)
+    def check_file_exists(path)
       sleep_times = [1, 3, 5, 8, 23]
       begin
         sleep_times.each do |time|
-          return if Dir.exist?(path)
+          puts "checking #{path}...."
+          if File.exist?(path)
+            puts "found #{path}"
+            return
+          end
           sleep(time)
         end
         raise "Directory not found: #{path}"
@@ -98,16 +103,25 @@ module Harbr
     end
 
     def process_container(name, version, port, env, manifest)
-      env_path = "/var/harbr/containers/#{name}/#{env}"
+
+      version_path = "/var/harbr/containers/#{name}/versions/#{version}"
+
       system "sv stop #{env}.#{name}" if env == "next"
+      system "sv stop #{name}" if env == "current"
+
+      bundle_install_if_needed(version_path)
 
-      bundle_install_if_needed(env_path)
       create_runit_scripts(name, port, env)
       link_directories(name, version, env)
       sync_live_data_if_next(name) if env == "next"
 
       containers = collate_containers("#{env}.#{name}", "#{env}.#{manifest.host}", port)
       create_traefik_config(containers)
+
+      system "sv start #{env}.#{name}" if env == "next"
+      system "sv start #{name}" if env == "current"
+
+
       puts "harbr: #{version} of #{name} in #{env} environment"
     end
 
@@ -126,12 +140,10 @@ module Harbr
       log_script = Runit::Script.new(name, port, env).log_script
 
       write_to_file "/etc/sv/harbr/#{name}/#{env}/run", run_script
-      write_to_file "/etc/sv/harbr/#{name}/#{env}/finish", finish_script
       write_to_file "/etc/sv/harbr/#{name}/#{env}/log/run", log_script
 
       `chmod +x /etc/sv/harbr/#{name}/#{env}/run`
       `chmod +x /etc/sv/harbr/#{name}/#{env}/log/run`
-      `chmod +x /etc/sv/harbr/#{name}/#{env}/finish`
     end
 
     def link_directories(name, version, env)

data/lib/harbr/version.rb

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

metadata

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