marathon-srv 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: add5bc98456ab69ebd95077ba33bbfd748d22c99
-  data.tar.gz: 4326753358f3aaee821b4db2d010f90f6eada376
+  metadata.gz: f715198df145818dbb69e69744f6a1afdf4f56d4
+  data.tar.gz: 33040bfa1df9d3590454b0d7c19debebca393959
 SHA512:
-  metadata.gz: ef71d6e4d737c3c25b56e65ddbb35dc3dc323261cefcd13a10bbae0b1e3c84010ccf7a8ccf83c6df48add0e581556c316068605ba24cec82c61590b6344a285b
-  data.tar.gz: ad49ec501bd2f6d99c3b82db3d02cd9f7c6f6d024b78b10982d6681f99345037a6779b7a198d6177282b3196df7910e19aefc34ca51b20572556c53423900cc9
+  metadata.gz: 459686d8421eef8b2fc03312d8008c3bfe7e52bcef720c622f028f3593f34507fb51b98ad455955f0e3db7ed90ca81634f85366e7406c4bd07d3bbe53d5bc131
+  data.tar.gz: 52f66d636cdc2294e95ec5321207f2aa63a35fef81f1cc2ceea5597013ef685cbe6f692fe13c0541c7b6835596a0f026180678f2b07ea54262926ce0be2894d4

data/README.md

@@ -41,8 +41,6 @@ tl;dr poor man's port/service discovery for BRIDGEd Docker Containerized Maratho
     client = Marathon::Srv::Client.new "http://marathon.domain.tld:8080", "username", "password", {:log_level => Logger::DEBUG}
     client.get_bridged_port_array "best-redis-cluster", true # 2nd parameter : consider healthy tasks only
     
-( n.b.: The Client object returns all BRIDGEd ports, the CLI filters these down to only --container-port )
-
 ## Notes
 
 ### Tests

data/lib/marathon/srv/cli.rb

@@ -28,20 +28,6 @@ module Marathon
         begin
           hosts = client.get_bridged_port_array options[:app_id], (options[:healthy] ? true : falses)
           
-          
-          hosts.reject! do |host| 
-            
-            host[:services].reject! do |protocol, services|
-          
-              services.reject! {|port, host_port| port.to_s != options[:container_port]}
-              services.size == 0
-                        
-            end
-            
-            host[:services].size == 0
-            
-          end
-          
           if options[:json]
             puts JSON hosts
           else

data/lib/marathon/srv/client.rb

@@ -35,9 +35,9 @@ module Marathon
         
       end
       
-      def get_bridged_port_array(application_id, healthy_tasks_only=false)
+      def get_bridged_port_array(application_id, healthy_tasks_only=false, filter_ports=[])
         
-        @logger.debug "Attempting to fetch application #{application_id} object from API, healthy_tasks_only: #{healthy_tasks_only} "
+        @logger.debug "Attempting to fetch application #{application_id} object from API, healthy_tasks_only: #{healthy_tasks_only}, interested in container ports #{filter_ports} "
   
         api = URI::join(marathon_api, PATH_FIND_APP % application_id)
         Net::HTTP.new(api.host, api.port).start do |http|
@@ -74,17 +74,24 @@ module Marathon
                   
                 end
                 @logger.debug "All health checks passing - filtering ports for task #{task}"
-                ports.push filter_ports(app, task) if passing
+                ports.push filter_ports(app, task, filter_ports) if passing
                 
               else
                 # just add task
                 @logger.debug "Ignoring health checks - filtering ports for task #{task}"
-                ports.push filter_ports(app, task)
+                ports.push filter_ports(app, task, filter_ports)
                 
               end
               
             end
             
+            ports.reject! do |host| 
+            
+              host[:services].reject! {|protocol, services| services.size == 0 }
+              host[:services].size == 0
+            
+            end
+            
             @logger.debug "Collected ports #{ports}"
             ports
   
@@ -99,11 +106,13 @@ module Marathon
       end
   
       protected
-      def filter_ports(app, task)
+      def filter_ports(app, task, filter_ports=[])
         port = {:host => task["host"], :services => {}}
         app["container"]["docker"]["portMappings"].each_with_index do |port_mapping, port_i|
-          port[:services][port_mapping["protocol"]] = {} unless port[:services].has_key? port_mapping["protocol"]
-          port[:services][port_mapping["protocol"]][port_mapping["containerPort"]] = task["ports"][port_i]
+          if (filter_ports.size == 0 || (filter_ports.member? port_mapping["containerPort"]))
+            port[:services][port_mapping["protocol"]] = {} unless port[:services].has_key? port_mapping["protocol"]
+            port[:services][port_mapping["protocol"]][port_mapping["containerPort"]] = task["ports"][port_i]
+          end
           
         end
         

data/lib/marathon/srv/version.rb

@@ -1,5 +1,5 @@
 module Marathon
   module Srv
-    VERSION = "0.1.1"
+    VERSION = "0.2.0"
   end
 end

data/marathon-srv.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
 
   spec.summary       = %q{A simple CLI/library to resolve (BRIDGE networked) ports of Docker containerized Marathon application tasks/instances to Mesos slave host names and host ports}
-  spec.description   = %q{Uses the Marathon API to match one or more ports set up under BRIDGE Docker networking for a Marathon application (grouped or not) to slave ip/s and slave (host) port/s}
+  spec.description   = %q{Uses the Marathon API to match one or more ports set up under BRIDGE Docker networking for a Marathon application to Mesos slave ip/s and host port/s}
   spec.homepage      = "https://github.com/andlaz/marathon-srv"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = '~> 2.2'
   spec.add_dependency "thor", "~> 0.19.1"
   spec.add_dependency "json", "~> 1.8.3"
   spec.add_development_dependency "bundler", "~> 1.11"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: marathon-srv
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Andras Szerdahelyi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-28 00:00:00.000000000 Z
+date: 2016-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -109,8 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.22.6
 description: Uses the Marathon API to match one or more ports set up under BRIDGE
-  Docker networking for a Marathon application (grouped or not) to slave ip/s and
-  slave (host) port/s
+  Docker networking for a Marathon application to Mesos slave ip/s and host port/s
 email:
 - andras.szerdahelyi@gmail.com
 executables:
@@ -145,9 +144,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="