docker_tools 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98bc514ce06c9c76ff7f0fd4c3409c89316c38b2
-  data.tar.gz: e225d939fd0ce762e88dc753fb40b6d105628738
+  metadata.gz: 11271cf76429edbece326ffd3b19b21e4c33179e
+  data.tar.gz: f5a083aeec9519910fc4f75d97539b5cb11038df
 SHA512:
-  metadata.gz: dc13895895d7f11da0c865d48bc165c21f7d901b58a0270929bd82dd8d8bcf81de45f34f81136d300b8d2e25b1a193c5ecd820b9a0ee74f5d771bac251343ae5
-  data.tar.gz: c91e04d567ebb279a6d5bb281615c43b4b896cd43a7bba1dd16ca9813a2f9e678f3843fabb7638c65790642e424a5144d0f2dc522e968ab732784bc9602c8d36
+  metadata.gz: 04355d72895866e6f1e980bfd928afd0e633b6829fd0aeccc68abd5052ddbd4cd3857e58be98b22c6dd173ceb92aada855b5d41b0efdd995e97d47e5f474be0d
+  data.tar.gz: 7cd17d859c2908675f1f1187da1700cd01e9d7452d7fe52f04cd954a66ab0a97669bd6a132ec06382ee02cb5e236163c648ae063844df89e129e4014a61f001f

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", "~> 1.11.2"
+  spec.add_dependency "docker-api", "= 1.8.1"
   spec.add_dependency "erubis"
   spec.add_dependency "json"
 end

data/lib/docker_tools/util.rb

@@ -2,14 +2,19 @@ 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))
+    begin
+      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
-    else
-      block.call(Docker::Util.parse_json(body))
+    rescue
+      puts 'WARN: Could not parse output from docker:'
+      puts body
     end
   end
 end

data/lib/docker_tools/version.rb

@@ -1,3 +1,3 @@
 module DockerTools
-  VERSION = "0.0.14"
+  VERSION = "0.0.15"
 end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: docker_tools
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Chris Jansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-20 00:00:00.000000000 Z
+date: 2014-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: docker-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.11.2
+        version: 1.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.11.2
+        version: 1.8.1
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Wrapper around ruby docker API to help with builds and stuff
@@ -87,7 +87,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -110,12 +110,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []