marathon-api 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3921a3fe5bd4c9ad4c204cdc19817507e74bfd4
-  data.tar.gz: fa9a7edb2421055296268c1675a6a1af4a164e2d
+  metadata.gz: d8120f444ee6b770c56bbeee8147f12d5ed12592
+  data.tar.gz: 902fbb08a032d180c327829a9cba312990132bfb
 SHA512:
-  metadata.gz: 64b24ff2efea7b645643255e82da98d8fb28d73a69ac1f3a7034de3fcaca1960c9c354ee9faf877b145758637caaea975c5b7e3715cd06d67fbf0b4107fad8e0
-  data.tar.gz: b8f95656fe4c1dda9eddb51adea9ec0d7137dc437d9cc17aee50406a87c21e0bee0bd2e913c938080e0eb830a16917da3442288253154266b1c6d81503012258
+  metadata.gz: 0a7df8a3e78af7863a074fe83d8481fea105033a47d4e15de8aa74b112d40346503e78ab6cde0ff7264b0b6b9214a70bcc8e7a4a8e7ffee9827a674860101f25
+  data.tar.gz: 83ee36b57d5760db1c0fd5e963a2cea31daddb916c0206e8c1e72e5e96f290393617299538c2ddce98df6756299b27960080fbfe8e412fc45e6d7a1ceab46967

data/README.md

@@ -3,7 +3,7 @@ marathon-api
 
 [![Gem Version](https://badge.fury.io/rb/marathon-api.svg)](http://badge.fury.io/rb/marathon-api) [![travis-ci](https://travis-ci.org/otto-de/marathon-api.png?branch=master)](https://travis-ci.org/otto-de/marathon-api) [![Code Climate](https://codeclimate.com/github/otto-de/marathon-api/badges/gpa.svg)](https://codeclimate.com/github/otto-de/marathon-api) [![Test Coverage](https://codeclimate.com/github/otto-de/marathon-api/badges/coverage.svg)](https://codeclimate.com/github/otto-de/marathon-api)
 
-This gem provides an object oriented interface to the [Marathon Remote API][1]. At the time if this writing, marathon-api is meant to interface with Marathon version 0.8.1.
+This gem provides an object oriented interface to the [Marathon Remote API][1]. At the time if this writing, marathon-api is meant to interface with Marathon version 0.10.1.
 
 Installation
 ------------

data/bin/marathon

@@ -141,11 +141,13 @@ Global options:
 EOS
 
     opt :url, 'Marathon host (default http://localhost:8080, or MARATHON_URL)',
-      :short => '-M', :type => String
+      :short => '-M', :type => String, :default => Marathon.url
     opt :username, 'User name to authenticate against Marathon (optional, default unset, or MARATHON_USER).',
-      :short => '-U', :type => String
+      :short => '-U', :type => String, :default => Marathon.options[:username]
     opt :password, 'Password to authenticate against Marathon (optional, default unset, or MARATHON_PASSWORD).',
-      :short => '-P', :type => String
+      :short => '-P', :type => String, :default => Marathon.options[:password]
+    opt :insecure, 'Ignore certificate verification failure (optional, default false, or MARATHON_INSECURE).',
+      :short => '-I', :default => Marathon.options[:insecure]
     stop_on SUB_COMMANDS
   end
   return global_opts

data/lib/marathon.rb

@@ -2,6 +2,7 @@ require 'rubygems/package'
 require 'httparty'
 require 'json'
 require 'uri'
+require 'timeout'
 
 # The top-level module for this gem. It's purpose is to hold global
 # configuration variables that are used as defaults in other classes.
@@ -91,6 +92,7 @@ module Marathon
     opts = {}
     opts[:username] = ENV['MARATHON_USER'] if ENV['MARATHON_USER']
     opts[:password] = ENV['MARATHON_PASSWORD'] if ENV['MARATHON_PASSWORD']
+    opts[:insecure] = ENV['MARATHON_INSECURE'] == 'true' if ENV['MARATHON_INSECURE']
     opts
   end
 

data/lib/marathon/connection.rb

@@ -29,6 +29,13 @@ class Marathon::Connection
       @options.delete(:username)
       @options.delete(:password)
     end
+
+    # The insecure option allows ignoring bad (or self-signed) SSL
+    # certificates.
+    if @options[:insecure]
+      @options[:verify] = false
+      @options.delete(:insecure)
+    end
   end
 
   # Delegate all HTTP methods to the #request.

data/lib/marathon/deployment_info.rb

@@ -1,5 +1,3 @@
-require 'timeout'
-
 # This class represents a Marathon Deployment information.
 # It is returned by asynchronious deployment calls.
 class Marathon::DeploymentInfo < Marathon::Base

data/lib/marathon/version.rb

@@ -1,3 +1,3 @@
 module Marathon
-  VERSION = '1.3.0'
+  VERSION = '1.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: marathon-api
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Felix Bechstein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-24 00:00:00.000000000 Z
+date: 2015-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json