centurion 1.5.1 → 1.6.0

data/README.md

@@ -156,11 +156,15 @@ IP address (the equivalent of `docker run --dns 172.17.42.1 ...`) like this:
 ### Container Names
 
 This is the name that shows up in the `docker ps` output. It's the name
-of the container, not the hostname inside the container.
+of the container, not the hostname inside the container. By default
+the container will be named using the name of the project as the base
+of the name.
+
+If you want to name your container something other than the project name,
+use the `name` setting. The actual name for the created container will
+have a random hex string appended, to avoid name conflicts when you repeatedly
+deploy a project:
 
-If you want to name your container, use the `name` setting. The
-actual name for the created container will have a random hex string
-appended, to avoid name conflicts when you repeatedly deploy an image:
 ```ruby
   task :common do
     set :name, 'backend'
@@ -194,7 +198,7 @@ For example, to limit the memory to 1G, and the cpu time slice to half the
 normal length, include the following:
 
 ```ruby
-memory 1024000000
+memory 1.gigabyte
 cpu_shares 512
 ```
 
@@ -203,29 +207,31 @@ docs](https://docs.docker.com/reference/run/#runtime-constraints-on-cpu-and-memo
 
 ### Interpolation
 
-Currently there is one special string for interpolation that can be added to
-any `env_var` value in the DSL. `%DOCKER_HOSTNAME%` will be replaced with the
-current server's hostname in the environment variable at deployment time.
+Currently there a couple of special strings for interpolation that can be added
+to any `env_var` value in the DSL. `%DOCKER_HOSTNAME%` will be replaced with
+the current server's hostname in the environment variable at deployment time.
+Also `%DOCKER_HOST_IP%` will be replaced with the *public* IP address of the
+Docker server using a `getaddrinfo` call on the client.
 
 ### Use TLS certificate
 
-Centurion can use your certificate in order to execute the Docker commands.
-In order to do so you have 2 choices.
+Centurion can use your existing Docker TLS certificates when using Docker with
+TLS support. In doing so you have 2 choices.
 
-#### Your certificate files are in ~/.docker/
+#### Your certificate files are in `~/.docker/`
 
 You just need to enable the tls mode as the following:
 
 ```ruby
   task :production => :common do
