marathon_deploy 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d36ab0f56e7333a322797bde9b0be22f8bca0a49
-  data.tar.gz: b3d652b3ae236cba2d35e6df4a8f0b563a07a28c
+  metadata.gz: 0b3213c4005fdc4ffb221d60f443a949c60f1c0c
+  data.tar.gz: 30b2c173fa0ae0800f607314efdb0ad2b73b7dc1
 SHA512:
-  metadata.gz: 9a04bbbfcc103ef9d643a4c2a683f8e890e296f48de343bea492a1e72879552899d27fa608d36dde5ddf87c57e6b2408c338fd0db041d38fcb09488a5c9a2542
-  data.tar.gz: 4bac8e201eb7527a525e82d57aa6a20a7ed0f5a1c9952392ff8d8173dd2aad5b7e66a1a3982e3a59329b356ee130b79b5653edb554bf576d0749a7da3ab54600
+  metadata.gz: 05cf5e91997520dfae47244112b20042cb9aa108e1859bc07b567940ca0b612286eeedd1a49b5e38b44f4478382420016483ea30869735e6c26c4a585b6af69e
+  data.tar.gz: 924f980722aadb76eb761ebf827636a9453627172654b6bf102f99ebf57fdc2a81cd97592e43c57d2d4409539cce611f0f3c531c94d50020f768dd4511557739

data/TODO

@@ -4,8 +4,9 @@
 DONE datacenter handling, iterate
 DONE deployment status polling
 - config assembler / generate properties script ?
-- read in ENVIRONMENT VARIABLES WITH MARATHON_ and add to deployment json ?
+DESCOPED read in ENVIRONMENT VARIABLES WITH MARATHON_ and add to deployment json ?
 - inject / replce minimumHealthCapacity is 1, maximumOverCapacity is 1
 DESCOPED custom external ports (must be provided in json)
-- read macros %NAME% from yaml/json and verify they are defined
-- gem structure / packaging / metadata
+DONE read macros %NAME% from yaml/json and verify they are defined
+DONE gem structure / packaging / metadata
+DONE implement noop

data/bin/deploy.rb

@@ -12,11 +12,13 @@ require 'logger'
 options = {}
   
 # DEFAULTS
-options[:deployfile] = MarathonDeploy::MarathonDefaults::DEFAULT_DEPLOYFILE
+DEFAULT_DEPLOYFILE = MarathonDeploy::MarathonDefaults::DEFAULT_DEPLOYFILE
 options[:debug] = MarathonDeploy::MarathonDefaults::DEFAULT_LOGLEVEL
 options[:environment] = MarathonDeploy::MarathonDefaults::DEFAULT_ENVIRONMENT_NAME
 options[:marathon_endpoints] = MarathonDeploy::MarathonDefaults::DEFAULT_PREPRODUCTION_MARATHON_ENDPOINTS
 options[:logfile] = MarathonDeploy::MarathonDefaults::DEFAULT_LOGFILE
+options[:force] = MarathonDeploy::MarathonDefaults::DEFAULT_FORCE_DEPLOY
+options[:noop] = MarathonDeploy::MarathonDefaults::DEFAULT_NOOP
   
 OptionParser.new do |opts|
   opts.banner = "Usage: #{$0} [options]"
@@ -39,10 +41,15 @@ OptionParser.new do |opts|
     exit
   end
   
-  opts.on("-f", "--file DEPLOYFILE" ,"Deploy file with json or yaml file extension. Default: #{options[:deployfile]}") do |f|
-    options[:deployfile] = f
+  opts.on("-f", "--force", "Force deployment when sending same deploy JSON to Marathon") do |f|
+    options[:force] = true
   end
   
+  opts.on("-n", "--noop", "No action. Just display what would be performed.") do |f|
+    options[:noop] = true
+  end
+  
+  
   opts.on("-e", "--environment ENVIRONMENT", "Default: #{options[:environment]}" ) do |e|
     options[:environment] = e
   end
@@ -51,14 +58,28 @@ OptionParser.new do |opts|
     puts opts
     exit
   end 
+  
 end.parse!
 
+abort("Ambiguous arguments: #{ARGV.join(',')}. Only one deploy file argument may be passed.") if (ARGV.length > 1)
+
+argfile = ARGV.pop
+
+if (!argfile.nil?)
+  abort("Deploy file \'#{argfile}\' does not exist!") unless(File.file?(argfile))
+  deployfile = argfile
+elsif (File.file?(DEFAULT_DEPLOYFILE))
+  deployfile = DEFAULT_DEPLOYFILE
+else
+  abort("No deploy file argument provided and default \'#{DEFAULT_DEPLOYFILE}\' does not exist in current directory \'#{Dir.pwd}\'")  
+end
+
 $LOG = options[:logfile] ? Logger.new(options[:logfile]) : Logger.new(STDOUT)
 $LOG.level = options[:debug]
 
-deployfile = options[:deployfile]
+noop = options[:noop]  
 environment = MarathonDeploy::Environment.new(options[:environment])
-  
+    
 marathon_endpoints = Array.new
 if (options[:marathon_endpoints].nil?)
   if (environment.is_production?)
@@ -71,11 +92,15 @@ else
 end
  
 begin
-  application = MarathonDeploy::Application.new(deployfile)
+  application = MarathonDeploy::Application.new(:deployfile => deployfile, :force => options[:force])
 rescue MarathonDeploy::Error::IOError, MarathonDeploy::Error::UndefinedMacroError,MarathonDeploy::Error::MissingMarathonAttributesError,MarathonDeploy::Error::UnsupportedFileExtension  => e
   $LOG.debug(e)
   $LOG.error(e.message)
   exit!
+rescue JSON::ParserError => e
+  $LOG.debug(e)
+  $LOG.error("\'#{deployfile}\' seems to be invalid JSON. Please verify the file.")
+  exit!
 end
 
 begin
@@ -89,13 +114,16 @@ if (!environment.is_production?)
   application.overlay_preproduction_settings
 end
 
-puts "#" * 100
+display_msg = " MARATHON JSON DEPLOYMENT INSTRUCTIONS "
+puts '#' * 50 + display_msg + '#' * 50
 puts JSON.pretty_generate(application.json)
-puts "#" * 100
+puts "#" * (100 + display_msg.length)
 
-# deploy to each endpoint
+# deploy to each marathon endpoint
 marathon_endpoints.each do |marathon_url|
   begin
+    puts "[NOOP] Sending JSON deployment instructions to marathon endpoint: #{marathon_url}." if (noop)
+    next if (noop)
     client = MarathonDeploy::MarathonClient.new(marathon_url)
     client.application = application
     client.deploy  
@@ -111,3 +139,5 @@ marathon_endpoints.each do |marathon_url|
   end
 
 end
+
+puts "[NOOP] Deployment completed." if (noop)

data/examples/jondeploy2.yaml

@@ -14,7 +14,7 @@ env:
   SERVICE_8009_TAGS: ajp
   ANOTHER_MACRO_TEST: %%SPECIAL_PROPERTY%%
 id: content-webapp
-instances: 6
+instances: 1
 mem: 32
 uris: []
 healthChecks:

data/lib/marathon_deploy/application.rb

@@ -10,10 +10,16 @@ module MarathonDeploy
   attr_reader :json, :id
   attr_accessor :envs
   
-  def initialize(deployfile)
+  def initialize(options={})
+    default_options = {
+      :force => false,
+      :deployfile => 'deploy.yaml'
+      }
+    options = default_options.merge!(options)
+    deployfile = options[:deployfile]
     
     if (!File.exist?(File.join(Dir.pwd,deployfile)))
-      message = "#{deployfile} not found in current directory #{File.join(Dir.pwd)}"
+      message = "\'#{deployfile}\' not found in current directory #{File.join(Dir.pwd)}"
       raise Error::IOError, message, caller
     end
 
@@ -43,8 +49,9 @@ module MarathonDeploy
     end
      
     @deployfile = deployfile                
-    @json =  Utils.deep_symbolize(@json)    
-    add_identifier
+    @json =  Utils.deep_symbolize(@json)  
+      
+    add_identifier if (options[:force])
    
   end
   

data/lib/marathon_deploy/marathon_client.rb

@@ -48,7 +48,7 @@ module MarathonDeploy
     else     
       response = deployment.create_app
     end
-    
+
     if ((300..999).include?(response.code.to_i))
       $LOG.error("Deployment response body => " + JSON.pretty_generate(JSON.parse(response.body)))
       raise Error::DeploymentError, "Deployment returned response code #{response.code}", caller

data/lib/marathon_deploy/marathon_defaults.rb

@@ -18,6 +18,8 @@ module MarathonDeploy
   DEFAULT_LOGLEVEL = Logger::INFO
   MARATHON_APPS_REST_PATH = '/v2/apps/'
   MARATHON_DEPLOYMENT_REST_PATH = '/v2/deployments/'
+  DEFAULT_FORCE_DEPLOY = false
+  DEFAULT_NOOP = false
 
   @@preproduction_override = {
     :instances => 5,

data/lib/marathon_deploy/version.rb

@@ -1,3 +1,3 @@
 module MarathonDeploy
-  VERSION = "0.0.5"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: marathon_deploy
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - Jonathan Colby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-22 00:00:00.000000000 Z
+date: 2015-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger
@@ -130,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Mesos/Marathon deployment tool.