contained_mr 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb47353419e6a56f1246d06934b63c123edfb442
-  data.tar.gz: 594990cbb031cd9e9298832c0374b2d76e81196d
+  metadata.gz: aa36265b30cbc358e74b368ebdf5cf9a90c6ebaa
+  data.tar.gz: f10177d6247c5be5e24c7c47cc72e1511f1805d3
 SHA512:
-  metadata.gz: b0bd1266cfdbaf5d1b24757d8bf52e37a0780b5912d78bf987c1f0b50247874709a832ad7aaec06649d7b8b80ca48c58f301bed0d91ea9632041d20ec697ca9b
-  data.tar.gz: 2925db33e8bb0179a80b7e93968c6728139d1b4735dc86918fd30d72a50f8355b3ba8d372357cfab01d2f16bb5ce15f77fffff4bf4cc8c5487fb7eb7c4f9d86f
+  metadata.gz: be014222e385e4b87ac25e5d4e979bd1931b1d6f3ffc304543a11fab3857fb82030eca49d68818c8d3ffe33366518d7b178e77af96c546459afd2e3200afe4d5
+  data.tar.gz: 9a31100c13d897147cd0ca6bef0dc53fd5109d701b0dc4c6c3a5bd469a246d7385e5fe71d33a9e93124c679bc82ef97424048a430159e8f41c79c7ad2063990d

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.4

data/contained_mr.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: contained_mr 0.3.3 ruby lib
+# stub: contained_mr 0.3.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "contained_mr"
-  s.version = "0.3.3"
+  s.version = "0.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Victor Costan"]
-  s.date = "2015-10-12"
+  s.date = "2015-10-13"
   s.description = "Plumbing for running mappers and reducers inside Docker containers"
   s.email = "victor@costan.us"
   s.extra_rdoc_files = [

data/lib/contained_mr/runner.rb

@@ -87,10 +87,28 @@ class ContainedMr::Runner
   #
   # @param {Docker::Container} container the mapper / reducer's container
   def fetch_console_output(container)
-    messages = container.attach stream: false, logs: true, stdin: nil,
-                                stdout: true, stderr: true
-    @stdout = messages[0].join ''
-    @stderr = messages[1].join ''
+    stdout_buffer = []
+    stderr_buffer = []
+    container.streaming_logs stdout: true, stderr: true,
+        since: 0, timestamps: false, tail: false do |stream, chunk|
+      case stream
+      when :stdout
+        stdout_buffer << chunk
+      when :stderr
+        stderr_buffer << chunk
+      end
+    end
+
+    @stdout = stdout_buffer.join ''
+    @stderr = stderr_buffer.join ''
+
+    # NOTE: The method below is simpler, but hangs on Swarm.
+    #       https://github.com/docker/swarm/issues/1284
+    #
+    # messages = container.attach stream: false, logs: true, stdin: nil,
+    #                             stdout: true, stderr: true
+    # @stdout = messages[0].join ''
+    # @stderr = messages[1].join ''
   end
   private :fetch_console_output
 

data/test/helper.rb

@@ -47,5 +47,6 @@ end
     end
   end
 end
+ContainedMr::Cleaner.new('contained_mrtests').destroy_all!
 
 MiniTest.autorun

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contained_mr
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Victor Costan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-12 00:00:00.000000000 Z
+date: 2015-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api