dapp 0.22.6 → 0.22.7

Sign up to get free protection for your applications and to get access to all the features.
Files changed (106) hide show
  1. checksums.yaml +4 -4
  2. data/bin/dapp +9 -5
  3. data/config/en/common.yml +2 -0
  4. data/config/en/net_status.yml +9 -12
  5. data/lib/dapp.rb +12 -47
  6. data/lib/dapp/cli/command/options/tag.rb +39 -0
  7. data/lib/dapp/config/directive/base.rb +2 -1
  8. data/lib/dapp/dapp.rb +6 -9
  9. data/lib/dapp/dapp/command/common.rb +9 -4
  10. data/lib/dapp/dapp/logging/i18n.rb +5 -1
  11. data/lib/dapp/dapp/logging/process.rb +2 -2
  12. data/lib/dapp/deployment/config/config.rb +5 -5
  13. data/lib/dapp/deployment/config/directive/expose.rb +1 -1
  14. data/lib/dapp/deployment/config/directive/namespace/instance_methods.rb +1 -1
  15. data/lib/dapp/deployment/error/app.rb +1 -1
  16. data/lib/dapp/deployment/error/{base.rb → default.rb} +1 -1
  17. data/lib/dapp/deployment/error/deployment.rb +1 -1
  18. data/lib/dapp/deployment/error/kubernetes.rb +1 -1
  19. data/lib/dapp/deployment/kubernetes.rb +3 -3
  20. data/lib/dapp/deployment/kubernetes/error.rb +4 -4
  21. data/lib/dapp/deployment/secret.rb +1 -1
  22. data/lib/dapp/dimg/cli/command/dimg.rb +2 -1
  23. data/lib/dapp/dimg/cli/command/dimg/build_context/export.rb +5 -0
  24. data/lib/dapp/dimg/cli/command/dimg/flush_local.rb +24 -0
  25. data/lib/dapp/dimg/cli/command/dimg/push.rb +2 -26
  26. data/lib/dapp/dimg/cli/command/dimg/stages/base.rb +2 -2
  27. data/lib/dapp/dimg/cli/command/dimg/tag.rb +11 -4
  28. data/lib/dapp/dimg/config/config.rb +1 -1
  29. data/lib/dapp/dimg/config/directive/artifact.rb +5 -5
  30. data/lib/dapp/dimg/config/directive/artifact_base.rb +5 -5
  31. data/lib/dapp/dimg/config/directive/dimg/instance_methods.rb +1 -1
  32. data/lib/dapp/dimg/config/directive/dimg/validation.rb +11 -13
  33. data/lib/dapp/dimg/config/directive/docker/artifact.rb +1 -1
  34. data/lib/dapp/dimg/config/directive/docker/base.rb +1 -1
  35. data/lib/dapp/dimg/config/directive/git_artifact_local.rb +19 -3
  36. data/lib/dapp/dimg/config/directive/git_artifact_remote.rb +3 -1
  37. data/lib/dapp/dimg/config/directive/mount.rb +3 -3
  38. data/lib/dapp/dimg/dapp/command/build.rb +1 -1
  39. data/lib/dapp/dimg/dapp/command/build_context/export.rb +17 -13
  40. data/lib/dapp/dimg/dapp/command/build_context/import.rb +24 -17
  41. data/lib/dapp/dimg/dapp/command/cleanup_repo.rb +26 -33
  42. data/lib/dapp/dimg/dapp/command/common.rb +53 -56
  43. data/lib/dapp/dimg/dapp/command/flush_local.rb +18 -0
  44. data/lib/dapp/dimg/dapp/command/mrproper.rb +1 -1
  45. data/lib/dapp/dimg/dapp/command/push.rb +2 -8
  46. data/lib/dapp/dimg/dapp/command/spush.rb +2 -4
  47. data/lib/dapp/dimg/dapp/command/stages/cleanup_local.rb +41 -46
  48. data/lib/dapp/dimg/dapp/command/stages/cleanup_repo.rb +35 -39
  49. data/lib/dapp/dimg/dapp/command/stages/common.rb +13 -3
  50. data/lib/dapp/dimg/dapp/command/stages/flush_local.rb +1 -3
  51. data/lib/dapp/dimg/dapp/command/stages/flush_repo.rb +3 -3
  52. data/lib/dapp/dimg/dapp/command/stages/pull.rb +2 -12
  53. data/lib/dapp/dimg/dapp/command/stages/push.rb +2 -8
  54. data/lib/dapp/dimg/dapp/command/tag.rb +3 -6
  55. data/lib/dapp/dimg/dapp/dapp.rb +1 -0
  56. data/lib/dapp/dimg/dapp/dappfile.rb +11 -1
  57. data/lib/dapp/dimg/dimg.rb +39 -31
  58. data/lib/dapp/dimg/error/build.rb +1 -1
  59. data/lib/dapp/dimg/error/chef.rb +1 -5
  60. data/lib/dapp/dimg/error/{command.rb → default.rb} +1 -1
  61. data/lib/dapp/dimg/error/dimg.rb +1 -1
  62. data/lib/dapp/dimg/error/lock.rb +1 -1
  63. data/lib/dapp/dimg/error/registry.rb +1 -1
  64. data/lib/dapp/dimg/error/rugged.rb +1 -1
  65. data/lib/dapp/dimg/error/tar_writer.rb +1 -1
  66. data/lib/dapp/dimg/git_artifact.rb +3 -1
  67. data/lib/dapp/dimg/image/argument.rb +3 -1
  68. data/lib/dapp/dimg/image/dimg.rb +15 -0
  69. data/lib/dapp/dimg/image/stage.rb +0 -9
  70. data/lib/dapp/error/base.rb +1 -5
  71. data/lib/dapp/error/command.rb +5 -0
  72. data/lib/dapp/error/config.rb +5 -0
  73. data/lib/dapp/error/dapp.rb +1 -1
  74. data/lib/dapp/error/dappfile.rb +1 -1
  75. data/lib/dapp/error/default.rb +11 -0
  76. data/lib/dapp/error/mod/user.rb +11 -0
  77. data/lib/dapp/error/shellout.rb +1 -1
  78. data/lib/dapp/exception/base.rb +1 -1
  79. data/lib/dapp/helper/yaml.rb +3 -2
  80. data/lib/dapp/kube/cli/command/kube/deploy.rb +2 -26
  81. data/lib/dapp/kube/cli/command/kube/lint.rb +1 -26
  82. data/lib/dapp/kube/cli/command/kube/render.rb +2 -26
  83. data/lib/dapp/kube/cli/command/kube/secret_key_generate.rb +2 -2
  84. data/lib/dapp/kube/dapp/command/common.rb +19 -23
  85. data/lib/dapp/kube/dapp/command/deploy.rb +16 -9
  86. data/lib/dapp/kube/dapp/command/dismiss.rb +1 -1
  87. data/lib/dapp/kube/dapp/command/lint.rb +4 -10
  88. data/lib/dapp/kube/dapp/command/minikube_setup.rb +12 -18
  89. data/lib/dapp/kube/dapp/command/secret_edit.rb +2 -2
  90. data/lib/dapp/kube/error/{command.rb → default.rb} +1 -1
  91. data/lib/dapp/kube/error/kubernetes.rb +1 -1
  92. data/lib/dapp/kube/helm/release.rb +7 -33
  93. data/lib/dapp/kube/helm/values.rb +140 -0
  94. data/lib/dapp/kube/kubernetes/client.rb +9 -10
  95. data/lib/dapp/kube/kubernetes/client/error.rb +14 -8
  96. data/lib/dapp/kube/kubernetes/error.rb +15 -0
  97. data/lib/dapp/kube/kubernetes/manager/deployment.rb +2 -2
  98. data/lib/dapp/kube/secret.rb +1 -1
  99. data/lib/dapp/version.rb +1 -1
  100. metadata +15 -11
  101. data/lib/dapp/config/error/config.rb +0 -7
  102. data/lib/dapp/deployment/error/command.rb +0 -7
  103. data/lib/dapp/deployment/error/config.rb +0 -7
  104. data/lib/dapp/dimg/error/base.rb +0 -7
  105. data/lib/dapp/dimg/error/config.rb +0 -7
  106. data/lib/dapp/kube/error/base.rb +0 -11
@@ -1,10 +1,20 @@
1
1
  module Dapp
2
2
  module Kube
3
3
  module Kubernetes::Client::Error
4
- class Base < ::Dapp::Kube::Error::Kubernetes
5
- def initialize(**net_status)
6
- super(**net_status, context: :kubernetes)
7
- end
4
+ class Base < Kubernetes::Error::Base
5
+ end
6
+
7
+ class Default < Base
8
+ include ::Dapp::Error::Mod::User
9
+ end
10
+
11
+ class Timeout < Default
12
+ end
13
+
14
+ class ConnectionRefused < Default
15
+ end
16
+
17
+ class BadConfig < Default
8
18
  end
9
19
 
10
20
  class NotFound < Base
@@ -13,10 +23,6 @@ module Dapp
13
23
  end
14
24
  end
15
25
 
16
- class Timeout < Base; end
17
- class ConnectionRefused < Base; end
18
- class BadConfig < Base; end
19
-
20
26
  module Pod
21
27
  class NotFound < Kubernetes::Client::Error::NotFound ; end
22
28
 
@@ -0,0 +1,15 @@
1
+ module Dapp
2
+ module Kube
3
+ module Kubernetes::Error
4
+ class Base < ::Dapp::Error::Base
5
+ def initialize(**net_status)
6
+ super(**net_status, context: :kubernetes)
7
+ end
8
+ end
9
+
10
+ class Default < Base
11
+ include ::Dapp::Error::Mod::User
12
+ end
13
+ end # Kubernetes::Error
14
+ end # Kube
15
+ end # Dapp
@@ -157,13 +157,13 @@ module Dapp
157
157
  waiting_reason = container_status.fetch('state', {}).fetch('waiting', {}).fetch('reason', nil)
158
158
  case waiting_reason
159
159
  when 'ImagePullBackOff', 'ErrImagePull'
160
- raise Error::Base,
160
+ raise Kubernetes::Error::Base,
161
161
  code: :image_not_found,
162
162
  data: {pod_name: pod.name,
163
163
  reason: waiting_reason,
164
164
  message: container_status['state']['waiting']['message']}
165
165
  when 'CrashLoopBackOff'
166
- raise Error::Base,
166
+ raise Kubernetes::Error::Base,
167
167
  code: :container_crash,
168
168
  data: {pod_name: pod.name,
169
169
  reason: waiting_reason,
@@ -77,7 +77,7 @@ module Dapp
77
77
  end
78
78
  end
79
79
 
80
- class Error < ::Dapp::Kube::Error::Base
80
+ class Error < ::Dapp::Kube::Error::Default
81
81
  def initialize(**net_status)
82
82
  super(net_status.merge(context: :secret))
83
83
  end
@@ -1,4 +1,4 @@
1
1
  module Dapp
2
- VERSION = '0.22.6'.freeze
2
+ VERSION = '0.22.7'.freeze
3
3
  BUILD_CACHE_VERSION = 25
4
4
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dapp
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.22.6
4
+ version: 0.22.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dmitry Stolyarov
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-12-19 00:00:00.000000000 Z
11
+ date: 2017-12-25 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: mixlib-shellout
@@ -425,11 +425,11 @@ files:
425
425
  - lib/dapp/cli.rb
426
426
  - lib/dapp/cli/cli.rb
427
427
  - lib/dapp/cli/command/base.rb
428
+ - lib/dapp/cli/command/options/tag.rb
428
429
  - lib/dapp/cli/command/slug.rb
429
430
  - lib/dapp/cli/command/update.rb
430
431
  - lib/dapp/config/config.rb
431
432
  - lib/dapp/config/directive/base.rb
432
- - lib/dapp/config/error/config.rb
433
433
  - lib/dapp/core_ext/hash.rb
434
434
  - lib/dapp/core_ext/pathname.rb
435
435
  - lib/dapp/dapp.rb
@@ -479,9 +479,7 @@ files:
479
479
  - lib/dapp/deployment/dapp/dappfile.rb
480
480
  - lib/dapp/deployment/deployment.rb
481
481
  - lib/dapp/deployment/error/app.rb
482
- - lib/dapp/deployment/error/base.rb
483
- - lib/dapp/deployment/error/command.rb
484
- - lib/dapp/deployment/error/config.rb
482
+ - lib/dapp/deployment/error/default.rb
485
483
  - lib/dapp/deployment/error/deployment.rb
486
484
  - lib/dapp/deployment/error/kubernetes.rb
487
485
  - lib/dapp/deployment/kube_app.rb
@@ -539,6 +537,7 @@ files:
539
537
  - lib/dapp/dimg/cli/command/dimg/build_context/import.rb
540
538
  - lib/dapp/dimg/cli/command/dimg/cleanup.rb
541
539
  - lib/dapp/dimg/cli/command/dimg/cleanup_repo.rb
540
+ - lib/dapp/dimg/cli/command/dimg/flush_local.rb
542
541
  - lib/dapp/dimg/cli/command/dimg/flush_repo.rb
543
542
  - lib/dapp/dimg/cli/command/dimg/list.rb
544
543
  - lib/dapp/dimg/cli/command/dimg/mrproper.rb
@@ -583,6 +582,7 @@ files:
583
582
  - lib/dapp/dimg/dapp/command/cleanup.rb
584
583
  - lib/dapp/dimg/dapp/command/cleanup_repo.rb
585
584
  - lib/dapp/dimg/dapp/command/common.rb
585
+ - lib/dapp/dimg/dapp/command/flush_local.rb
586
586
  - lib/dapp/dimg/dapp/command/flush_repo.rb
587
587
  - lib/dapp/dimg/dapp/command/list.rb
588
588
  - lib/dapp/dimg/dapp/command/mrproper.rb
@@ -610,11 +610,9 @@ files:
610
610
  - lib/dapp/dimg/docker_registry/base/request.rb
611
611
  - lib/dapp/dimg/docker_registry/default.rb
612
612
  - lib/dapp/dimg/docker_registry/dimg.rb
613
- - lib/dapp/dimg/error/base.rb
614
613
  - lib/dapp/dimg/error/build.rb
615
614
  - lib/dapp/dimg/error/chef.rb
616
- - lib/dapp/dimg/error/command.rb
617
- - lib/dapp/dimg/error/config.rb
615
+ - lib/dapp/dimg/error/default.rb
618
616
  - lib/dapp/dimg/error/dimg.rb
619
617
  - lib/dapp/dimg/error/lock.rb
620
618
  - lib/dapp/dimg/error/registry.rb
@@ -629,14 +627,19 @@ files:
629
627
  - lib/dapp/dimg/git_repo/own.rb
630
628
  - lib/dapp/dimg/git_repo/remote.rb
631
629
  - lib/dapp/dimg/image/argument.rb
630
+ - lib/dapp/dimg/image/dimg.rb
632
631
  - lib/dapp/dimg/image/docker.rb
633
632
  - lib/dapp/dimg/image/scratch.rb
634
633
  - lib/dapp/dimg/image/stage.rb
635
634
  - lib/dapp/dimg/lock/base.rb
636
635
  - lib/dapp/dimg/lock/file.rb
637
636
  - lib/dapp/error/base.rb
637
+ - lib/dapp/error/command.rb
638
+ - lib/dapp/error/config.rb
638
639
  - lib/dapp/error/dapp.rb
639
640
  - lib/dapp/error/dappfile.rb
641
+ - lib/dapp/error/default.rb
642
+ - lib/dapp/error/mod/user.rb
640
643
  - lib/dapp/error/shellout.rb
641
644
  - lib/dapp/exception/base.rb
642
645
  - lib/dapp/helper/cli.rb
@@ -673,11 +676,11 @@ files:
673
676
  - lib/dapp/kube/dapp/command/secret_key_generate.rb
674
677
  - lib/dapp/kube/dapp/command/secret_regenerate.rb
675
678
  - lib/dapp/kube/dapp/dapp.rb
676
- - lib/dapp/kube/error/base.rb
677
- - lib/dapp/kube/error/command.rb
679
+ - lib/dapp/kube/error/default.rb
678
680
  - lib/dapp/kube/error/kubernetes.rb
679
681
  - lib/dapp/kube/helm.rb
680
682
  - lib/dapp/kube/helm/release.rb
683
+ - lib/dapp/kube/helm/values.rb
681
684
  - lib/dapp/kube/kubernetes.rb
682
685
  - lib/dapp/kube/kubernetes/client.rb
683
686
  - lib/dapp/kube/kubernetes/client/error.rb
@@ -687,6 +690,7 @@ files:
687
690
  - lib/dapp/kube/kubernetes/client/resource/job.rb
688
691
  - lib/dapp/kube/kubernetes/client/resource/pod.rb
689
692
  - lib/dapp/kube/kubernetes/client/resource/replicaset.rb
693
+ - lib/dapp/kube/kubernetes/error.rb
690
694
  - lib/dapp/kube/kubernetes/manager/base.rb
691
695
  - lib/dapp/kube/kubernetes/manager/container.rb
692
696
  - lib/dapp/kube/kubernetes/manager/deployment.rb
@@ -1,7 +0,0 @@
1
- module Dapp
2
- module Config
3
- module Error
4
- class Config < ::Dapp::Error::Base; end
5
- end
6
- end
7
- end
@@ -1,7 +0,0 @@
1
- module Dapp
2
- module Deployment
3
- module Error
4
- class Command < Base; end
5
- end
6
- end
7
- end
@@ -1,7 +0,0 @@
1
- module Dapp
2
- module Deployment
3
- module Error
4
- class Config < ::Dapp::Config::Error::Config; end
5
- end
6
- end
7
- end
@@ -1,7 +0,0 @@
1
- module Dapp
2
- module Dimg
3
- module Error
4
- class Base < ::Dapp::Error::Base; end
5
- end
6
- end
7
- end
@@ -1,7 +0,0 @@
1
- module Dapp
2
- module Dimg
3
- module Error
4
- class Config < ::Dapp::Config::Error::Config; end
5
- end
6
- end
7
- end
@@ -1,11 +0,0 @@
1
- module Dapp
2
- module Kube
3
- module Error
4
- class Base < ::Dapp::Error::Base
5
- def initialize(**net_status)
6
- super(**net_status, context: :kube)
7
- end
8
- end
9
- end
10
- end
11
- end