riak_test_server 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21a506f0cbd9517f343ef7858722f568b553534e
-  data.tar.gz: a7daf07b12c6accc1a364863ec8658551e2a938c
+  metadata.gz: 0cc589b4f686c3f38244df43e45f1f08ef96e231
+  data.tar.gz: 51c600a90c4c13e29e79a1bf9c9acd864e2d80ac
 SHA512:
-  metadata.gz: 50466f16b873b69a60ff6bf1fb4cda921e63c2bdc580d867ff0a493c4349047ea1be830c6a0c0a30735ebe3d7688587cd32a753e441e76f8cc19c60859ac6d79
-  data.tar.gz: 60c907d88d571b98160e7129e5c3d4ca81bfae980a1c70a6a72defc45c51c3fefa72a1dc3d2df279e787dafdaec5294b50dcdf94bdcb7711a22c1eba28bb2fee
+  metadata.gz: b1675cd7edcb1ec9f00e440641539b32dad914cf92cd307b6b514c8f2fc767ae854a53ba3c3f529109f531edbc41cee67812b1bc96eb2fd528f7cd71f85a1279
+  data.tar.gz: 08af4d885569903f31398ec7d58443787bec317eeda854726cfd59de1c11dd34899f2abf66469039b9e7d06bbb1ed0e6e950cc986109fe9ded07468fbc3f124d

data/README.md

@@ -52,3 +52,4 @@ You can override a bunch of defaults by passing options to `RiakTestServer.setup
 * `:repository` - supplier of docker images [default: `"ntalbott/riak_test_server"`]
 * `:tag` - docker image to use; `docker search ntalbott/riak_test_server` to see if other Riak versions are available [default: `"latest"`]
 * `:docker_bin` - name of the docker binary [default: `"docker"`]
+* `:force_restart` - will force the hard restart of any running container (slow) [efault: `false`]

data/ruby/riak_test_server.rb

@@ -1,6 +1,9 @@
 require "expect"
+require "timeout"
 
 module RiakTestServer
+  class Error < StandardError; end
+
   def self.setup(options={})
     @server.stop if @server
     @server = Server.new(options)
@@ -18,6 +21,7 @@ module RiakTestServer
   class Server
     attr_reader :repository, :tag
     def initialize(options)
+      @force_restart = (options[:force_restart] || false)
       @container_host = (options[:container_host] || "docker")
       @container_name = (options[:container_name] || "riak_test_server")
       @http_port = (options[:http_port] || "8098")
@@ -29,7 +33,8 @@ module RiakTestServer
 
     def start
       if docker("ps -a") =~ /\b#{@container_name}\b/
-        docker "stop #{@container_name}"
+        return unless @force_restart
+        stop
         docker "rm #{@container_name}"
       end
 
@@ -41,17 +46,17 @@ module RiakTestServer
         --publish=#{@http_port}:8098
         --publish=#{@pb_port}:8087
         #{@repository}:#{@tag}
-      ).join(" ")
+      ).join(" "), 5
     end
 
     def stop
       @console_io.close if @console_io
-      docker "stop #{@container_name}"
+      docker "stop #{@container_name}", 15
     end
 
     def setup
-      unless docker("images") =~ /#{repository}\s+#{tag}/
-        docker "pull #{repository}:#{tag}"
+      unless docker("images", 5) =~ /#{repository}\s+#{tag}/
+        docker "pull #{repository}:#{tag}", 60
       end
     end
 
@@ -74,11 +79,15 @@ module RiakTestServer
 
     private
 
-    def docker(command)
+    def docker(command, timeout=1)
       full_command = "#{@docker_bin} #{command}"
-      `#{full_command} 2>&1`.tap do |output|
-        raise "#{full_command} failed: #{output}" unless $?.exitstatus == 0
+      Timeout.timeout(timeout) do
+        `#{full_command} 2>&1`.tap do |output|
+          raise "#{full_command} failed: #{output}" unless $?.exitstatus == 0
+        end
       end
+    rescue Timeout::Error
+      raise RiakTestServer::Error, "Timed out running `#{full_command}` after #{timeout} seconds; is your Docker host running?"
     end
 
     PROMPT = /\(riak@[\w\.]+\)(\d+)>\s*/

data/ruby/riak_test_server/version.rb

@@ -1,3 +1,3 @@
 module RiakTestServer
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riak_test_server
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Nathaniel Talbott
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-24 00:00:00.000000000 Z
+date: 2014-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
 description: Makes it easy to run tests against Riak and wipe all data between each
   test (or whenever you want).
 email: