docker_tools 0.0.14 → 0.0.15

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 98bc514ce06c9c76ff7f0fd4c3409c89316c38b2
4
- data.tar.gz: e225d939fd0ce762e88dc753fb40b6d105628738
3
+ metadata.gz: 11271cf76429edbece326ffd3b19b21e4c33179e
4
+ data.tar.gz: f5a083aeec9519910fc4f75d97539b5cb11038df
5
5
  SHA512:
6
- metadata.gz: dc13895895d7f11da0c865d48bc165c21f7d901b58a0270929bd82dd8d8bcf81de45f34f81136d300b8d2e25b1a193c5ecd820b9a0ee74f5d771bac251343ae5
7
- data.tar.gz: c91e04d567ebb279a6d5bb281615c43b4b896cd43a7bba1dd16ca9813a2f9e678f3843fabb7638c65790642e424a5144d0f2dc522e968ab732784bc9602c8d36
6
+ metadata.gz: 04355d72895866e6f1e980bfd928afd0e633b6829fd0aeccc68abd5052ddbd4cd3857e58be98b22c6dd173ceb92aada855b5d41b0efdd995e97d47e5f474be0d
7
+ data.tar.gz: 7cd17d859c2908675f1f1187da1700cd01e9d7452d7fe52f04cd954a66ab0a97669bd6a132ec06382ee02cb5e236163c648ae063844df89e129e4014a61f001f
data/docker_tools.gemspec CHANGED
@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
20
20
 
21
21
  spec.add_dependency "bundler", "~> 1.3"
22
22
  spec.add_dependency "rake"
23
- spec.add_dependency "docker-api", "~> 1.11.2"
23
+ spec.add_dependency "docker-api", "= 1.8.1"
24
24
  spec.add_dependency "erubis"
25
25
  spec.add_dependency "json"
26
26
  end
@@ -2,14 +2,19 @@ module DockerTools::Util
2
2
  module_function
3
3
 
4
4
  def parse_output(body, &block)
5
- if body.include?('}{')
6
- body.split('}{').each do | line |
7
- line = "{#{line}" unless line =~ /^{/
8
- line = "#{line}}" unless line =~ /}$/
9
- block.call(Docker::Util.parse_json(line))
5
+ begin
6
+ if body.include?('}{')
7
+ body.split('}{').each do | line |
8
+ line = "{#{line}" unless line =~ /^{/
9
+ line = "#{line}}" unless line =~ /}$/
10
+ block.call(Docker::Util.parse_json(line))
11
+ end
12
+ else
13
+ block.call(Docker::Util.parse_json(body))
10
14
  end
11
- else
12
- block.call(Docker::Util.parse_json(body))
15
+ rescue
16
+ puts 'WARN: Could not parse output from docker:'
17
+ puts body
13
18
  end
14
19
  end
15
20
  end
@@ -1,3 +1,3 @@
1
1
  module DockerTools
2
- VERSION = "0.0.14"
2
+ VERSION = "0.0.15"
3
3
  end
metadata CHANGED
@@ -1,83 +1,83 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: docker_tools
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.14
4
+ version: 0.0.15
5
5
  platform: ruby
6
6
  authors:
7
7
  - Chris Jansen
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-06-20 00:00:00.000000000 Z
11
+ date: 2014-06-26 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - ~>
17
+ - - "~>"
18
18
  - !ruby/object:Gem::Version
19
19
  version: '1.3'
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - ~>
24
+ - - "~>"
25
25
  - !ruby/object:Gem::Version
26
26
  version: '1.3'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: rake
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - '>='
31
+ - - ">="
32
32
  - !ruby/object:Gem::Version
33
33
  version: '0'
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - '>='
38
+ - - ">="
39
39
  - !ruby/object:Gem::Version
40
40
  version: '0'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: docker-api
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - ~>
45
+ - - '='
46
46
  - !ruby/object:Gem::Version
47
- version: 1.11.2
47
+ version: 1.8.1
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - ~>
52
+ - - '='
53
53
  - !ruby/object:Gem::Version
54
- version: 1.11.2
54
+ version: 1.8.1
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: erubis
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - '>='
59
+ - - ">="
60
60
  - !ruby/object:Gem::Version
61
61
  version: '0'
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - '>='
66
+ - - ">="
67
67
  - !ruby/object:Gem::Version
68
68
  version: '0'
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: json
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - '>='
73
+ - - ">="
74
74
  - !ruby/object:Gem::Version
75
75
  version: '0'
76
76
  type: :runtime
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
- - - '>='
80
+ - - ">="
81
81
  - !ruby/object:Gem::Version
82
82
  version: '0'
83
83
  description: Wrapper around ruby docker API to help with builds and stuff
@@ -87,7 +87,7 @@ executables: []
87
87
  extensions: []
88
88
  extra_rdoc_files: []
89
89
  files:
90
- - .gitignore
90
+ - ".gitignore"
91
91
  - Gemfile
92
92
  - LICENSE.txt
93
93
  - README.md
@@ -110,12 +110,12 @@ require_paths:
110
110
  - lib
111
111
  required_ruby_version: !ruby/object:Gem::Requirement
112
112
  requirements:
113
- - - '>='
113
+ - - ">="
114
114
  - !ruby/object:Gem::Version
115
115
  version: '0'
116
116
  required_rubygems_version: !ruby/object:Gem::Requirement
117
117
  requirements:
118
- - - '>='
118
+ - - ">="
119
119
  - !ruby/object:Gem::Version
120
120
  version: '0'
121
121
  requirements: []