marathon-api 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cca83ebf910b41b549cd509b78dc7bd90d122d16
-  data.tar.gz: 6a38ec82298d05d1268359ec8e6aa952f3ba3ae9
+  metadata.gz: 28dcd2c0b47848c70211f598d165716ef96d7ef0
+  data.tar.gz: 5f31cb8385e8bd6fc9247c2b2fe2d7e5b3af0c76
 SHA512:
-  metadata.gz: 4bee9d73f899e086fb3135ed861ebfad0aa6963ec7403a63ce4ad1eab9c8d18fd60d35676e2b1b1d99b3fae1b78430db27d24e827dad575a210000198d74cae7
-  data.tar.gz: e80bbe801c925548ad41a970911d39d55777c11823ff6f961c4cb93b65e6c1198fdb34c1caa25b5a7d26770bc0549613721df3c270703656a8c5c14c1936e501
+  metadata.gz: 175e215bef8474613f07b62571cd1c5a9b205b478f96d874ccc604c3e223595f3b6ff34173b3ed14c7fc48a75b9ce46ec60881ff709c1787211fa0180b1a1447
+  data.tar.gz: fc39da688591bd66576a151bae89044676a325c0e21070bf486706ed5d4db0137f60805e20962382b98ecd39396c01f003c846cd3503414535401c6577dcb76d

data/README.md

@@ -78,7 +78,7 @@ require 'marathon'
 Marathon.info
 # => {"name"=>"marathon", "http_config"=>{"assets_path"=>null, "http_port"=>8080, "https_port"=>8443}, "frameworkId"=>"20150228-110436-16842879-5050-2169-0001", "leader"=>null, "event_subscriber"=>null, "marathon_config"=>{"local_port_max"=>20000, "local_port_min"=>10000, "hostname"=>"mesos", "master"=>"zk://localhost:2181/mesos", "reconciliation_interval"=>300000, "mesos_role"=>null, "task_launch_timeout"=>300000, "reconciliation_initial_delay"=>15000, "ha"=>true, "failover_timeout"=>604800, "checkpoint"=>true, "executor"=>"//cmd", "marathon_store_timeout"=>2000, "mesos_user"=>"root"}, "version"=>"0.8.0", "zookeeper_config"=>{"zk_path"=>"/marathon", "zk"=>null, "zk_timeout"=>10, "zk_hosts"=>"localhost:2181", "zk_future_timeout"=>{"duration"=>10}}, "elected"=>false}
 
-Docker.ping
+Marathon.ping
 # => 'pong'
 
 ```

data/bin/marathon

@@ -4,7 +4,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'maratho
 require 'trollop'
 require 'json'
 
-SUB_COMMANDS = %w[kill kill_tasks start scale list list_tasks search]
+SUB_COMMANDS = %w[kill kill_tasks start scale list list_tasks]
 ATTRIBUTES = [:id, :cmd, :executor, :instances, :cpus, :mem, :uris]
 DEFAULT_APP_OPTS = {
         :instances => 1,
@@ -18,6 +18,7 @@ def print_apps(apps)
     puts "No apps currently running"
   else
     apps.each do |app|
+      app.refresh
       puts app.to_pretty_s
       puts
     end
@@ -134,7 +135,6 @@ Available commands:
   list        Show a list of running apps and their options.
   list_tasks  Show a list of an app's running tasks.
   scale       Scale the number of app instances.
-  search      Search the current list of apps.
   start       Start a new app.
 
 Global options:

data/lib/marathon/deployment_info.rb

@@ -19,7 +19,7 @@ class Marathon::DeploymentInfo < Marathon::Base
     Timeout::timeout(timeout) do
       deployments = nil
       while deployments.nil? or deployments.select{|e| e.id == deploymentId}.size > 0 do
-        sleep(RECHECK_INTERVAL) unless deployments.nil?
+        sleep(RECHECK_INTERVAL)
         deployments = Marathon::Deployment.list
       end
     end

data/lib/marathon/version.rb

@@ -1,3 +1,3 @@
 module Marathon
-  VERSION = '1.2.2'
+  VERSION = '1.2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: marathon-api
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Felix Bechstein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-24 00:00:00.000000000 Z
+date: 2015-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json