panteras_api 0.0.20 → 0.0.21

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NTBjNmMzMzIzZjZkYmRkNzMxYTI5Y2ZhN2RjNGZlZTBkM2UxNzc5OA==
-  data.tar.gz: !binary |-
-    N2QxNWI2NjUyMzEzMWU0NTFmYTRmZTExMTU2YTM1OWI3ZDYyMWNhYw==
+SHA1:
+  metadata.gz: 5a357bc5e7cd455c33e2bc535d8f6eaa4a2c13a6
+  data.tar.gz: 8e5987d563f1d0b333cfaeb836c51447aad31ceb
 SHA512:
-  metadata.gz: !binary |-
-    NzI1ZmY5NWI3NjFjM2VkODAzYmJlNjNkOTFhODUzOGRmMWZlZDhkNTRmMDJj
-    ZDhlM2VkNDBmNTY5ZGYxYTgzM2I4ZjU0ZWM2YmQ3OTU3OTBhMjk5YWZkMzk4
-    ZWQxZGJiYWYzNjZmYjM4MjU1MzJiYjExZDQyMzEwNTAzNDRmMGQ=
-  data.tar.gz: !binary |-
-    NzY3ZGE1ZmFjYWFlM2E4ZmU3MmViYmEwNjUxNTJlYzIxMGM5ZDc5Yjg4ZTE3
-    NzUxOGVmYjAzY2M0NjI4MWMxMjZlYzhkMzU3MzczNDMyZGM0YjFhYTVlYmZi
-    OGYwZDQxY2QxNmMwZTZiYzcyMGZkZTc2NGM4YjhhM2YzYWI3M2Q=
+  metadata.gz: 4131bf404c9e2ac9cf6e4c51d1978824c188375222228da82a2bdcbf6b30da7cb827a2cfc3dea1742aa2c632551dd47810fa3b6456e89d149d722e034023729c
+  data.tar.gz: 3dd7148c76f09119877b34264a03ac4d95cd5a930e1356bcd449a33d682059d334bb10c706f04d5b1f659c0718c65a85860099d087ed5b494a69ea4a47200c9f

data/bin/mesos_consul_consistency_check

@@ -15,6 +15,7 @@ config_default = {
 }
 
 options = {}
+excludes = []
 bad_news = []
 good_news = []
 
@@ -50,7 +51,7 @@ OptionParser.new("Usage: #{$0} [options]")  do |opts|
   end
 
   opts.on("-e", "--exclude RegExp_PATTERN", "default: empty") do |exclude|
-    options[:exclude] = exclude
+    excludes << exclude
   end
 
 
@@ -137,6 +138,10 @@ Timeout::timeout(timeout_in_seconds) do
   puts "* Consul registered mesos services for #{my_fqdn}:" if config[:debug]
   consul = ConsulCluster.new(mesos.master_hostname)
   consul_services = consul.my_service_ids.reject { |p| p =~ /panteras/ }.collect { |d| d }.compact.reject   { |i| i.empty? }
+  excludes.each { |exclude|
+    consul_services = consul_services.reject { |p| p =~ /#{exclude}/ }
+  }
+
   #puts consul.my_services.join("\n") if config[:debug]
   puts consul_services.sort if config[:debug]
   good_news << "#{consul_services.size} consul services running."
@@ -178,10 +183,11 @@ Timeout::timeout(timeout_in_seconds) do
   good_news << "#{docker_tasks.size} docker tasks running"
 
   ### Compare consul-registered tasks vs docker tasks
-  exclude = options[:exclude]
-  if ! exclude.nil?
+
+  excludes.each { |exclude|
     docker_inspect = docker_inspect.reject { |p| p[:mesos_task_id] =~ /#{exclude}/ }
-  end
+    docker_inspect = docker_inspect.reject { |p| p[:name] =~ /#{exclude}/ }
+  }
 
   docker_mesos_ids_no_panteras = docker_inspect.reject { |p| p[:name] =~ /panteras/ }.collect { |d| d[:name] if ! d[:chronos_job] }.compact.reject { |i| i.empty? }
   consul_not_docker = consul_services - docker_mesos_ids_no_panteras

data/lib/panteras_api/version.rb

@@ -1,3 +1,3 @@
 module PanterasApi
-  VERSION = "0.0.20"
+  VERSION = "0.0.21"
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: panteras_api
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.21
 platform: ruby
 authors:
 - Jonathan Colby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-09 00:00:00.000000000 Z
+date: 2019-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A convenient api for getting information from consul, mesos, marathon,
@@ -62,9 +62,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - License
 - README.md
@@ -90,18 +90,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Ruby API library for Panteras PaaS platform.
 test_files: []
+has_rdoc: