marathon_deploy 0.1.47 → 0.1.48

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmViZWY5NWM5N2YzM2E3ZTQ5MDgyMWRmNzNiMGFhY2EwYTQ1MjI0Yw==
+    OGJjNGVjMmZjN2M3MDU5ZTY4MWYxOWEyN2M3MDk2NGM2NDIyYjMzOQ==
   data.tar.gz: !binary |-
-    ZWY1YWVjMzcwNzJiN2I5YmRhZDZlYzM1OGRlMDFiZTEwNWU0YjAwMA==
+    NDliMzdkMWNiY2ZhZTk4ZTcwOTc2NjY3NTZiYzZiMWZkMTA3ZTQ5MA==
 SHA512:
   metadata.gz: !binary |-
-    NDJlYTJmZTczNWYxMmQxZTA3MTQ1YTkwYTJhOWFkN2UwODU2OThmZDNjOWI5
-    NGQwZjMyYTQ0M2M3YTVlNDAyZDRhMjRmOGJhNDZmMzhhNDM5OTA3YjI4NzM5
-    MGUyODQyNjc3OThmYWNhNmYyZWM0NGIyOTc0NzIxNDkxNDM4ZjE=
+    NGI2ZDY3ZDhiNGQ5MGYyM2U4ZGJkODc2MDhiN2MwMWI4YTkwMThhOGJkZmZm
+    NDNkYWEwZTEzZGMyODA2OWY4ZjA0MTIzNzkwOGJhYTdkZTNlMGMwZDY5NTgw
+    NTJkNzYwZmUwN2U0NmFlOTQzMjVmYjNmZTMwYTRhNTU4ZjRiMzA=
   data.tar.gz: !binary |-
-    MTFkZTNhZWQ2NWNhNWZiNzkyZDc3OWUyNWY1MzkxOGE5MDBmYjhjNDU3YWVm
-    MDA4YWMwYWYzNTZmZDM4YTgwYjI1M2QyMDI2YzdhOTM4YjNkMzQzMjEwMzRj
-    ZGIxMDMzYTAyZWE1ZTc5YzQ3OGVhYjYxMDRkODI5NDk5NTMzYjI=
+    N2YzNTlhZTA0YjhmMDc3ZmMyN2E0ODRjNDBkMzNmOTllMGVhYTYxZTk3NjAx
+    ODllZjk1OWQ5YzA3YWNmYzZjMGY0ZmZkYjM5OWIxMmY2ZmU5MzAyNzUzYzhl
+    NDUxYmJmYjE1YmUxODcyODdiYmIzOTRmYTk5YTQ0NTViMmVlM2U=

data/bin/marathon_deploy

@@ -21,6 +21,8 @@ options[:logfile] = MarathonDeploy::MarathonDefaults::DEFAULT_LOGFILE
 options[:force] = MarathonDeploy::MarathonDefaults::DEFAULT_FORCE_DEPLOY
 options[:noop] = MarathonDeploy::MarathonDefaults::DEFAULT_NOOP
 options[:remove_elements] = MarathonDeploy::MarathonDefaults::DEFAULT_REMOVE_ELEMENTS
+options[:marathon_username] = nil
+options[:marathon_password] = nil
   
   
 OptionParser.new do |opts|
@@ -30,6 +32,14 @@ OptionParser.new do |opts|
   opts.on("-u","--url MARATHON_URL(S)", Array, "Default: #{options[:marathon_endpoints]}") do |u|    
     options[:marathon_endpoints] = u  
   end
+
+  opts.on("-U","--username USERNAME", "Marathon authentication username") do |u|
+    options[:marathon_username] = u
+  end
+
+  opts.on("-p","--password PASSWORD", "Marathon authentication password") do |p|
+    options[:marathon_password] = p
+  end
     
   opts.on("-l", "--logfile LOGFILE", "Default: STDOUT") do |l|
     options[:logfile] = l  
@@ -90,6 +100,11 @@ else
   abort("No deploy file argument provided and default \'#{DEFAULT_DEPLOYFILE}\' does not exist in current directory \'#{Dir.pwd}\'")  
 end
 
+if options[:marathon_username] and options[:marathon_password]
+  MarathonDeploy::MarathonDefaults::marathon_username = options[:marathon_username]
+  MarathonDeploy::MarathonDefaults::marathon_password = options[:marathon_password]
+end
+
 $LOG = options[:logfile] ? Logger.new(options[:logfile]) : Logger.new(STDOUT)
 $LOG.level = options[:debug]
 

data/lib/marathon_deploy/http_util.rb

@@ -10,39 +10,41 @@ module MarathonDeploy
 @@og_timeout = 60.0
 @@rg_timeout = 60.0
 