-    set :tls, true
+    set :tlsverify, true
     # ...
   end
 ```
 
 Centurion will only set the `--tlsverify` to true and Docker will read your certificate from the `~/.docker/` path.
 
-#### Your certificate files are not in ~/.docker/
+#### Your certificate files are not in `~/.docker/`
 
 Given your files are in `/usr/local/certs/`
 You have to set the following keys:
@@ -251,7 +257,7 @@ A rolling deployment will stop and start each container one at a time to make
 sure that the application stays available from the viewpoint of the load
 balancer. As the deploy runs, a health check will hit each container to ensure
 that the application booted correctly. By default, this will be a GET request to
-the root path of the application. This is configurable by adding
+the root path of the application. The healthcheck endpoint is configurable by adding
 `set(:status_endpoint, '/somewhere/else')` in your config. The status endpoint
 must respond with a valid response in the 200 status range.
 
@@ -259,6 +265,38 @@ must respond with a valid response in the 200 status range.
 $ bundle exec centurion -p radio-radio -e staging -a rolling_deploy
 ````
 
+**Custom Health Check**:
+You can use a custom health check by specifying a callable object (anything that
+responds to :call), e.g. a Proc, lambda, or method. This method will be invoked with
+the host url, the port that needs to be checked, and the specified endpoint(via
+`set(:status_endpoint, '/somewhere/else')`). If the port is ready, health check
+should return a truthy value, falsey otherwise. Here's an example of a custom
+health check that verifies that an elasticsearch node is up and has joined the
+cluster.
+
+````ruby
+def cluster_green?(target_server, port, endpoint)
+  response = begin
+    Excon.get("http://#{target_server.hostname}:#{port}#{endpoint}")
+  rescue Excon::Errors::SocketError
+    warn "Elasticsearch node not yet up"
+    nil
+  end
+
+  return false unless response
+  !JSON.parse(response)['timed_out']
+end
+
+task :production => :common do
+  set_current_environment(:production)
+  set :status_endpoint, "/_cluster/health?wait_for_status=green&wait_for_nodes=2"
+  health_check method(:cluster_green?)
+  host_port 9200, container_port: 9200
+  host 'es-01.example.com'
+  host 'es-02.example.com'
+end
+````
+
 **Rolling Deployment Settings**:
 You can change the following settings in your config to tune how the rolling
 deployment behaves. Each of these is controlled with `set(:var_name, 'value')`.
@@ -277,16 +315,17 @@ are the same everywhere. Settings are per-project.
    an individual container to come up before giving up as a failure. Defaults
    to 24 attempts.
  * `rolling_deploy_skip_ports` => Either a single port, or an array of ports
-   that should be skipped for status checks. Status checking assumes an HTTP 
-   server is on the other end and if you are deploying a container where some 
+   that should be skipped for status checks. By default status checking assumes 
+   an HTTP server is on the other end and if you are deploying a container where some 
    ports are not HTTP services, this allows you to only health check the ports 
-   that are. The default is an empty array.
+   that are. The default is an empty array. If you have non-HTTP services that you
+   want to check, see Custom Health Checks in the previous section.
 
 ###Deploy a project to a fleet of Docker servers
 
 This will hard stop, then start containers on all the specified hosts. This
 is not recommended for apps where one endpoint needs to be available at all
-times.
+times. It is fast.
 
 ````bash
 $ bundle exec centurion -p radio-radio -e staging -a deploy
@@ -340,7 +379,7 @@ private), or [Dogestry](https://github.com/dogestry/dogestry).
 
 If you are not using either Dogestry, or the public registry, you may need to
 provide authentication credentials.  Centurion needs to access the Docker
-registry hosting your images directly to retrive image ids and tags.This is
+registry hosting your images directly to retrive image ids and tags. This is
 supported in both the config file and also as command line arguments.
 
 The command line arguments are: 
@@ -365,6 +404,8 @@ Dogestry uses the Docker daemon's import/export functionality in combination
 with Amazon S3 to provide reliable hosting of images.  Setting Centurion up to
 use Dogestry is pretty trivial:
 
+ 1. Create an S3 bucket and download the credentials to let you access the
+    bucket. Generally these are IAM user keys.
  1. Install Dogestry binaries on the client from which Dogestry is run.
     Binaries are provided in the [GitHub release](https://github.com/dogestry/dogestry).
  1. Add the settings necessary to get Centurion to pull from Dogestry. A config
@@ -407,8 +448,6 @@ We're currently looking at the following feature additions:
 
  * [etcd](https://github.com/coreos/etcd) integration for configs and discovery
  * Add the ability to show all the available tasks on the command line
- * Customized tasks
- * Dynamic host allocation to a pool of servers
 
 Contributions
 -------------

data/bin/centurion

@@ -76,4 +76,5 @@ set :no_pull, opts[:no_pull_given]
 set :registry_user, opts[:registry_user] if opts[:registry_user]
 set :registry_password, opts[:registry_password] if opts[:registry_password]
 
+invoke('centurion:setup')
 invoke(opts[:action])

data/lib/centurion.rb

@@ -1,3 +1,7 @@
+Dir[File.join(File.dirname(__FILE__), 'core_ext', '*')].each do |file|
+  require file
+end
+
 Dir[File.join(File.dirname(__FILE__), 'centurion', '*')].each do |file|
   require file
 end

data/lib/centurion/deploy.rb

@@ -1,4 +1,5 @@
 require 'excon'
+require 'socket'
 
 module Centurion; end
 
@@ -18,10 +19,10 @@ module Centurion::Deploy
     end
   end
 
-  def wait_for_http_status_ok(target_server, port, endpoint, image_id, tag, sleep_time=5, retries=12)
+  def wait_for_health_check_ok(health_check_method, target_server, port, endpoint, image_id, tag, sleep_time=5, retries=12)
     info 'Waiting for the port to come up'
     1.upto(retries) do
-      if container_up?(target_server, port) && http_status_ok?(target_server, port, endpoint)
+      if container_up?(target_server, port) && health_check_method.call(target_server, port, endpoint)
         info 'Container is up!'
         break
       end
@@ -30,7 +31,7 @@ module Centurion::Deploy
       sleep(sleep_time)
     end
 
-    unless http_status_ok?(target_server, port, endpoint)
+    unless health_check_method.call(target_server, port, endpoint)
       error "Failed to validate started container on #{target_server}:#{port}"
       exit(FAILED_CONTAINER_VALIDATION)
     end
@@ -130,7 +131,7 @@ module Centurion::Deploy
 
     if env_vars
       container_config['Env'] = env_vars.map do |k,v|
-        "#{k}=#{v.gsub('%DOCKER_HOSTNAME%', target_server.hostname)}"
+        "#{k}=#{interpolate_var(v, target_server)}"
       end
     end
 
@@ -206,4 +207,16 @@ module Centurion::Deploy
 
     new_container
   end
+
+  def interpolate_var(val, target_server)
+    val.gsub('%DOCKER_HOSTNAME%', target_server.hostname)
+      .gsub('%DOCKER_HOST_IP%', host_ip(target_server.hostname))
+  end
+
+  def host_ip(hostname)
+    @host_ip ||= {}
+    return @host_ip[hostname] if @host_ip.has_key?(hostname)
+    @host_ip[hostname] = Socket.getaddrinfo(hostname, nil).first[2]
+  end
+
 end

data/lib/centurion/deploy_dsl.rb

@@ -80,6 +80,11 @@ module Centurion::DeployDSL
     set(:registry, type.to_s)
   end
 
+  def health_check(method)
+   abort("Health check expects a callable (lambda, proc, method), but #{method.class} was specified")  unless method.respond_to?(:call)
+   set(:health_check, method)
+  end
+
   private
 
   def build_server_group

data/lib/centurion/docker_via_api.rb

@@ -7,7 +7,7 @@ module Centurion; end
 
 class Centurion::DockerViaApi
   def initialize(hostname, port, tls_args = {})
-    @tls_args = tls_args # Required by tls_enable?
+    @tls_args = default_tls_args(tls_args[:tls]).merge(tls_args.reject { |k, v| v.nil? }) # Required by tls_enable?
     @base_uri = "http#{'s' if tls_enable?}://#{hostname}:#{port}"
 
     configure_excon_globally
@@ -142,4 +142,16 @@ class Centurion::DockerViaApi
     Excon.defaults[:tcp_nodelay]     = true
     Excon.defaults[:ssl_ca_file]     = @tls_args[:tlscacert]
   end
+
+  def default_tls_args(tls_enabled)
+    if tls_enabled
+      {
+          tlscacert: File.expand_path('~/.docker/ca.pem'),
+          tlscert: File.expand_path('~/.docker/cert.pem'),
+          tlskey: File.expand_path('~/.docker/key.pem')
+      }
+    else
+      {}
+    end
+  end
 end

data/lib/centurion/docker_via_cli.rb

@@ -1,5 +1,6 @@
 require 'pty'
 require_relative 'logging'
+require_relative 'shell'
 
 module Centurion; end
 
@@ -14,16 +15,16 @@ class Centurion::DockerViaCli
 
   def pull(image, tag='latest')
     info 'Using CLI to pull'
-    echo(build_command(:pull, "#{image}:#{tag}"))
+    Centurion::Shell.echo(build_command(:pull, "#{image}:#{tag}"))
   end
 
   def tail(container_id)
     info "Tailing the logs on #{container_id}"
-    echo(build_command(:logs, container_id))
+    Centurion::Shell.echo(build_command(:logs, container_id))
   end
 
   def attach(container_id)
-    echo(build_command(:attach, container_id))
+    Centurion::Shell.echo(build_command(:attach, container_id))
   end
 
   private
@@ -37,7 +38,7 @@ class Centurion::DockerViaCli
   end
 
   def tls_parameters
-    return '' if @tls_args.nil? || @tls_args == {}
+    return '' if @tls_args.nil? || @tls_args.empty?
 
     tls_flags = ''
 

data/lib/centurion/dogestry.rb

@@ -1,4 +1,5 @@
 require_relative 'logging'
+require_relative 'shell'
 require 'fileutils'
 
 module Centurion; end
@@ -72,7 +73,6 @@ class Centurion::Dogestry
     hosts = pull_hosts.join(",")
     flags = "-pullhosts #{hosts}"
 
-    echo(exec_command('pull', repo, flags))
+    Centurion::Shell.echo(exec_command('pull', repo, flags))
   end
-
 end

data/lib/centurion/logging.rb

@@ -20,49 +20,6 @@ module Centurion::Logging
     log.debug args.join(' ')
   end
 
-  def echo(command)
-    if Thread.list.find_all { |t| t.status == 'run' }.count > 1
-      run_without_echo(command)
-    else
-      run_with_echo(command)
-    end
-  end
-
-  def run_without_echo(command)
-    output = Queue.new
-    output_thread = Thread.new do
-      while true do
-        begin
-          puts output.pop
-        rescue => e
-          info "Rescuing... #{e.message}"
-        end
-      end
-    end
-
-    IO.popen(command) do |io|
-      io.each_line { |line| output << line }
-    end
-
-    output_thread.kill
-    validate_status(command)
-  end
-
-  def run_with_echo(command)
-    $stdout.sync = true
-    $stderr.sync = true
-    IO.popen(command) do |io|
-      io.each_char { |char| print char }
-    end
-    validate_status(command)
-  end
-
-  def validate_status(command)
-    unless $?.success?
-      raise "The command failed with a non-zero exit status: #{$?.exitstatus}. Command: '#{command}'"
-    end
-  end
-
   private
 
   def log(*args)

data/lib/centurion/shell.rb

@@ -0,0 +1,46 @@
+module Centurion; end
+
+module Centurion::Shell
+  def self.echo(command)
+    if Thread.list.find_all { |t| t.status == 'run' }.count > 1
+      run_without_echo(command)
+    else
+      run_with_echo(command)
+    end
+  end
+
+  def self.run_without_echo(command)
+    output = Queue.new
+    output_thread = Thread.new do
+      while true do
+        begin
+          puts output.pop
+        rescue => e
+          info "Rescuing... #{e.message}"
+        end
+      end
+    end
+
+    IO.popen(command) do |io|
+      io.each_line { |line| output << line }
+    end
+
+    output_thread.kill
+    validate_status(command)
+  end
+
+  def self.run_with_echo(command)
+    $stdout.sync = true
+    $stderr.sync = true
+    IO.popen(command) do |io|
+      io.each_char { |char| print char }
+    end
+    validate_status(command)
+  end
+
+  def self.validate_status(command)
+    unless $?.success?
+      raise "The command failed with a non-zero exit status: #{$?.exitstatus}. Command: '#{command}'"
+    end
+  end
+end

data/lib/centurion/version.rb

@@ -1,3 +1,3 @@
 module Centurion
-  VERSION = '1.5.1'
+  VERSION = '1.6.0'
 end

data/lib/core_ext/numeric_bytes.rb

@@ -0,0 +1,92 @@
+# Copied from ActiveSupport 4.2.1 lib/active_support/core_ext/numeric/bytes.rb
+#
+# NOTE that THIS LICENSE ONLY APPLIES TO THIS FILE itself, not
+# to the rest of the project.
+#
+# ORIGINAL ACTIVE SUPPORT LICENSE FOLLOWS:
+#
+# Copyright (c) 2005-2015 David Heinemeier Hansson
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+class Numeric
+  KILOBYTE = 1024
+  MEGABYTE = KILOBYTE * 1024
+  GIGABYTE = MEGABYTE * 1024
+  TERABYTE = GIGABYTE * 1024
+  PETABYTE = TERABYTE * 1024
+  EXABYTE  = PETABYTE * 1024
+
+  # Enables the use of byte calculations and declarations, like 45.bytes + 2.6.megabytes
+  #
+  #   2.bytes # => 2
+  def bytes
+    self
+  end
+  alias :byte :bytes
+
+  # Returns the number of bytes equivalent to the kilobytes provided.
+  #
+  #   2.kilobytes # => 2048
+  def kilobytes
+    self * KILOBYTE
+  end
+  alias :kilobyte :kilobytes
+
+  # Returns the number of bytes equivalent to the megabytes provided.
+  #
+  #   2.megabytes # => 2_097_152
+  def megabytes
+    self * MEGABYTE
+  end
+  alias :megabyte :megabytes
+
+  # Returns the number of bytes equivalent to the gigabytes provided.
+  #
+  #   2.gigabytes # => 2_147_483_648
+  def gigabytes
+    self * GIGABYTE
+  end
+  alias :gigabyte :gigabytes
+
+  # Returns the number of bytes equivalent to the terabytes provided.
+  #
+  #   2.terabytes # => 2_199_023_255_552
+  def terabytes
+    self * TERABYTE
+  end
+  alias :terabyte :terabytes
+
+  # Returns the number of bytes equivalent to the petabytes provided.
+  #
+  #   2.petabytes # => 2_251_799_813_685_248
+  def petabytes
+    self * PETABYTE
+  end
+  alias :petabyte :petabytes
+
+  # Returns the number of bytes equivalent to the exabytes provided.
+  #
+  #   2.exabytes # => 2_305_843_009_213_693_952
+  def exabytes
+    self * EXABYTE
+  end
+  alias :exabyte :exabytes
+end

data/lib/tasks/centurion.rake

@@ -0,0 +1,12 @@
+# The centurion:setup task is always run first to do any prework needed
+# to ensure a consistent and functioning environment
+
+namespace :centurion do
+  task :setup => [:clean_environment]
+
+  task :clean_environment do
+    ENV.delete('DOCKER_HOST')
+    ENV.delete('DOCKER_TLS_VERIFY')
+    ENV.delete('DOCKER_CERT_PATH')
+  end
+end

data/lib/tasks/deploy.rake

@@ -131,7 +131,8 @@ namespace :deploy do
         port = host_ports.first['HostPort']
         next if skip_ports.include?(port)
 
-        wait_for_http_status_ok(
+        wait_for_health_check_ok(
+          fetch(:health_check, method(:http_status_ok?)),
           server,
           port,
           fetch(:status_endpoint, '/'),

data/spec/deploy_spec.rb

@@ -1,14 +1,10 @@
 require 'spec_helper'
-require 'centurion/deploy'
-require 'centurion/deploy_dsl'
-require 'centurion/logging'
+require 'centurion'
 
 describe Centurion::Deploy do
-  let(:mock_ok_status)  { double('http_status_ok').tap { |s| allow(s).to receive(:status).and_return(200) } }
-  let(:mock_bad_status) { double('http_status_ok').tap { |s| allow(s).to receive(:status).and_return(500) } }
-  let(:server)          { double('docker_server').tap { |s|
-                            allow(s).to receive(:hostname).and_return(hostname)
-                            allow(s).to receive(:attach) } }
+  let(:mock_ok_status)  { double('http_status_ok', status: 200) }
+  let(:mock_bad_status) { double('http_status_ok', status: 500) }
+  let(:server)          { double('docker_server', attach: true, hostname: hostname) }
   let(:port)            { 8484 }
   let(:container)       { { 'Ports' => [{ 'PublicPort' => port }, 'Created' => Time.now.to_i ], 'Id' => '21adfd2ef2ef2349494a', 'Names' => [ 'name1' ] } }
   let(:endpoint)        { '/status/check' }
@@ -24,6 +20,7 @@ describe Centurion::Deploy do
   before do
     allow(test_deploy).to receive(:fetch).and_return nil
     allow(test_deploy).to receive(:fetch).with(:container_hostname, hostname).and_return(hostname)
+    allow(test_deploy).to receive(:host_ip).and_return('172.16.0.1')
   end
 
   describe '#http_status_ok?' do
@@ -82,7 +79,7 @@ describe Centurion::Deploy do
       allow(test_deploy).to receive(:container_up?).and_return(true)
       allow(test_deploy).to receive(:http_status_ok?).and_return(true)
 
-      test_deploy.wait_for_http_status_ok(server, port, '/foo', 'image_id', 'chaucer')
+      test_deploy.wait_for_health_check_ok(test_deploy.method(:http_status_ok?), server, port, '/foo', 'image_id', 'chaucer')
       expect(test_deploy).to have_received(:info).with(/Waiting for the port/)
       expect(test_deploy).to have_received(:info).with('Container is up!')
     end
@@ -94,7 +91,7 @@ describe Centurion::Deploy do
       expect(test_deploy).to receive(:exit)
       expect(test_deploy).to receive(:sleep).with(0)
 
-      test_deploy.wait_for_http_status_ok(server, port, '/foo', 'image_id', 'chaucer', 0, 1)
+      test_deploy.wait_for_health_check_ok(test_deploy.method(:http_status_ok?), server, port, '/foo', 'image_id', 'chaucer', 0, 1)
       expect(test_deploy).to have_received(:info).with(/Waiting for the port/)
     end
 
@@ -105,7 +102,7 @@ describe Centurion::Deploy do
       allow(test_deploy).to receive(:warn)
       expect(test_deploy).to receive(:exit)
 
-      test_deploy.wait_for_http_status_ok(server, port, '/foo', 'image_id', 'chaucer', 1, 0)
+      test_deploy.wait_for_health_check_ok(test_deploy.method(:http_status_ok?), server, port, '/foo', 'image_id', 'chaucer', 1, 0)
       expect(test_deploy).to have_received(:info).with(/Waiting for the port/)
     end
   end
@@ -178,7 +175,11 @@ describe Centurion::Deploy do
     end
 
     context 'when env vars are specified' do
-      let(:env) { { 'FOO' => 'BAR', 'BAZ' => '%DOCKER_HOSTNAME%.example.com' } }
+      let(:env) { {
+        'FOO' => 'BAR',
+        'BAZ' => '%DOCKER_HOSTNAME%.example.com',
+        'BAR' => '%DOCKER_HOST_IP%:1234'
+      } }
 
       it 'sets the Env key in the config' do
         config = test_deploy.container_config_for(server, image_id, port_bindings, env)
@@ -193,6 +194,12 @@ describe Centurion::Deploy do
 
         expect(config['Env']).to include('BAZ=host1.example.com')
       end
+
+      it 'interpolates the host IP into the env_vars' do
+        config = test_deploy.container_config_for(server, image_id, port_bindings, env)
+
+        expect(config['Env']).to include('BAR=172.16.0.1:1234')
+      end
     end
 
     context 'when volumes are specified' do
@@ -247,6 +254,12 @@ describe Centurion::Deploy do
         expect { test_deploy.container_config_for(server, image_id, port_bindings, env, volumes, command, memory, -100) }.to terminate.with_code(101)
         expect { test_deploy.container_config_for(server, image_id, port_bindings, env, volumes, command, memory, 0xFFFFFFFFFFFFFFFFFF) }.to terminate.with_code(101)
       end
+
+      it 'still works when memory is specified in gigabytes' do
+        memory = 3.gigabytes
+        config = test_deploy.container_config_for(server, image_id, port_bindings, env, volumes, command, memory, cpu_shares)
+        expect(config['Memory']).to eq(3 * 1024 * 1024 * 1024)
+      end
     end
   end
 

data/spec/docker_server_group_spec.rb

@@ -23,7 +23,7 @@ describe Centurion::DockerServerGroup do
   end
 
   it 'can run parallel operations' do
-    item = double('item').tap { |i| allow(i).to receive(:dummy_method) }
+    item = double('item', dummy_method: true)
     expect(item).to receive(:dummy_method).twice
 
     expect { group.each_in_parallel { |host| item.dummy_method } }.not_to raise_error

data/spec/docker_via_api_spec.rb

@@ -237,6 +237,21 @@ describe Centurion::DockerViaApi do
     end
   end
 
+   context 'with default TLS certificates' do
+    let(:excon_uri) { "https://#{hostname}:#{port}/" }
+    let(:tls_args)  { { tls: true } }
+    let(:api)       { Centurion::DockerViaApi.new(hostname, port, tls_args) }
+
+    it 'lists processes' do
+      expect(Excon).to receive(:get).
+                       with(excon_uri + 'v1.7/containers/json',
+                            client_cert: File.expand_path('~/.docker/cert.pem'),
+                            client_key: File.expand_path('~/.docker/key.pem')).
+                       and_return(double(body: json_string, status: 200))
+      expect(api.ps).to eq(json_value)
+    end
+  end
+
   def inspected_container_on_port(id, port)
     {
       "Id" => id.to_s,

data/spec/docker_via_cli_spec.rb

@@ -7,26 +7,26 @@ describe Centurion::DockerViaCli do
   context 'without TLS certificates' do
     let(:docker_via_cli) { Centurion::DockerViaCli.new('host1', 2375, docker_path) }
     it 'pulls the latest image given its name' do
-      expect(docker_via_cli).to receive(:echo).
+      expect(Centurion::Shell).to receive(:echo).
                                 with("docker -H=tcp://host1:2375 pull foo:latest")
       docker_via_cli.pull('foo')
     end
 
     it 'pulls an image given its name & tag' do
-      expect(docker_via_cli).to receive(:echo).
+      expect(Centurion::Shell).to receive(:echo).
                                 with("docker -H=tcp://host1:2375 pull foo:bar")
       docker_via_cli.pull('foo', 'bar')
     end
 
     it 'tails logs on a container' do
       id = '12345abcdef'
-      expect(docker_via_cli).to receive(:echo).
+      expect(Centurion::Shell).to receive(:echo).
                                 with("docker -H=tcp://host1:2375 logs -f #{id}")
       docker_via_cli.tail(id)
     end
 
     it 'should print all chars when one thread is running' do
-      expect(docker_via_cli).to receive(:run_with_echo)
+      expect(Centurion::Shell).to receive(:run_with_echo)
 
       allow(Thread).to receive(:list) {[double(:status => 'run')]}
 
@@ -34,7 +34,7 @@ describe Centurion::DockerViaCli do
     end
 
     it 'should only print lines when multiple threads are running' do
-      expect(docker_via_cli).to receive(:run_without_echo)
+      expect(Centurion::Shell).to receive(:run_without_echo)
 
       allow(Thread).to receive(:list) {[double(:status => 'run'), double(:status => 'run')]}
 
@@ -47,7 +47,7 @@ describe Centurion::DockerViaCli do
     let(:docker_via_cli) { Centurion::DockerViaCli.new('host1', 2375,
                                                        docker_path, tls_args) }
     it 'pulls the latest image given its name' do
-      expect(docker_via_cli).to receive(:echo).
+      expect(Centurion::Shell).to receive(:echo).
                                 with('docker -H=tcp://host1:2375 ' \
                                      '--tlsverify ' \
                                      '--tlscacert=/certs/ca.pem ' \
@@ -57,7 +57,7 @@ describe Centurion::DockerViaCli do
     end
 
     it 'pulls an image given its name & tag' do
-      expect(docker_via_cli).to receive(:echo).
+      expect(Centurion::Shell).to receive(:echo).
                                 with('docker -H=tcp://host1:2375 ' \
                                      '--tlsverify ' \
                                      '--tlscacert=/certs/ca.pem ' \
@@ -68,7 +68,7 @@ describe Centurion::DockerViaCli do
 
     it 'tails logs on a container' do
       id = '12345abcdef'
-      expect(docker_via_cli).to receive(:echo).
+      expect(Centurion::Shell).to receive(:echo).
                                 with('docker -H=tcp://host1:2375 ' \
                                      '--tlsverify ' \
                                      '--tlscacert=/certs/ca.pem ' \
@@ -79,7 +79,7 @@ describe Centurion::DockerViaCli do
 
     it 'attach to a container' do
       id = '12345abcdef'
-      expect(docker_via_cli).to receive(:echo).
+      expect(Centurion::Shell).to receive(:echo).
                                 with('docker -H=tcp://host1:2375 ' \
                                      '--tlsverify ' \
                                      '--tlscacert=/certs/ca.pem ' \

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: centurion
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -21,7 +21,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-25 00:00:00.000000000 Z
+date: 2015-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
@@ -192,7 +192,10 @@ files:
 - lib/centurion/docker_via_cli.rb
 - lib/centurion/dogestry.rb
 - lib/centurion/logging.rb
+- lib/centurion/shell.rb
 - lib/centurion/version.rb
+- lib/core_ext/numeric_bytes.rb
+- lib/tasks/centurion.rake
 - lib/tasks/deploy.rake
 - lib/tasks/info.rake
 - lib/tasks/list.rake
@@ -251,3 +254,4 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/matchers/capistrano_dsl_matchers.rb
 - spec/support/matchers/exit_code_matches.rb
+has_rdoc: