dockit 3.3.0 → 3.4.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 507474e4d0221ebc26fac0934f409d2a43c48ccb
4
- data.tar.gz: 843bf4424645671537c05249762655db40537ab2
3
+ metadata.gz: bf6ec07475a6538e442db6fc658d8f20c9449b5a
4
+ data.tar.gz: 94af04a6c8c0a4d4d1ceeae2477e89d00b31e727
5
5
  SHA512:
6
- metadata.gz: 735db31ee696c7b036c12889a47b501ce1c185d38e5733bd1f552eaa4acb248dd8ce1fbae4d5e38bfb1e72002fc659c2faec4bf29b6bc4812814c75660d8f75c
7
- data.tar.gz: a17e23a5392e54f068783ac42096045c81772a5369f925c453a361b8254e6a7ce60c9b3106aeb3f443e1b2f699ee424af47054ba284256f95870cd2552cd1888
6
+ metadata.gz: d18b4550893fc3a54af8b277de77a85a534f7b1b1bb19a6ce6f12ce0ddb14c67284b99d001bd513512611856a07dcf9ad209287caf5c92d74e8eaa2321a5cb02
7
+ data.tar.gz: 1e7c50ec46b1d76bea4743cba9789b6e99b0a4841e0892506eddf456d16d649134f3b5f72db89eff80821ae4289c1bd271ae12249df79ec9a88fea3f55c23fe0
data/VERSION CHANGED
@@ -1 +1 @@
1
- 3.3.0
1
+ 3.4.0
data/lib/dockit/cli.rb CHANGED
@@ -305,7 +305,8 @@ begin
305
305
  require 'dockit/digitalocean'
306
306
  Default.desc 'do', 'manage docker server'
307
307
  Default.subcommand 'do', DO
308
- rescue LoadError
308
+ rescue LoadError => e
309
+ STDERR.puts "* No DigitalOcean support: #{e.message}"
309
310
  end
310
311
 
311
312
  # it would be nice to do this in the initialization method of the Default
data/lib/dockit/image.rb CHANGED
@@ -14,6 +14,8 @@ module Dockit
14
14
  end
15
15
  repos = config['t']
16
16
  puts "Building #{repos}"
17
+
18
+ convert_buildargs(config)
17
19
  begin
18
20
  image = Docker::Image.build_from_dir('.', config) do |chunk|
19
21
  Dockit::Log.print_chunk(chunk)
@@ -50,6 +52,13 @@ module Dockit
50
52
  image.remove(force: true)
51
53
  end
52
54
  end
55
+
56
+ private
57
+ def convert_buildargs(config)
58
+ return unless args = config['buildargs']
59
+ return if args.is_a?(String)
60
+ config['buildargs'] = args.to_json
61
+ end
53
62
  end
54
63
  end
55
64
  end
data/spec/spec_helper.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
2
- require 'simplecov'
3
2
  if ENV['COVERAGE']
3
+ require 'simplecov'
4
4
  puts 'Generating coverage report'
5
5
  SimpleCov.start
6
6
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dockit
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.3.0
4
+ version: 3.4.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Rick Frankel
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-10-27 00:00:00.000000000 Z
11
+ date: 2016-11-02 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -192,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
192
192
  version: '0'
193
193
  requirements: []
194
194
  rubyforge_project:
195
- rubygems_version: 2.6.4
195
+ rubygems_version: 2.6.7
196
196
  signing_key:
197
197
  specification_version: 4
198
198
  summary: A configuration manager and builder for docker projects.