marathon_client 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6764ad6e988acf5e3744c22312b145a8dd3b268a
-  data.tar.gz: fbe55345264c3fdf746d1230d3736d973c1ab548
+  metadata.gz: 6c9e596d1d9a22eed7059f0abcb32e19a5f09bf3
+  data.tar.gz: f454fed66fad61cc4aa9c3a20564c014ca2c3e75
 SHA512:
-  metadata.gz: cd9f91dd8cf433da91477b328a7537540b58dbc8e4ba73d39f7d204ac80156a671f9a7073fb365b1a757570f61bee7526ac9e2a943d6fed9c721643021d6acc6
-  data.tar.gz: db9f41bc1a3dd5a661e11208284460787e74136beae7ab4adaa53b690e564a13ae476a5e0b5625a9df9f729627a0590b1ecd01b5a9fc9cd903842720305043f3
+  metadata.gz: aaee3ee5f3221bddcce683faf3f4aee1afbc1946c7f149160d15661a29394eb9d35eb337c432026a3852bda70edc313df4de94f473ca1eac7dbf4e39565e84b6
+  data.tar.gz: 9e0aaf7370257182cf9062f94b650a4490d4da57d88c45738d92dd1e580d636a1d44cd539d6e70c80083ec1c0fdd01da20a840303d79e73fae4c6119e72afa76

data/bin/marathon

@@ -1,99 +1,109 @@
 #!/usr/bin/env ruby
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'marathon'))
-require 'slop'
-
-
-opts = Slop.parse(:help => true) do
-  on :v, 'Print the version' do
-    puts "Version #{Marathon::VERSION}"
-  end
-
-
-  command 'start' do
-    description 'Start a new app.'
-
-    on :H=, :marathon_host=, 'Marathon host (default http://localhost:8080, or MARATHON_HOST)'
-    on :i=, :id=, 'A unique identifier for the app.'
-    on :C=, :command=, 'The command to start the app.'
-    on :n=, :num_instances=, 'The number of instances to run (default 1).', :as => Integer
-    on :c=, :cpus=, 'The number of CPUs to give to this app, can be a fraction (default 1.0).', :as => Float
-    on :m=, :mem=, 'The memory limit for this app, in MB, can be a fraction (default 10.0).', :as => Float
-    on :u=, :uri=, 'URIs to download and unpack into the working directory.', :as => Array
-    on :e=, :env=, 'Environment variables to add to the process, as NAME=VALUE.', :as => Array
-
-    run do |opts, args|
-      app_opts = {
-        :instances => opts[:num_instances] || 1,
-        :uris => opts[:uri] || [],
-        :cmd => opts[:command],
-        :env => opts[:env].nil? ? {} : Hash[opts[:env].map { |e| e.split('=', 2) }],
-        :cpus => opts[:cpus] || 1.0,
-        :mem => opts[:mem] || 10.0
-      }
-
-      puts "Starting app '#{opts[:id]}'"
-      res = Marathon::Client.new(opts[:marathon_host]).start(opts[:id], app_opts)
-      puts res
+require 'trollop'
+
+SUB_COMMANDS = %w[start stop scale list]
+
+global_opts = Trollop.options do
+  version Marathon::VERSION
+  banner <<-EOS
+Usage: marathon [command] [options]
+
+Available commands:
+
+  start   Start a new app.
+  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.
+
+Global options:
+EOS
+
+  opt :marathon_host, 'Marathon host (default http://localhost:8080, or MARATHON_HOST)', :short => '-H', :type => String
+  opt :marathon_user, 'User name to authenticate against Marathon (optional).', :short => '-U', :type => String
+  opt :marathon_pass, 'Password to authenticate against Marathon (optional).', :short => '-P', :type => String
+  stop_on SUB_COMMANDS
+end
+
+cmd = ARGV.shift # get the subcommand
+
+cmd_opts = case cmd
+  when 'start'
+    Trollop.options do
+      opt :id, 'A unique identifier for the app.', :short => '-i', :type => String
+      opt :command, 'The command to start the app.', :short => '-C', :type => String
+      opt :num_instances, 'The number of instances to run (default 1).', :short => '-n', :type => Integer
+      opt :cpus, 'The number of CPUs to give to this app, can be a fraction (default 1.0).', :short => '-c', :type => Float
+      opt :mem, 'The memory limit for this app, in MB, can be a fraction (default 10.0).', :short => '-m', :type => Float
+      opt :uri, 'URIs to download and unpack into the working directory.', :short => '-u', :type => Array
+      opt :env, 'Environment variables to add to the process, as NAME=VALUE.', :short => '-e', :type => Array
     end
-  end
-
-  command 'scale' do
-    description 'Scale the number of app instances.'
-
-    on :H=, :marathon_host=, 'Marathon host (default http://localhost:8080, or MARATHON_HOST)'
-    on :i=, :id=, 'A unique identifier for the app.'
-    on :n=, :num_instances=, 'The number of instances to run.', :as => Integer
-
-    run do |opts, args|
-      puts "Scaling app '#{opts[:id]}' to #{opts[:num_instances]} instances"
-      res = Marathon::Client.new(opts[:marathon_host]).scale(opts[:id], opts[:num_instances])
-      puts res
+  when 'scale'
+    Trollop.options do
+      opt :id, 'A unique identifier for the app.', :short => '-i', :type => String
+      opt :num_instances, 'The number of instances to run (default 1).', :short => '-n', :type => Integer
     end
-  end
-
-  command 'stop' do
-    description 'Stop an app and remove it from Marathon.'
-
-    on :H=, :marathon_host=, 'Marathon host (default http://localhost:8080, or MARATHON_HOST)'
-    on :i=, :id=, 'A unique identifier for the app.'
-
-    run do |opts, args|
-      puts "Stopping app '#{opts[:id]}'"
-      res = Marathon::Client.new(opts[:marathon_host]).stop(opts[:id])
-      puts res
+  when 'stop'
+    Trollop.options do
+      opt :id, 'A unique identifier for the app.', :short => '-i', :type => String
     end
+  else
+    {}
   end
 
-  command 'list' do
-    description 'Show a list of running apps and their options.'
-
-    on :H=, :marathon_host=, 'Marathon host (default http://localhost:8080, or MARATHON_HOST)'
-
-    run do |opts, args|
-      res = Marathon::Client.new(opts[:marathon_host]).list
-      if res.success?
-        res.parsed_response.each do |app|
-          puts "App ID:    #{app['id']}"
-          puts "Command:   #{app['cmd']}"
-          puts "Instances: #{app['instances']}"
-          puts "CPUs:      #{app['cpus']}"
-          puts "Memory:    #{app['mem']} MB"
-          app['uris'].each do |uri|
-            puts "URI:       #{uri}"
-          end
-          app['env'].each do |k, v|
-            puts "ENV:       #{k}=#{v}"
-          end
-          puts
-        end
-
-        if res.parsed_response.empty?
-          puts "No apps are currently running"
-        end
-      else
-        puts res
+marathon = Marathon::Client.new(
+  global_opts[:marathon_host],
+  global_opts[:marathon_user],
+  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
+  }
+  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
+  if res.success?
+    res.parsed_response.each do |app|
+      puts "App ID:    #{app['id']}"
+      puts "Command:   #{app['cmd']}"
+      puts "Instances: #{app['instances']}"
+      puts "CPUs:      #{app['cpus']}"
+      puts "Memory:    #{app['mem']} MB"
+      app['uris'].each do |uri|
+        puts "URI:       #{uri}"
+      end
+      app['env'].each do |k, v|
+        puts "ENV:       #{k}=#{v}"
       end
+      puts
+    end
+
+    if res.parsed_response.empty?
+      puts "No apps are currently running"
     end
+  else
+    puts res
   end
-end
+else
+  Trollop.die "unknown subcommand #{cmd.inspect}"
+end

data/lib/marathon/client.rb

@@ -8,8 +8,13 @@ module Marathon
     default_timeout 5
 
 
-    def initialize(host = nil)
+    def initialize(host = nil, user = nil, pass = nil)
       @host = host || ENV['MARATHON_HOST'] || 'http://localhost:8080'
+      @default_options = {}
+
+      if user && pass
+        @default_options[:basic_auth] = {:username => user, :password => pass}
+      end
     end
 
     def list
@@ -35,11 +40,11 @@ module Marathon
     private
 
     def wrap_request(method, url, options = {})
+      options = @default_options.merge(options)
       http = self.class.send(method, @host + url, options)
       Marathon::Response.new(http)
     rescue => e
       Marathon::Response.error(e.message)
     end
-
   end
 end

data/lib/marathon/version.rb

@@ -1,3 +1,3 @@
 module Marathon
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/marathon_client.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "slop", "~> 3.4.5"
+  spec.add_dependency "trollop", "~> 2.0"
   spec.add_dependency "httparty", "~> 0.11.0"
 
   spec.add_development_dependency "bundler", "~> 1.3"

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: marathon_client
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Tobi Knaup
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-19 00:00:00.000000000 Z
+date: 2013-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: slop
+  name: trollop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.4.5
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.4.5
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement