marathon_client 0.0.11 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2826c962535b90d6ff63a6a6af09057c4dbe3ba0
-  data.tar.gz: 283f90955e142fb3dfd0b5a45c5b8ae528a74b81
+  metadata.gz: 373a4dd26360c174192c911f7f5077ea9c1822a6
+  data.tar.gz: 73a66e779cb50071b726fa554e4fecf5708fe46d
 SHA512:
-  metadata.gz: a0d6a767036a503a0a9c32661263f2f23830d15d630d44a32c84344de5eedd5dd0d94b89f9c6abe81df36c1c002f8fed7b5befd4e27a5eedfd293cf15f748507
-  data.tar.gz: 2e4f10ea0ad84fcca7ab18892eb7e97f6cf896114b38eb1078ac1ef6640706be1d92a81555f0819bf9bebe486bdc6c2a916ac61f758dc38dba8cad8f42e75e67
+  metadata.gz: 4d07a14c8e6b562e84f4dfc83cf00b9eaa1c66b19d8fcdfc4dcd6398ae29cf131e9e577b95dfc46a09bbd14e95e07a7c75440dfd82a9b5e864d346237abf4efa
+  data.tar.gz: e6b8abd1120b3dd4e39be8b13dfc3cb1a77597eeba0fdcaa53febfc11b1ea0f1c64f25120d8fc1515c5b4a4562cb8075bc25d760a708981b583f3723f70919c4

data/bin/marathon

@@ -3,7 +3,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'marathon'))
 require 'trollop'
 
-SUB_COMMANDS = %w[start stop scale list]
+SUB_COMMANDS = %w[start stop scale list search]
 
 global_opts = Trollop.options do
   version Marathon::VERSION
@@ -16,6 +16,7 @@ Available commands:
   scale   Scale the number of app instances.
   stop    Stop an app and remove it from Marathon.
   list    Show a list of running apps and their options.
+  search  Search the current list of apps.
 
 Global options:
 EOS
@@ -49,6 +50,11 @@ cmd_opts = case cmd
     Trollop.options do
       opt :id, 'A unique identifier for the app.', :short => '-i', :type => String
     end
+  when 'search'
+    Trollop.options do
+      opt :id, 'A unique identifier for the app.', :short => '-i', :type => String, :default => nil
+      opt :command, 'The command for the app.', :short => '-C', :type => String, :default => nil
+    end
   else
     {}
   end
@@ -59,31 +65,7 @@ marathon = Marathon::Client.new(
   global_opts[:marathon_pass]
 )
 
-# Run
-case cmd
-when 'start'
-  app_opts = {
-    :instances => cmd_opts[:num_instances] || 1,
-    :uris => cmd_opts[:uri] || [],
-    :cmd => cmd_opts[:command],
-    :env => cmd_opts[:env].nil? ? {} : Hash[cmd_opts[:env].map { |e| e.split('=', 2) }],
-    :cpus => cmd_opts[:cpus] || 1.0,
-    :mem => cmd_opts[:mem] || 10.0,
-    :constraints => (cmd_opts[:constraint] || []).map { |c| c.split(':') }
-  }
-  puts "Starting app '#{cmd_opts[:id]}'"
-  res = marathon.start(cmd_opts[:id], app_opts)
-  puts res
-when 'scale'
-  puts "Scaling app '#{cmd_opts[:id]}' to #{cmd_opts[:num_instances]} instances"
-  res = marathon.scale(cmd_opts[:id], cmd_opts[:num_instances])
-  puts res
-when 'stop'
-  puts "Stopping app '#{cmd_opts[:id]}'"
-  res = marathon.stop(cmd_opts[:id])
-  puts res
-when 'list'
-  res = marathon.list
+def handle_listing(res)
   if res.success?
     res.parsed_response.each do |app|
       puts "App ID:     #{app['id']}"
@@ -109,6 +91,35 @@ when 'list'
   else
     puts res
   end
+end
+
+# Run
+case cmd
+when 'start'
+  app_opts = {
+    :instances => cmd_opts[:num_instances] || 1,
+    :uris => cmd_opts[:uri] || [],
+    :cmd => cmd_opts[:command],
+    :env => cmd_opts[:env].nil? ? {} : Hash[cmd_opts[:env].map { |e| e.split('=', 2) }],
+    :cpus => cmd_opts[:cpus] || 1.0,
+    :mem => cmd_opts[:mem] || 10.0,
+    :constraints => (cmd_opts[:constraint] || []).map { |c| c.split(':') }
+  }
+  puts "Starting app '#{cmd_opts[:id]}'"
+  res = marathon.start(cmd_opts[:id], app_opts)
+  puts res
+when 'scale'
+  puts "Scaling app '#{cmd_opts[:id]}' to #{cmd_opts[:num_instances]} instances"
+  res = marathon.scale(cmd_opts[:id], cmd_opts[:num_instances])
+  puts res
+when 'stop'
+  puts "Stopping app '#{cmd_opts[:id]}'"
+  res = marathon.stop(cmd_opts[:id])
+  puts res
+when 'list'
+  handle_listing(marathon.list)
+when 'search'
+  handle_listing(marathon.search(cmd_opts[:id], cmd_opts[:command]))
 else
   Trollop.die "unknown subcommand #{cmd.inspect}"
 end

data/lib/marathon/client.rb

@@ -1,3 +1,5 @@
+require 'uri'
+
 module Marathon
   class Client
     include HTTParty
@@ -24,6 +26,18 @@ module Marathon
       wrap_request(:get, '/v1/apps')
     end
 
+    def list_tasks(id)
+      wrap_request(:get, URI.escape("/v1/apps/#{id}/tasks"))
+    end
+
+    def search(id = nil, cmd = nil)
+      params = {}
+      params[:id] = id unless id.nil?
+      params[:cmd] = cmd unless cmd.nil?
+
+      wrap_request(:get, "/v1/apps/search?#{query_params(params)}")
+    end
+
     def endpoints(id = nil)
       if id.nil?
         wrap_request(:get, "/v1/endpoints")
@@ -48,6 +62,12 @@ module Marathon
       wrap_request(:post, '/v1/apps/stop', :body => body)
     end
 
+    def kill_tasks(appId, host = '*', scale = false)
+      body = {}
+      params = {:scale => scale, :host => host, :appId => appId}
+      wrap_request(:post, "/v1/tasks/kill?#{query_params(params)}", :body => body)
+    end
+
     private
 
     def wrap_request(method, url, options = {})
@@ -57,5 +77,9 @@ module Marathon
     rescue => e
       Marathon::Response.error(e.message)
     end
+
+    def query_params(hash)
+      URI.escape(hash.map { |k,v| "#{k}=#{v}" }.join('&'))
+    end
   end
 end

data/lib/marathon/version.rb

@@ -1,3 +1,3 @@
 module Marathon
-  VERSION = "0.0.11"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: marathon_client
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.2.0
 platform: ruby
 authors:
 - Tobi Knaup
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-21 00:00:00.000000000 Z
+date: 2013-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop