dctl_rb 0.11.2 → 0.12.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
  SHA256:
3
- metadata.gz: 6bb1eeb11710ddca55a91f30f6e4149600e8fe6154ceb9bb18a23fe1d6cd542d
4
- data.tar.gz: 905797185838a9a475759e510654fa477244afee312eb637a29bd465db674822
3
+ metadata.gz: 9f9cb75fb8f24b8b22b9f1e226f45da72fef196b334150046acaa8822fd2162a
4
+ data.tar.gz: 0a44b4bf225e0840c4bff65bccbd1fcd8eb4e0beb640541672d42cf7375d8381
5
5
  SHA512:
6
- metadata.gz: 799c652423906afd57169bb08b6263147160014f5f6148fecfee07cbf14d1fa58cf0ddc3b7ed28fa7b56dc7e64937e5d5bee69900e1a2426bac23ea8d725f431
7
- data.tar.gz: 473a4ec69d91a1e7a38dd28376f1b73dd1542d4f070231bdedfef913819f32101e15eaa454b71b1d321d90d3dd6cc611452905598b05e3b7594ad773e7936a4d
6
+ metadata.gz: 48751f5d3c40ee9c6b4b6fc304cc9dc31f34f42b8d6270650ff9f00c7512beb3f1145e9c9fa40726b3f1ff4183bf79464b3b82836eee900c49e91970cf412652
7
+ data.tar.gz: ec7073f18dacaa43c6f9593347368cc4e67f0a32920cca8b9915128657dc0eda1205bb156c0628b975018f84553d972838aa993cb920e4ab300b88173702d255
data/Gemfile.lock CHANGED
@@ -1,18 +1,18 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- dctl_rb (0.11.2)
4
+ dctl_rb (0.12.0)
5
5
  config (>= 1, < 2)
6
6
  rainbow (>= 2.2, < 3)
7
7
  rake (~> 12)
8
- thor (~> 0.17, >= 0.17.0)
8
+ thor (~> 0.20)
9
9
 
10
10
  GEM
11
11
  remote: https://rubygems.org/
12
12
  specs:
13
- activesupport (5.1.5)
13
+ activesupport (5.2.0)
14
14
  concurrent-ruby (~> 1.0, >= 1.0.2)
15
- i18n (~> 0.7)
15
+ i18n (>= 0.7, < 2)
16
16
  minitest (~> 5.1)
17
17
  tzinfo (~> 1.1)
18
18
  byebug (9.1.0)
@@ -28,35 +28,34 @@ GEM
28
28
  dry-container (0.6.0)
29
29
  concurrent-ruby (~> 1.0)
30
30
  dry-configurable (~> 0.1, >= 0.1.3)
31
- dry-core (0.4.4)
31
+ dry-core (0.4.7)
32
32
  concurrent-ruby (~> 1.0)
33
- dry-equalizer (0.2.0)
33
+ dry-equalizer (0.2.1)
34
+ dry-inflector (0.1.2)
34
35
  dry-logic (0.4.2)
35
36
  dry-container (~> 0.2, >= 0.2.6)
36
37
  dry-core (~> 0.2)
37
38
  dry-equalizer (~> 0.2)
38
- dry-types (0.12.2)
39
+ dry-types (0.13.2)
39
40
  concurrent-ruby (~> 1.0)
40
- dry-configurable (~> 0.1)
41
41
  dry-container (~> 0.3)
42
- dry-core (~> 0.2, >= 0.2.1)
42
+ dry-core (~> 0.4, >= 0.4.4)
43
43
  dry-equalizer (~> 0.2)
44
+ dry-inflector (~> 0.1, >= 0.1.2)
44
45
  dry-logic (~> 0.4, >= 0.4.2)
45
- inflecto (~> 0.0.0, >= 0.0.2)
46
- dry-validation (0.11.1)
46
+ dry-validation (0.12.1)
47
47
  concurrent-ruby (~> 1.0)
48
48
  dry-configurable (~> 0.1, >= 0.1.3)
49
49
  dry-core (~> 0.2, >= 0.2.1)
50
50
  dry-equalizer (~> 0.2)
51
51
  dry-logic (~> 0.4, >= 0.4.0)
52
- dry-types (~> 0.12.0)
53
- i18n (0.9.5)
52
+ dry-types (~> 0.13.1)
53
+ i18n (1.0.1)
54
54
  concurrent-ruby (~> 1.0)
55
- inflecto (0.0.2)
56
55
  minitest (5.11.3)
57
56
  rainbow (2.2.2)
58
57
  rake
59
- rake (12.3.0)
58
+ rake (12.3.1)
60
59
  rspec (3.6.0)
61
60
  rspec-core (~> 3.6.0)
62
61
  rspec-expectations (~> 3.6.0)
data/dctl_rb.gemspec CHANGED
@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
34
34
  spec.add_development_dependency "byebug", "~> 9.1"
35
35
 
36
36
  spec.add_dependency "rake", "~> 12"
37
- spec.add_dependency "thor", "~> 0.17", ">= 0.17.0"
37
+ spec.add_dependency "thor", "~> 0.20"
38
38
  spec.add_dependency "config", ">= 1", "< 2"
39
39
  spec.add_dependency "rainbow", ">= 2.2", "< 3"
40
40
  end
data/exe/dctl CHANGED
@@ -34,6 +34,8 @@ module Dctl
34
34
  exit 1
35
35
  end
36
36
 
37
+ images, extra_args = extract_extra_args(images)
38
+
37
39
  dctl = Dctl::Main.new env: dctl_env
38
40
  images = dctl.expand_images *images
39
41
  env = dctl_env
@@ -48,6 +50,7 @@ module Dctl
48
50
  build_opts = %W(-f=#{dockerfile} -t=#{tag})
49
51
  build_opts << "--pull=true" if options[:pull]
50
52
  build_opts << "--cache-from=#{tag}" if options[:cache_from_self]
53
+ build_opts << extra_args
51
54
  if options[:cache_from]
52
55
  if images.size > 1
53
56
  error = "--cache-from is only supported when building a single " \
@@ -303,6 +306,17 @@ module Dctl
303
306
  options[:env] || ENV["DCTL_ENV"] || "dev"
304
307
  end
305
308
 
309
+ # Allow passsing additional docker args without us having to implement
310
+ # each one manually, e.g. `dctl build app -- --pull`
311
+ def extract_extra_args(images)
312
+ if idx = ARGV.find_index("--")
313
+ extra_args = ARGV[idx + 1..-1]
314
+ extra_args.each { |a| images.delete(a) }
315
+ end
316
+
317
+ [images, extra_args]
318
+ end
319
+
306
320
  def docker_opts
307
321
  opts = []
308
322
 
data/lib/dctl/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Dctl
2
- VERSION = "0.11.2"
2
+ VERSION = "0.12.0"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dctl_rb
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.11.2
4
+ version: 0.12.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Justin Toniazzo
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2018-03-05 00:00:00.000000000 Z
11
+ date: 2018-07-11 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -72,20 +72,14 @@ dependencies:
72
72
  requirements:
73
73
  - - "~>"
74
74
  - !ruby/object:Gem::Version
75
- version: '0.17'
76
- - - ">="
77
- - !ruby/object:Gem::Version
78
- version: 0.17.0
75
+ version: '0.20'
79
76
  type: :runtime
80
77
  prerelease: false
81
78
  version_requirements: !ruby/object:Gem::Requirement
82
79
  requirements:
83
80
  - - "~>"
84
81
  - !ruby/object:Gem::Version
85
- version: '0.17'
86
- - - ">="
87
- - !ruby/object:Gem::Version
88
- version: 0.17.0
82
+ version: '0.20'
89
83
  - !ruby/object:Gem::Dependency
90
84
  name: config
91
85
  requirement: !ruby/object:Gem::Requirement
@@ -176,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
176
170
  version: '0'
177
171
  requirements: []
178
172
  rubyforge_project:
179
- rubygems_version: 2.7.6
173
+ rubygems_version: 2.7.7
180
174
  signing_key:
181
175
  specification_version: 4
182
176
  summary: Simple dockerized app config