nomade 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: '01428dbe6cc66511139a3e23eb6b7cbe73e13a2f'
-  data.tar.gz: 0dc34d653cfc6eea29047dd74d190cae23926905
+SHA256:
+  metadata.gz: 768219b7b7d377ec2de09fe3230cb34637841bd53aec49ef68a7ad01a97b57bf
+  data.tar.gz: 13cc5e6ffd82d49247e65092ac8270beae7e942374f87cc37de39240f126e0c7
 SHA512:
-  metadata.gz: 1a893f7d20cf72b23b8f6026e650e698dd7e0c44890fc07564c152a100d3a5d812b569a514706820583f22fdb93f1e5cda1544e4cf2d31b3386755d554f9a3c5
-  data.tar.gz: 44c819b4f3bbffb8312f3daba2c55f7cd63840063cabf94e7fe71a4e92b23e17476574975c87ddd73e6a2cd8c59e629d0e8e11c1460a069c2063a57e970dc557
+  metadata.gz: 326a7ea66c3182410714d671305f97cb9fcb2a8fc3b63545c5a814508cdfd559316d2d76b11e9e80247fb86821f6f5924b9454762e7d40000487e3daf154e23f
+  data.tar.gz: 5f72400e42707128c066a188d90ced7791fbe104af2ef00062e89d62f253d27dd5287500a8e9ee41daf6c44febfd220644c5d1fe445f74eb013c5a4f5fb1f4c1

data/lib/nomade/deployer.rb

@@ -12,6 +12,9 @@ module Nomade
 
       @timeout = opts.fetch(:timeout, 60 * 3)
 
+      @linger = opts.fetch(:linger, 8..28)
+      raise GeneralError.new("Linger needs to be a range, supplied with: #{@linger.class}") unless @linger.class == Range
+
       @hooks = {
         Nomade::Hooks::DEPLOY_RUNNING => [],
         Nomade::Hooks::DEPLOY_FINISHED => [],
@@ -21,20 +24,18 @@ module Nomade
         Nomade::Hooks::DISPATCH_FINISHED => [],
         Nomade::Hooks::DISPATCH_FAILED => [],
       }
-      add_hook(Nomade::Hooks::DEPLOY_FAILED, lambda {|hook_type, nomad_job, messages|
+      add_hook(Nomade::Hooks::DEPLOY_FAILED, lambda {|_hook_type, _nomad_job, messages|
         @logger.error "Failing deploy:"
         messages.each do |message|
           @logger.error "- #{message}"
         end
       })
-      add_hook(Nomade::Hooks::DISPATCH_FAILED, lambda {|hook_type, nomad_job, messages|
+      add_hook(Nomade::Hooks::DISPATCH_FAILED, lambda {|_hook_type, _nomad_job, messages|
         @logger.error "Failing dispatch:"
         messages.each do |message|
           @logger.error "- #{message}"
         end
       })
-
-      self
     end
 
     def init_job(template_file, image_full_name, template_variables = {})
@@ -155,6 +156,8 @@ module Nomade
     end
 
     def stop!(purge = false)
+      check_for_job_init
+
       @http.stop_job(@nomad_job, purge)
     end
 
@@ -183,7 +186,7 @@ module Nomade
       @logger.info "Checking cluster for connectivity and capacity.."
       plan_data = @http.plan_job(@nomad_job)
 
-      sum_of_changes = plan_data["Annotations"]["DesiredTGUpdates"].map { |group_name, task_group_updates|
+      sum_of_changes = plan_data["Annotations"]["DesiredTGUpdates"].map { |_group_name, task_group_updates|
         task_group_updates["Stop"] +
         task_group_updates["Place"] +
         task_group_updates["Migrate"] +
@@ -356,7 +359,7 @@ module Nomade
       end
 
       @logger.info "Checking cluster for connectivity and capacity.."
-      plan_data = @http.plan_job(@nomad_job)
+      _plan_data = @http.plan_job(@nomad_job)
 
       dispatch_job = @http.dispatch_job(@nomad_job, payload_data: payload_data, payload_metadata: payload_metadata)
       @evaluation_id = dispatch_job["EvalID"]
@@ -398,7 +401,6 @@ module Nomade
 
       announced_completed = []
       promoted = false
-      failed = false
       succesful_deployment = nil
       while(succesful_deployment == nil) do
         json = @http.deployment_request(@deployment_id)
@@ -408,9 +410,9 @@ module Nomade
 
           desired_canaries = task_data["DesiredCanaries"]
           desired_total = task_data["DesiredTotal"]
-          placed_allocations = task_data["PlacedAllocs"]
+          _placed_allocations = task_data["PlacedAllocs"]
           healthy_allocations = task_data["HealthyAllocs"]
-          unhealthy_allocations = task_data["UnhealthyAllocs"]
+          _unhealthy_allocations = task_data["UnhealthyAllocs"]
 
           if manual_work_required
             @logger.info "#{json["ID"]} #{task_name}: #{healthy_allocations}/#{desired_canaries}/#{desired_total} (Healthy/WantedCanaries/Total)"
@@ -435,7 +437,7 @@ module Nomade
 
           if succesful_deployment == nil && json["TaskGroups"].values.all?{|tg| tg["HealthyAllocs"] >= tg["DesiredCanaries"]}
             if !promoted
-              random_linger = rand(8..28)
+              random_linger = rand(@linger)
               @logger.info "Lingering around for #{random_linger} seconds before deployment.."
               sleep(random_linger)
 
@@ -504,7 +506,7 @@ module Nomade
 
         tasks           = get_tasks(allocations)
         upcoming_tasks  = get_upcoming_tasks(tasks)
-        succesful_tasks = get_succesful_tasks(tasks)
+        _succesful_tasks = get_succesful_tasks(tasks)
         failed_tasks    = get_failed_tasks(tasks)
 
         if upcoming_tasks.size == 0

data/lib/nomade/http.rb

@@ -90,7 +90,7 @@ module Nomade
         "DeploymentID" => deployment_id,
         "All" => true,
       }.to_json
-      res_body = _request(:post, "/v1/deployment/promote/#{deployment_id}", body: req_body)
+      _request(:post, "/v1/deployment/promote/#{deployment_id}", body: req_body)
 
       return true
     rescue StandardError => e
@@ -99,7 +99,7 @@ module Nomade
     end
 
     def fail_deployment(deployment_id)
-      res_body = _request(:post, "/v1/deployment/fail/#{deployment_id}")
+      _request(:post, "/v1/deployment/fail/#{deployment_id}")
       return true
     rescue StandardError => e
       Nomade.logger.fatal "HTTP Request failed (#{e.message})"
@@ -125,7 +125,7 @@ module Nomade
       end
 
       true
-    rescue Nomade::FailedTaskGroupPlan => e
+    rescue Nomade::FailedTaskGroupPlan
       raise
     rescue StandardError => e
       Nomade.logger.fatal "HTTP Request failed (#{e.message})"
@@ -162,7 +162,7 @@ module Nomade
       req_body = JSON.generate({
         "Payload": payload_data,
         "Meta": payload_metadata,
-      }.delete_if { |k, v| v.nil? })
+      }.delete_if { |_k, v| v.nil? })
 
       res_body = _request(:post, "/v1/job/#{nomad_job.job_name}/dispatch", body: req_body)
       JSON.parse(res_body)
@@ -197,6 +197,7 @@ module Nomade
       else
         raise "#{request_type} not supported"
       end
+
       req.add_field "Content-Type", "application/json"
       req.body = body if body
 
@@ -209,7 +210,7 @@ module Nomade
           sleep 1
           retry
         else
-          raise HttpConnectionError.new("#{e.class.to_s} - #{e.message}")
+          raise HttpConnectionError.new("#{e.class} - #{e.message}")
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nomade
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Kasper Grubbe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-06 00:00:00.000000000 Z
+date: 2020-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yell
@@ -114,8 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.4
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Gem that deploys nomad jobs