riak_test_server 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0cc589b4f686c3f38244df43e45f1f08ef96e231
-  data.tar.gz: 51c600a90c4c13e29e79a1bf9c9acd864e2d80ac
+  metadata.gz: 26aee048f49421dff9f93e39d5037e705fb20992
+  data.tar.gz: a6822d14361536f8a50b8dd1c5a0d5cb1a493cda
 SHA512:
-  metadata.gz: b1675cd7edcb1ec9f00e440641539b32dad914cf92cd307b6b514c8f2fc767ae854a53ba3c3f529109f531edbc41cee67812b1bc96eb2fd528f7cd71f85a1279
-  data.tar.gz: 08af4d885569903f31398ec7d58443787bec317eeda854726cfd59de1c11dd34899f2abf66469039b9e7d06bbb1ed0e6e950cc986109fe9ded07468fbc3f124d
+  metadata.gz: f51252686c65c863fb5d5f2289e84aae57ce9a5f5e588290587af0d1d06a21910932919668082546ae3d240064cd6fa56da2356932ba95a16f82925ee4a59d2a
+  data.tar.gz: 4ffb03b6f2d3947d2f3849f58de24173282486b115d6d9b9a52629fc8ba9f6b6f64585dc16ca73a5ace2d02b31befd3731b0e1ef91f2fed9e5d25f629d893e9e

data/README.md

@@ -11,6 +11,7 @@ the Riak backend inbetween tests.
 * [docker](https://docs.docker.com/installation/)
 * A working docker host environment (I like [dvm](https://github.com/fnichol/dvm) on OS X)
 * A hostname of `docker` mapped to the IP of your container host (192.168.42.43 for dvm)
+* At least 1Gb available to the docker VM. The base Erlang runtime seems to be a bit of a memory hog. (`export DOCKER_MEMORY=1024` for dvm)
 
 ## Installation
 

data/ruby/riak_test_server.rb

@@ -1,5 +1,7 @@
 require "expect"
 require "timeout"
+require "open3"
+require "json"
 
 module RiakTestServer
   class Error < StandardError; end
@@ -32,10 +34,16 @@ module RiakTestServer
     end
 
     def start
-      if docker("ps -a") =~ /\b#{@container_name}\b/
-        return unless @force_restart
-        stop
-        docker "rm #{@container_name}"
+      details = JSON.parse(docker("inspect #{@container_name}", allowed_exits: [0, 1]))
+      if details.size > 0
+        detail = details.first
+        running = (detail["State"] && detail["State"]["Running"])
+        if(@force_restart || !running)
+          stop
+          docker "rm #{@container_name}"
+        else
+          return
+        end
       end
 
       docker %W(
@@ -46,17 +54,17 @@ module RiakTestServer
         --publish=#{@http_port}:8098
         --publish=#{@pb_port}:8087
         #{@repository}:#{@tag}
-      ).join(" "), 5
+      ).join(" "), timeout: 5
     end
 
     def stop
       @console_io.close if @console_io
-      docker "stop #{@container_name}", 15
+      docker "stop #{@container_name}", timeout: 15
     end
 
     def setup
-      unless docker("images", 5) =~ /#{repository}\s+#{tag}/
-        docker "pull #{repository}:#{tag}", 60
+      unless docker("images", timeout: 5) =~ /#{repository}\s+#{tag}/
+        docker "pull #{repository}:#{tag}", timeout: 60
       end
     end
 
@@ -79,12 +87,20 @@ module RiakTestServer
 
     private
 
-    def docker(command, timeout=1)
+    def docker(command, options={})
       full_command = "#{@docker_bin} #{command}"
+      timeout = (options[:timeout] || 1)
+      allowed_exits = (options[:allowed_exits] || [0])
       Timeout.timeout(timeout) do
-        `#{full_command} 2>&1`.tap do |output|
-          raise "#{full_command} failed: #{output}" unless $?.exitstatus == 0
+        stdout, stderr, status = Open3.capture3(full_command)
+        unless(allowed_exits.include?(status.exitstatus))
+          raise [
+            "#{full_command} exited with unexpected status #{status.exitstatus} (expected: #{allowed_exits.inspect})",
+            "STDOUT: #{stdout}",
+            "STDERR: #{stderr}"
+          ].join("\n")
         end
+        stdout
       end
     rescue Timeout::Error
       raise RiakTestServer::Error, "Timed out running `#{full_command}` after #{timeout} seconds; is your Docker host running?"
@@ -109,7 +125,7 @@ module RiakTestServer
         @console_io = IO.popen([@docker_bin, "attach", @container_name], "r+", err: :out).tap{|io| io.sync = true}
         @console_io.puts("ok.")
         unless @console_io.expect(PROMPT, 10)
-          raise "Unable to get a prompt on the console"
+          raise "Unable to get a prompt on the console: @console_io.read"
         end
       end
 

data/ruby/riak_test_server/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riak_test_server
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Nathaniel Talbott