docker_tools 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e82dbd73974a8015829f740e7b4293187ee43b6
-  data.tar.gz: 115b50943672d53b3584eb19f22f7ca4e54665cd
+  metadata.gz: 811b3d3d39855f63224373480537425b9478f4e5
+  data.tar.gz: 96fb174b1c05f1b71cea886b5728f060b57843f7
 SHA512:
-  metadata.gz: aa03bf71639c78594e2885ecf19d6bf8e94c0a294a016f3b548929185f0d5dccebf2ec812e8c33cbbb61ad6fde1cdd403c2919ec3b873ff5c818ceba8de7bae7
-  data.tar.gz: e8b119a6b579b1f81270ae32003b67b28acbcae719a4279b9366e0d35d8dfd20be6a5eb42814054b2946caa163fe947351ea9cad9da1d626f27f49d7578dc026
+  metadata.gz: a0fa38812ddd999b03e8400ba8c789339af210048452818286375f4a8328355effb7ed24fad281e52143d28331ea5892f4eab8819bc1788bbdd3e0176a534885
+  data.tar.gz: c63d7c4a9ea9aa12e105fc0ae68e97b7347125770b4bfe44444644cea0be3cec9c5a14da08b64072acd3855821d13e9c04d2b2938188e9fcee9dc4d47db07849

data/docker_tools.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "bundler", "~> 1.3"
   spec.add_dependency "rake"
-  spec.add_dependency "docker-api"
+  spec.add_dependency "docker-api", "~> 1.8.1"
   spec.add_dependency "erubis"
   spec.add_dependency "json"
 end

data/lib/docker_tools/image.rb

@@ -39,7 +39,7 @@ module DockerTools
         dockerfile_contents = dockerfile(@name, registry, dependency_tag, template_vars)
         File.open(dockerfile_path, 'w') { | file | file.write(dockerfile_contents) }
         @image = Docker::Image.build_from_dir(@dir, { 'rm' => rm, 'nocache' => no_cache }) do | chunk | 
-          Docker::Util.parse_output(chunk) do | output |
+          DockerTools::Util.parse_output(chunk) do | output |
             if output.kind_of?(Hash)
               if output.has_key?('error')
                 puts output['error']

data/lib/docker_tools/util.rb

@@ -0,0 +1,15 @@
+module DockerTools::Util
+  module_function
+
+  def parse_output(body, &block)
+    if body.include?('}{')
+      body.split('}{').each do | line |
+        line = "{#{line}" unless line =~ /^{/
+        line = "#{line}}" unless line =~ /}$/
+        block.call(Docker::Util.parse_json(line))
+      end
+    else
+      block.call(Docker::Util.parse_json(body))
+    end
+  end
+end

data/lib/docker_tools/version.rb

@@ -1,3 +1,3 @@
 module DockerTools
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

data/lib/docker_tools.rb

@@ -3,6 +3,7 @@ require "docker_tools/image"
 require "docker_tools/run"
 require "docker_tools/debootstrap"
 require "docker_tools/dependency"
+require "docker_tools/util"
 require "docker"
 
 module DockerTools

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker_tools
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Chris Jansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-18 00:00:00.000000000 Z
+date: 2014-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,16 +42,16 @@ dependencies:
   name: docker-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.1
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
@@ -98,6 +98,7 @@ files:
 - lib/docker_tools/dependency.rb
 - lib/docker_tools/image.rb
 - lib/docker_tools/run.rb
+- lib/docker_tools/util.rb
 - lib/docker_tools/version.rb
 homepage: https://github.com/janstenpickle/docker_tools
 licenses: