panteras_api 0.0.12 → 0.0.13

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NWQ2MWNmY2JiZWI4MTQ5NjlkNmI1MDFlNmI2YWI3ZWUyNDY2Y2JjMQ==
-  data.tar.gz: !binary |-
-    ZmM1MTM0NmYzZDU4NDllNTI0MjUxZjQ5YmMxZjI3YTE0MGI5OGEzMw==
+SHA1:
+  metadata.gz: 04b2044a073ff5134787239d54c829a0401b5fa5
+  data.tar.gz: f5ca0869cdf4ed9e1e2bf151f14a17638d5ac802
 SHA512:
-  metadata.gz: !binary |-
-    N2ZkN2NhZDBjMDgwZjBhNTY0ZTU3MDdiY2JkYWMwM2RjNjVjODdmZmFiMTQy
-    OGM5Mjk5ZWZiMGU4ZTQyZjAwZTkwYjc4ZGQ4NDZkMDA0YjQ0ZDlhMDJkYTQ2
-    NTdkNjZjZmFkN2MwNmIxYmEwNjRmNTlmY2IyY2Y3NjNmMWQzMjA=
-  data.tar.gz: !binary |-
-    MjNiMWU2OWFmZTM5Y2NmYTBhOWMzYTI5YjE5YmEyOTJjNzdjNjkzZDlmMGVk
-    M2M5OWI4NjFiOGNmMjA5MWM5MjA0OTVjNzYyNmMyNGIwNDgxYWVjOTE1YmRl
-    YmM2YWM4Zjc2OTk2OTBkMDY0ZjQ4MTIzMDY0MWEwNWVlMGFhMWU=
+  metadata.gz: a78b15818d7a3813127fed991b1d6f0591c1f58606d878afa92ad0246c23d10458536d8e66d30dbc888b954eb9ea3fce4d3804d89da3d6513c7ad24b81450201
+  data.tar.gz: f53ca0840db6080f2a1aa0988bcc5f45e8997e47bc259d3014d3fe2d48160061cd32bfbd51503fc8f3a7da7c38e24e951f087e656a3e3bf77d8a80350d400c24

data/bin/mesos_consul_consistency_check

@@ -38,6 +38,14 @@ OptionParser.new("Usage: #{$0} [options]")  do |opts|
   opts.on("-f", "--fqdn FULLY_QUALIFIED_HOSTNAME", "Default: autodiscovery via gethostbyname") do |f|
     options[:fqdn] = f
   end
+
+  opts.on("-U", "--user MARATHON_USERNAME", "default: empty") do |user|
+    options[:marathon_username] = user
+  end
+
+  opts.on("-P", "--passwd MARATHON_PASSWORD", "default: empty") do |passwd|
+    options[:marathon_password] = passwd
+  end
   
   
 end.parse!
@@ -77,7 +85,7 @@ good_news << "#{mesos_tasks.size} mesos tasks running." if ! mesos_tasks.empty?
   
 
 ### MARATHON
-marathon = MarathonEndpoint.new(mesos.master_hostname)
+marathon = MarathonEndpoint.new(mesos.master_hostname, 8080, config[:marathon_username], config[:marathon_password])
 
 puts "#" * 75 if config[:debug]
 puts "* Marathon tasks on #{my_fqdn}:" if config[:debug]

data/lib/panteras_api/http_utils.rb

@@ -4,8 +4,11 @@ require 'uri'
 
 module HTTPUtils
 
-  def get_response_with_redirect(*args)
-     response = Net::HTTP.get_response(*args)
+  def get_response_with_redirect(host, request_uri, port, user='', passwd='')
+     http = Net::HTTP::new(host, port)
+     req = Net::HTTP.const_get('Get').new(request_uri)
+     req.basic_auth user,passwd
+     response = http.request(req)
      if response.is_a?(Net::HTTPRedirection)
        begin
        redirect_uri = URI.parse(response.header['location'])
@@ -16,7 +19,7 @@ module HTTPUtils
      end     
      response
   end
-  
+
   def to_j(response)
     if response.is_a? Net::HTTPResponse
       JSON.parse(response.body, :symbolize_names => true)
@@ -37,4 +40,4 @@ module HTTPUtils
     return URI.parse(url)
   end
   
-end
+end

data/lib/panteras_api/marathon_endpoint.rb

@@ -2,21 +2,24 @@ class MarathonEndpoint
   include HTTPUtils
   include Utils
 
-  def initialize(host, port=8080)
+  def initialize(host, port=8080, user='', passwd='')
     @host = host
     @port = port
+    @user = user
+    @passwd = passwd
   end
   
   def app(app_name)
     raise ArgumentError, "Argument be a String" unless (app_name.class == String )
-    to_j(get_response_with_redirect(@host, '/v2/apps/' + app_name, @port))[:app]
+    to_j(get_response_with_redirect(@host, '/v2/apps/' + app_name, @port, @user, @passwd))[:app]
   end
   
   def all_apps
-    to_j(get_response_with_redirect(@host, '/v2/apps/', @port))[:apps]
+    to_j(get_response_with_redirect(@host, '/v2/apps/', @port, @user, @passwd))[:apps]
   end
   
   def app_names
+    raise StandardError, "Empty response from marathon", caller if all_apps.nil?
     all_apps.collect { |a| a[:id][1..-1] }
   end
   

data/lib/panteras_api/mesos_cluster.rb

@@ -27,7 +27,8 @@ class MesosCluster
       if ! valid_url(redirect_response.to_s)
         raise StandardError, "Response from #{@protocol}//#{@host}:#{@port}#{@master_info} is not a valid url: #{redirect_response.to_s}"
       end      
-      return to_j(get_response_with_redirect(URI.join(redirect_response.to_s, @state_info)))
+      uri =  construct_uri redirect_response.to_s
+      return to_j(get_response_with_redirect(uri.host, @state_info, uri.port))
     end
   
   end

data/lib/panteras_api/version.rb

@@ -1,3 +1,3 @@
 module PanterasApi
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: panteras_api
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Jonathan Colby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-21 00:00:00.000000000 Z
+date: 2017-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,14 +42,14 @@ dependencies:
   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,
@@ -90,17 +90,17 @@ 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.0.14
 signing_key: 
 specification_version: 4
 summary: Ruby API library for Panteras PaaS platform.