panteras_api 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 864bf7c91dedd75b7472623ef2b101983e0b6d47
-  data.tar.gz: edabdfc6739a10e554fdc9af1b7f5bda129ea1ce
+  metadata.gz: 49553c927d9b2678f85f7b62c89b879a125e1b91
+  data.tar.gz: 33b7edfa7e0e25e8ab87a7808084ee60665506d1
 SHA512:
-  metadata.gz: 1d84d1d010ce1032e30262e40c5216415a756b1a142a005c18c552aea2285c6ada1f4b39de68e8bf18b4013eae3b237c10cca919580503c0495938f236af1f6c
-  data.tar.gz: 1af38e7b35769ed315f12283d748e19c14b1fb865d4280803c7738f032eebfe4f6d096e8cf4815000b0c7306e524caa522d1a925140e33d5325270142644ce7d
+  metadata.gz: 6e425e56e2add51a1c350190d268dd260086673197b484ccac6c97532db2f0241984a90923dc1c13fb47363cda5fc1a2cf1a39a24bfafce85703c181c3103e07
+  data.tar.gz: f8af45194c3e3312cd546a4f5adb7a735efe5abcb662046a7d66faa7b271b675c089f81e3e4cde3eeb793ce8efc2086ba86bfe2e737d9c02072837c6c7ab4109

data/License

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 eBay Classifieds Group
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.md

@@ -1,18 +1,21 @@
 # PanterasApi
 
-This is a program that checks services consistencies in a mesos/marathon/consul/docker PaaS infrastructure.
-
-It is intended for use together with the [Panteras](https://github.com/eBayClassifiedsGroup/PanteraS) project.
-
-**It will not work on other systems without tweaking the main program.**
+A convenient api for getting information from consul, mesos, marathon, and docker in the Panteras PaaS infrastructure.
+ex
 
 ## Installation
 
     $ gem install panteras_api
 
-## Usage
+## mesos_marathon_consistency_check (in Extras directory)
+
+This is a program that checks services consistencies in a mesos/marathon/consul/docker PaaS infrastructure.
+
+It is intended for use together with the [Panteras](https://github.com/eBayClassifiedsGroup/PanteraS) project.
+
+**It will not work on other systems without tweaking the main program.**
 
-	Usage: bin/panteras_api [options]
+	Usage: mesos_marathon_consistency_check [options]
     -m MESOS_MASTER_HOSTNAME,        Default: localhost
         --mesos-master-hostname
     -p MESOS_MASTER_PORT,            Default: 5050

data/lib/panteras_api/mesos_cluster.rb

@@ -10,6 +10,7 @@ class MesosCluster
   attr_reader :state
   
   def initialize(host, port=5050)
+    @protocol = "http:"
     @host = host
     @port = port
     @master_info = "/master/redirect"
@@ -18,11 +19,12 @@ class MesosCluster
   end
 
   def parse_state
-    redirect_response = get_response_with_redirect(@host, @master_info, @port)
-    
-    if redirect_response.is_a?(URI::HTTP)
+    response = get_response_with_redirect(@host, @master_info, @port).to_s
+    response = @protocol + response if !response.include?@protocol
+    redirect_response = response
+    if URI.parse(redirect_response).kind_of?(URI::HTTP)
       if ! valid_url(redirect_response.to_s)
-        raise StandardError, "Response from http://#{@host}:#{@port}#{@master_info} is not a 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)))
     end
@@ -77,4 +79,4 @@ class MesosCluster
     JSON.pretty_generate @state
   end
   
-end
+end

data/lib/panteras_api/version.rb

@@ -1,3 +1,3 @@
 module PanterasApi
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/panteras_api.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.8"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rspec"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: panteras_api
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Jonathan Colby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-02 00:00:00.000000000 Z
+date: 2015-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !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,
   and docker in the Panteras PaaS infrastructure.
 email:
@@ -50,6 +64,7 @@ files:
 - ".rspec"
 - ".travis.yml"
 - Gemfile
+- License
 - README.md
 - Rakefile
 - extra/mesos_consul_consistency_check
@@ -82,8 +97,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Ruby API library for Panteras PaaS platform.
 test_files: []
+has_rdoc: