haile 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 621dd9bed5314f84e53e84a1a034d2ee7a3f5883
-  data.tar.gz: d215682f47b347ed7c05badf06656d98c7846a4d
+  metadata.gz: 34e96756dc75b2ef9a5c9b9e543774571ed8e5fb
+  data.tar.gz: b379a6c252dda1fead8179c923ae10733294ef70
 SHA512:
-  metadata.gz: 91f6d330486939e5da6272e33d840de4415c7a43d69de16bf20687b1dd2f4b17735a81c7588b193a9896e119cc7df10f88035b619c491c00bd84b44cd6f0787d
-  data.tar.gz: 774672fdaa5ef6bbf9b9957dc53ab34fdd45e2e9cf278908de90c88b3978d741c700fdf0c869ae560797564a01df2179b7b5ac4a01ae7c6583750f973db040bd
+  metadata.gz: c82ef99476bf387e6d77804ef41880c38151cd73344ddb9b9705ca48f0df883e534f57907b731ede634b593705cc1666aca80bda5f5d7a1a2eb8528699be6502
+  data.tar.gz: 65018902d2629d32fd3afd2a5f56c031dc3303be18121c4ca6ecbf663370903c5bf37099f0954ad5d3aa97fee38165aabe80cba78cca92bb777f9f2929c60d62

data/bin/haile

@@ -1,29 +1,30 @@
 #!/usr/bin/env ruby
 
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'marathon'))
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'haile'))
 require 'trollop'
 
-SUB_COMMANDS = %w[endpoints kill kill_tasks start scale list list_tasks search]
+SUB_COMMANDS = %w[endpoints kill kill_tasks start scale list list_tasks search docker_deploy]
 
 global_opts = Trollop.options do
-  version Marathon::VERSION
+  version Haile::VERSION
   banner <<-EOS
-Usage: marathon [global options] [command] [options]
+Usage: haile [global options] [command] [options]
 
 Available commands:
 
-  kill        Kill an app and remove it from Marathon.
-  kill_tasks  Kill a task or tasks belonging to a specified app.
-  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.
+  kill           Kill an app and remove it from Marathon.
+  kill_tasks     Kill a task or tasks belonging to a specified app.
+  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.
+  docker_deploy  Update the docker image tag of an app.
 
 Global options:
 EOS
 
-  opt :marathon_host, 'Marathon host (default http://localhost:8080, or MARATHON_HOST)', :short => '-H', :type => String
+  opt :marathon_url, 'Marathon URL (default http://localhost:8080, or MARATHON_URL)', :short => '-R', :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
@@ -73,12 +74,17 @@ cmd_opts = case cmd
       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
+  when 'docker_deploy'
+    Trollop.options do
+      opt :id, 'A unique identifier for the app.', :required => true, :short => '-i', :type => String
+      opt :docker_image, 'The docker image:tag to update to.', :required => true, :short => '-d', :type => String
+    end
   else
     {}
   end
 
-marathon = Marathon::Client.new(
-  global_opts[:marathon_host],
+haile = Haile::Client.new(
+  global_opts[:marathon_url],
   global_opts[:marathon_user],
   global_opts[:marathon_pass]
 )
@@ -117,7 +123,7 @@ end
 # Run
 case cmd
 when 'endpoints'
-  puts marathon.endpoints(cmd_opts[:id]).parsed_response
+  puts haile.endpoints(cmd_opts[:id]).parsed_response
 when 'start'
   app_opts = {
     :instances => cmd_opts[:num_instances] || 1,
@@ -130,27 +136,31 @@ when 'start'
   }
   app_opts[:executor] = cmd_opts[:executor] unless cmd_opts[:executor] == nil
   puts "Starting app '#{cmd_opts[:id]}'"
-  puts marathon.start(cmd_opts[:id], app_opts)
+  puts haile.start(cmd_opts[:id], app_opts)
 when 'scale'
   puts "Scaling app '#{cmd_opts[:id]}' to #{cmd_opts[:num_instances]} instances"
-  res = marathon.scale(cmd_opts[:id], cmd_opts[:num_instances])
+  res = haile.scale(cmd_opts[:id], cmd_opts[:num_instances])
+  puts res
+when 'docker_deploy'
+  puts "Deploying app '#{cmd_opts[:id]}' to #{cmd_opts[:docker_image]}"
+  res = haile.docker_deploy(cmd_opts[:id], cmd_opts[:docker_image])
   puts res
 when 'kill'
   puts "Killing app '#{cmd_opts[:id]}'"
-  puts marathon.kill(cmd_opts[:id])
+  puts haile.kill(cmd_opts[:id])
 when 'kill_tasks'
   KILL_TASKS_KEYS = [:host, :scale, :task_id]
 
   opts = cmd_opts.clone
   opts.select! {|k, v| KILL_TASKS_KEYS.include?(k)}
 
-  puts marathon.kill_tasks(cmd_opts[:id], opts).parsed_response
+  puts haile.kill_tasks(cmd_opts[:id], opts).parsed_response
 when 'list'
-  handle_listing(marathon.list)
+  handle_listing(haile.list)
 when 'list_tasks'
-  puts marathon.list_tasks(cmd_opts[:id]).parsed_response
+  puts haile.list_tasks(cmd_opts[:id]).parsed_response
 when 'search'
-  handle_listing(marathon.search(cmd_opts[:id], cmd_opts[:command]))
+  handle_listing(haile.search(cmd_opts[:id], cmd_opts[:command]))
 else
   Trollop.die "unknown subcommand #{cmd.inspect}"
 end

data/lib/haile/client.rb

@@ -13,9 +13,9 @@ module Haile
     maintain_method_across_redirects
     default_timeout 5
 
-    EDITABLE_APP_ATTRIBUTES = [
-      :cmd, :constraints, :container, :cpus, :env, :executor, :id, :instances,
-      :mem, :ports, :uris]
+    EDITABLE_APP_ATTRIBUTES = %w(
+      cmd constraints container cpus env executor id instances mem ports uris
+    )
 
     def initialize(url = nil, user = nil, pass = nil, proxy = nil)
       @host = url || ENV['MARATHON_URL'] || 'http://localhost:8080'
@@ -65,6 +65,25 @@ module Haile
       wrap_request(:post, '/v2/apps/', :body => body)
     end
 
+    def docker_deploy(id, image)
+      # Fetch current state and update only the 'container['docker']['image']'
+      # attribute. Since the API only supports PUT, the full representation
+      # of the app must be supplied to update even just a single attribute.
+
+      app = wrap_request(:get, "/v2/apps/#{id}").parsed_response['app']
+      app.select! {|k, v| EDITABLE_APP_ATTRIBUTES.include?(k)}
+
+      begin
+        app['container']['docker']['image'] = image
+      rescue
+        msg = "App doesn't have a docker image configured. Make sure " \
+              "the ID is correct and that this app is already configured " \
+              "with a docker image."
+        return Haile::Response.error(msg)
+      end
+      wrap_request(:put, "/v2/apps/#{id}", :body => app)
+    end
+
     def scale(id, num_instances)
       # Fetch current state and update only the 'instances' attribute. Since the
       # API only supports PUT, the full representation of the app must be
@@ -72,7 +91,7 @@ module Haile
       app = wrap_request(:get, "/v2/apps/#{id}").parsed_response['app']
       app.select! {|k, v| EDITABLE_APP_ATTRIBUTES.include?(k)}
 
-      app[:instances] = num_instances
+      app['instances'] = num_instances
       wrap_request(:put, "/v2/apps/#{id}", :body => app)
     end
 
@@ -96,10 +115,16 @@ module Haile
 
     def wrap_request(method, url, options = {})
       options = @default_options.merge(options)
-      http = self.class.send(method, @host + url, options)
-      Marathon::Response.new(http)
+      if method == :get
+        puts "GET"
+        http = self.class.send(method, @host + url, options)
+        return Haile::Response.new(http)
+      else
+        puts "#{method} #{@host + url} #{options}"
+        return
+      end
     rescue => e
-      Marathon::Response.error(e.message)
+      Haile::Response.error(e.message)
     end
 
     def query_params(hash)

data/lib/haile/version.rb

@@ -1,3 +1,3 @@
 module Haile
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haile
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Tobi Knaup