harbr 0.1.48 → 0.1.50

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 507b1d53c03bf202e0581f28729cd8c70f1bf056db633c4b4ae8936a11e56e27
-  data.tar.gz: 5f5721be0bd07e497acaa39bdfa94876e823afb6890bf72b380b3dc775074a09
+  metadata.gz: 2194f76f6826ebac55719cf284659c5df90236fc883e654a863465506233f6b1
+  data.tar.gz: 656cc2ccb446abf757b301ea6533a2b47c8f36e2fb31a0d9c97d35acefd4c063
 SHA512:
-  metadata.gz: 8c0462b23ef3c123873924192944516c161b257d7a4535ff1c928e35bd274bc442c84724e658a7a95b5ee6e078ef0eb8ee2749aa7e1bfde5ec54e8e5655e543e
-  data.tar.gz: d4664a31e5815845ae719e420b7672ec52725a2b8b931ca7f45de989aabc3d76742dffeea0c108613f7fbaf8555e30d278712456d3c15bd373fd2ee56d8d1195
+  metadata.gz: 06b2f41d6c688caf22f5c8b91dfadbc1d8116b6d12b99b117ed6069e6896cb9779938d3d5884fc5434433473ba446c0021c8868a85e14644a5e4c90ffa8ee71e
+  data.tar.gz: 44b75738862cec2529b340c83cc77b02ef05cc508365222e8d11d06057b7432e4c06e6cc39634f8e86f0c300f8422538efcf770cc433bf7c60bbbeeb38b1c85f

data/exe/harbr

@@ -83,13 +83,8 @@ class HarbrCLI < Thor
 
     def run_jobs(container, version)
       puts "Running tasks for container: #{container}, version: #{version}"
-      if version.to_i == 0
-        Harbr::Job.perform_async(container, version, "current")
-        puts "deploy current version #{version} of #{container}"
-      else
-        Harbr::Job.perform_async(container, version, "next")
-        puts "deploy next version #{version} of #{container}"
-      end
+      Harbr::Job.perform_async(container, version, "next")
+      puts "deploy next version #{version} of #{container}"
     end
 
     def create_traefik_config(containers)
@@ -192,17 +187,15 @@ class HarbrCLI < Thor
 
   desc "deploy", "deploy a container to production"
   def deploy(name)
+    
     Dir.chdir("/var/harbr/containers/#{name}/") do
-      /(?:. * -> (?:.*))/ =~ `ls -l /var/harbr/containers/#{name}/current`
-
-      `rm -r rollback`
-      `ln -sf #{$2} rollback`
-
       /(?:. * -> (?:.*))/ =~ `ls -l /var/harbr/containers/#{name}/next`
-      `rm -r current`
-      `ln -sf #{$2} current`
-      `sv restart #{name}`
+      version = $2      
     end
+        
+    Harbr::Job.perform_async(name, version, "current")
+    puts "deploy current version #{version} of #{container}"
+
   end
 
   desc "rollback", "rollback last deploy"

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)
@@ -72,23 +77,23 @@ module Harbr
 
     def perform(name, version, env)
       Harbr.notifiable(name, version) do
-        version_path = "/var/harbr/containers/#{name}/versions/#{version}"
-        check_dir_exists(version_path)
-
         manifest = load_manifest(name, version)
         port = `port assign #{env}.#{manifest.port}`.strip
-
-        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}"
@@ -112,6 +117,11 @@ module Harbr
 
       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
 
@@ -130,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.48"
+  VERSION = "0.1.50"
 end

metadata

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