harbr 0.0.78 → 0.0.80

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cfbe8ee63ba9673159a4cbe99bff5508886e603274bdfe7eca373e4fad1cf1d
-  data.tar.gz: 27e468bb49b774ecb556fa6553e9b2134a98a06c7e3bd3a312cb45c848ddfc5d
+  metadata.gz: faf169d8747490a5212c404ba4ae0ccf82009544bb5d0b6b0e888d425cba64a4
+  data.tar.gz: 35b2f2767321282d31d24bd37b6e6d811c235dde939eed1c50e4ae2fad8e3f98
 SHA512:
-  metadata.gz: 53e4d7f9397d59ecfd496c717b1fb983f29cd6b1c2a81ba9225cae566c8c1f09d8f99ab1e3c3bb5ed3c4897eee7f738f76a65b79b6b2216ad4d6fc1521c75783
-  data.tar.gz: 1dca696d45363ca0645f94b8b6813d9f8c6e1e3d4b86e734a8f585c0371cd86867c1e06dc0fb817bde2c3bc9fbe92b2cbd1c39c1d3480323d6f7fb9d8f65b3b3
+  metadata.gz: d61e0272279a4c362d282771e0b155022b47dc40ef514a760b51e4d5c90e1785891e02e806da5261c1845d411d5a5ab8abce4e2bf5af24ee6b7db6fc6aef8a3d
+  data.tar.gz: cedb23c1d39e632d24d4cfbeb377474a763b5bfdcc2d7430ee49c120c672fb70e6704d954f8bf724b506289f051fd3f30a842f887db326156f52712c083a1feb

data/exe/harbr

@@ -60,12 +60,12 @@ class HarbrCLI < Thor
         puts "Container '#{container}', Version '#{version}' is already placed."
       else
         puts "Placing container: '#{container}', Version: '#{version}'"
-        run_tasks(container, version)
+        run_jobs(container, version)
         File.open(PLACED_FILE, "a") { |file| file.puts("#{container}/#{version}") }
       end
     end
 
-    def run_tasks(container, version)
+    def run_jobs(container, version)
       puts "Running tasks for container: #{container}, version: #{version}"
       puts "waiting for 3 seconds"
       sleep 3
@@ -176,7 +176,7 @@ class HarbrCLI < Thor
 
     loop do
       current_state = scan_for_containers
-      new_versions = current_state.keys - last_known_state.keysß
+      new_versions = current_state.keys - last_known_state.keys
 
       new_versions.each do |container_version|
         container, version = container_version.split("/versions/")

data/lib/harbr/next/job.rb

@@ -12,7 +12,7 @@ module Harbr
         directories = Dir.glob("#{path}/*").select { |entry| File.directory?(entry) }
         directories.max_by { |entry| entry[/\d+/].to_i }
       end
-      
+
       def get_container_name(path)
         File.basename(path)
       end
@@ -182,51 +182,46 @@ module Harbr
         OpenStruct.new(manifest_data)
       end
 
-      def perform
+      def perform(name, version)
         `bundle config set --local path 'vendor/bundle'`
-        
-        Dir.glob('/var/harbr/containers/*').select { |f| File.directory? f }.each do |container_path|
-          latest_version = highest_numbered_directory("#{container_path}/versions")
+    
+        container_path = "/var/harbr/containers/#{name}/versions/#{version}"
+        latest_version = highest_numbered_directory("#{container_path}/versions")
           
-          version = get_container_name(latest_version)
-          name = get_container_name(container_path)
-          manifest = load_manifest(name,version)
-        
-          check_container_version(name, version) do
-        
-            current_path = "/var/harbr/containers/#{name}/versions/#{version}"
-        
-            port = `port assign next.#{manifest.port}`.strip
-        
-            Dir.chdir current_path do
-        
-              system "sv stop #{name}"
-              system "bundle install" 
-        
-              `mkdir -p /etc/sv/harbr/#{name}/next`
-              `mkdir -p /etc/sv/harbr/#{name}/next/log`
-              `mkdir -p /var/log/harbr/#{name}/next/log`
-        
-              write_to_file "/etc/sv/harbr/#{name}/next/run", Runit::Next::Run.new(name,port).to_s
-              write_to_file "/etc/sv/harbr/#{name}/next/finish", Runit::Finish.new(port).to_s
-              write_to_file "/etc/sv/harbr/#{name}/next/log/run", Runit::Next::Log.new(name).to_s
-              
-              `chmod +x /etc/sv/harbr/#{name}/next/run`
-              `chmod +x /etc/sv/harbr/#{name}/next/log/run`
-              `chmod +x /etc/sv/harbr/#{name}/next/finish`
-              
-              
-              system "ln -s /var/harbr/containers/#{name}/versions/#{version} /var/harbr/containers/#{name}/next"
-              system "ln -s /etc/sv/harbr/#{name}/next /etc/service/next.#{name}"
-        
-              containers = collate_containers("next.#{name}","next.#{manifest.host}",port)
-              create_traefik_config(containers)
-            end
-        
-            puts "process #{version} of #{name}" 
-          end
+        version = get_container_name(latest_version)
+        name = get_container_name(container_path)
+        manifest = load_manifest(name,version)
+        current_path = "/var/harbr/containers/#{name}/versions/#{version}"
+      
+        port = `port assign next.#{manifest.port}`.strip
+    
+        Dir.chdir current_path do
+    
+          system "sv stop #{name}"
+          system "bundle install" 
+    
+          `mkdir -p /etc/sv/harbr/#{name}/next`
+          `mkdir -p /etc/sv/harbr/#{name}/next/log`
+          `mkdir -p /var/log/harbr/#{name}/next/log`
+    
+          write_to_file "/etc/sv/harbr/#{name}/next/run", Runit::Next::Run.new(name,port).to_s
+          write_to_file "/etc/sv/harbr/#{name}/next/finish", Runit::Finish.new(port).to_s
+          write_to_file "/etc/sv/harbr/#{name}/next/log/run", Runit::Next::Log.new(name).to_s
+          
+          `chmod +x /etc/sv/harbr/#{name}/next/run`
+          `chmod +x /etc/sv/harbr/#{name}/next/log/run`
+          `chmod +x /etc/sv/harbr/#{name}/next/finish`
+          
+          
+          system "ln -s /var/harbr/containers/#{name}/versions/#{version} /var/harbr/containers/#{name}/next"
+          system "ln -s /etc/sv/harbr/#{name}/next /etc/service/next.#{name}"
+    
+          containers = collate_containers("next.#{name}","next.#{manifest.host}",port)
+          create_traefik_config(containers)
         end
-
+      
+        puts "process #{version} of #{name}"         
+        
       end
 
     end

data/lib/harbr/version.rb

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

metadata

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