-  def self.put(url,payload)
+  def self.req(method, url, payload=nil, errors_are_fatal=false)
     uri = construct_uri url 
     begin
       http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = uri.scheme == 'https'
       http.open_timeout = @@o_timeout
       http.read_timeout = @@r_timeout
-      req = Net::HTTP::Put.new(uri.request_uri)
-      req.body = payload.to_json
+      req = Net::HTTP.const_get(method).new(uri.request_uri)
+      if MarathonDeploy::MarathonDefaults::marathon_username and MarathonDeploy::MarathonDefaults::marathon_password
+        req.basic_auth(MarathonDeploy::MarathonDefaults::marathon_username, MarathonDeploy::MarathonDefaults::marathon_password)
+      end
+      if payload
+        req.body = payload.to_json
+      end
       req["Content-Type"] = "application/json"
       response = http.request(req)
     rescue Exception => e
-      $LOG.error("Error calling marathon api: #{e.message}")
-      exit!
+      if errors_are_fatal
+        $LOG.error("Error calling marathon api: #{e.message}")
+        exit!
+      else
+        message = "Error calling marathon api: #{e.message}"
+        $LOG.error(message)
+        raise Error::MarathonError, message, caller
+      end
     end
     return response
   end
+
+  def self.put(url,payload)
+    return self.req('Put', url, payload, true)
+  end
   
   def self.post(url, payload)
-    uri = construct_uri url 
-    begin
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.open_timeout = @@o_timeout
-      http.read_timeout = @@r_timeout
-      req = Net::HTTP::Post.new(uri.request_uri)
-      req.body = payload.to_json
-      req["Content-Type"] = "application/json"
-      response = http.request(req)
-    rescue Exception => e
-      message = "Error calling marathon api: #{e.message}"
-      $LOG.error(message)
-      raise Error::MarathonError, message, caller
-    end
-    return response
+    return self.req('Post', url, payload, false)
   end
   
   def self.construct_uri(url)
@@ -51,19 +53,7 @@ module MarathonDeploy
   end
   
   def self.delete(url)
-    uri = construct_uri url 
-       begin
-         http = Net::HTTP.new(uri.host, uri.port)
-         http.open_timeout = @@o_timeout
-         http.read_timeout = @@r_timeout
-         req = Net::HTTP::Delete.new(uri.request_uri)         
-         response = http.request(req)
-       rescue Exception => e
-         message = "Error calling marathon api: #{e.message}"
-         $LOG.error(message)
-         raise Error::MarathonError, message, caller
-       end
-       return response    
+    return self.req('Delete', url, nil, false)
   end
   
   def self.clean_url(url)
@@ -71,21 +61,7 @@ module MarathonDeploy
   end
   
   def self.get(url)
-    uri = construct_uri url
-    begin
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.open_timeout = @@og_timeout
-      http.read_timeout = @@rg_timeout
-#      http.set_debug_output($stdout)
-      req = Net::HTTP::Get.new(uri.request_uri)
-      req["Content-Type"] = "application/json"
-      response = http.request(req)
-    rescue Exception => e
-      message = "Error calling marathon api: #{e.message}"
-      $LOG.error(message)
-      raise Error::MarathonError, message, caller
-    end
-    return  response
+    return self.req('Get', url, nil, false)
   end
   
   def self.valid_url(url)

data/lib/marathon_deploy/marathon_defaults.rb

@@ -5,6 +5,10 @@ require 'logger'
 module MarathonDeploy
   module MarathonDefaults
  
+  class << self
+    attr_accessor :marathon_username, :marathon_password
+  end
+
   DEPLOYMENT_RECHECK_INTERVAL = 3
   DEPLOYMENT_TIMEOUT = 300
   HEALTHY_WAIT_TIMEOUT = 300
@@ -23,6 +27,8 @@ module MarathonDeploy
   DEFAULT_REMOVE_ELEMENTS = []
   DEFAULT_KEEP_ELEMENTS = [':id']
   ENVIRONMENT_VARIABLE_PREFIX = 'MARATHON_DEPLOY_'
+  marathon_username = nil
+  marathon_password = nil
 
   @@preproduction_override = {
     :instances => 5,

data/lib/marathon_deploy/version.rb

@@ -1,3 +1,3 @@
 module MarathonDeploy
-  VERSION = "0.1.47"
+  VERSION = "0.1.48"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: marathon_deploy
 version: !ruby/object:Gem::Version
-  version: 0.1.47
+  version: 0.1.48
 platform: ruby
 authors:
 - Jonathan Colby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-10 00:00:00.000000000 Z
+date: 2016-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger