dapp 0.22.2 → 0.22.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6772c46b21f3e433f04fb8c2c1d3ebc12cd48d41783c70751ba2eb90ae8dc0d5
-  data.tar.gz: f4a098cc19c7357ec473d3167b6b793d1e6197a6592e4abdca449a6d78674273
+  metadata.gz: 47259cb4752b216b1a7a7c5e9bb0ed9226f6f101974bb633739516a5e631599a
+  data.tar.gz: 6e4e53aac766610d3ce419514ec1e5e88a48185b21ab516169dd0ddf2d8c7a32
 SHA512:
-  metadata.gz: 10534955c4393d6241001a96d90e20bc667f6ae09a5d4a1a2f4a15caced9b928646d53aa53598ac0c5132559305546a7f802548e30156a7ad5a24f967d70f111
-  data.tar.gz: 01cf0cbf46224eb0c5b95269e681fe5e73703a0a216f3f898faaa5d5471bc6c536fd396caa1fbee873d81f9e606679028849fc3b01e290dcb6ca9094e20ca219
+  metadata.gz: f2c7dbffefb9f2a4d364b11ce2f0b78067c356e297fa0de4b314756029157f2d2d78fc0b8e465b9f3796b94632cd0d3fdb9e499892b42d20b8e35ae6e4b5cef1
+  data.tar.gz: c675f0a8769b304eb8bb458b212346b25df8ffe5245f5544dc9a103d0cf37651174f7eabcd6266a840a866fce8a45a16e40058ac31769c92658d34b3988e6016

data/lib/dapp/cli/command/base.rb

@@ -68,10 +68,16 @@ module Dapp
           dapp = ::Dapp::Dapp.new(options: options)
 
           log_dapp_running_time(dapp, ignore: !log_running_time) do
-            if block_given?
-              yield dapp
-            elsif !run_method.nil?
-              dapp.public_send(run_method)
+            begin
+              before_dapp_run_command(dapp)
+
+              if block_given?
+                yield dapp
+              elsif !run_method.nil?
+                dapp.public_send(run_method)
+              end
+            ensure
+              dapp.terminate
             end
           end
         end
@@ -91,6 +97,11 @@ module Dapp
           raise
         end
 
+        def before_dapp_run_command(dapp, &blk)
+          yield if block_given?
+          dapp.try_host_docker_login
+        end
+
         def cli_options(**kwargs)
           dirs = [config[:build_dir], config[:run_dir], config[:deploy_dir]]
           if dirs.compact.size > 1

data/lib/dapp/dapp.rb

@@ -126,7 +126,8 @@ module Dapp
       self.class.host_docker_tmp_config_dir
     end
 
-    def host_docker_login
+    def try_host_docker_login
+      return if options[:without_registry]
       return unless option_repo
 
       validate_repo_name!(option_repo)

data/lib/dapp/dimg/cli/command/base.rb

@@ -6,21 +6,6 @@ module Dapp::Dimg::CLI
         run_dapp_command(run_method, options: cli_options(dimgs_patterns: cli_arguments))
       end
 
-      def run_dapp_command(run_method, options: {}, log_running_time: true)
-        super(nil, options: options, log_running_time: log_running_time) do |dapp|
-          begin
-            dapp.host_docker_login
-            if block_given?
-              yield dapp
-            elsif !run_method.nil?
-              dapp.public_send(run_method)
-            end
-          ensure
-            dapp.terminate
-          end
-        end
-      end
-
       def run_method
         class_to_lowercase
       end

data/lib/dapp/kube/cli/command/kube/deploy.rb

@@ -69,6 +69,12 @@ BANNER
              description: 'Default timeout to wait for resources to become ready, 300 seconds by default.',
              proc: proc {|v| Integer(v)}
 
+      option :registry_username,
+             long: '--registry-username USERNAME'
+
+      option :registry_password,
+             long: '--registry-password PASSWORD'
+
       option :without_registry,
              long: "--without-registry",
              default: false,
@@ -77,22 +83,26 @@ BANNER
 
       def run(argv = ARGV)
         self.class.parse_options(self, argv)
+        run_dapp_command(run_method, options: cli_options)
+      end
 
-        options = cli_options
-        options[:tag] = [*options.delete(:tag), *options.delete(:image_version)]
+      def before_dapp_run_command(dapp, &blk)
+        super(dapp) do
+          yield if block_given?
 
-        run_dapp_command(nil, options: options) do |dapp|
+          # Опция repo определяется в данном хуке, чтобы установить
+          # значение по умолчанию из объекта dapp: dapp.name
           repo = if not cli_arguments[0].nil?
             self.class.required_argument(self, 'repo')
           else
             dapp.name
           end
-
           dapp.options[:repo] = repo
 
-          dapp.public_send(run_method)
-        end
+          dapp.options[:tag] = [*dapp.options.delete(:tag), *dapp.options.delete(:image_version)]
+        end # super
       end
+
     end
   end
 end

data/lib/dapp/kube/cli/command/kube/lint.rb

@@ -56,18 +56,22 @@ BANNER
 
       def run(argv = ARGV)
         self.class.parse_options(self, argv)
+        run_dapp_command(run_method, options: cli_options, log_running_time: false)
+      end
+
+      def before_dapp_run_command(dapp, &blk)
+        super(dapp) do
+          yield if block_given?
 
-        run_dapp_command(nil, options: cli_options, log_running_time: false) do |dapp|
+          # Опция repo определяется в данном хуке, чтобы установить
+          # значение по умолчанию из объекта dapp: dapp.name
           repo = if not cli_arguments[0].nil?
             self.class.required_argument(self, 'repo')
           else
             dapp.name
           end
-
           dapp.options[:repo] = repo
-
-          dapp.public_send(run_method)
-        end
+        end # super
       end
 
     end

data/lib/dapp/kube/cli/command/kube/render.rb

@@ -65,19 +65,24 @@ BANNER
 
       def run(argv = ARGV)
         self.class.parse_options(self, argv)
+        run_dapp_command(run_method, options: cli_options, log_running_time: false)
+      end
+
+      def before_dapp_run_command(dapp, &blk)
+        super(dapp) do
+          yield if block_given?
 
-        run_dapp_command(nil, options: cli_options, log_running_time: false) do |dapp|
+          # Опция repo определяется в данном хуке, чтобы установить
+          # значение по умолчанию из объекта dapp: dapp.name
           repo = if not cli_arguments[0].nil?
             self.class.required_argument(self, 'repo')
           else
             dapp.name
           end
-
           dapp.options[:repo] = repo
-
-          dapp.public_send(run_method)
-        end
+        end # super
       end
+
     end
   end
 end

data/lib/dapp/kube/kubernetes/client.rb

@@ -128,7 +128,7 @@ module Dapp
         protected
 
         # query_parameters — соответствует 'Query Parameters' в документации kubernetes
-        # excon_parameters — соответствует опциям Excon
+        # excon_parameters — соответствует connection-опциям Excon
         # body — hash для http-body, соответствует 'Body Parameters' в документации kubernetes, опционален
         def request!(method, path, body: nil, excon_parameters: {}, response_body_parameters: {}, **query_parameters)
           with_connection(excon_parameters: excon_parameters) do |conn|
@@ -173,36 +173,15 @@ module Dapp
         end
 
         def with_connection(excon_parameters: {}, &blk)
-          old_ssl_ca_file = Excon.defaults[:ssl_ca_file]
-          old_ssl_cert_store = Excon.defaults[:ssl_cert_store]
-          old_middlewares = Excon.defaults[:middlewares].dup
-
-          begin
-            ssl_cert_store = OpenSSL::X509::Store.new
-            if ssl_ca_file = kube_config.fetch('clusters', [{}]).first.fetch('cluster', {}).fetch('certificate-authority', nil)
-              ssl_cert_store.add_file ssl_ca_file
-            elsif ssl_ca_data = kube_config.fetch('clusters', [{}]).first.fetch('cluster', {}).fetch('certificate-authority-data', nil)
-              ssl_cert_store.add_cert OpenSSL::X509::Certificate.new(Base64.decode64(ssl_ca_data))
-            end
-
-            Excon.defaults[:ssl_ca_file] = nil
-            Excon.defaults[:ssl_cert_store] = ssl_cert_store
-            Excon.defaults[:middlewares] << Excon::Middleware::RedirectFollower
-
-            connection = begin
-              Excon.new(kube_cluster_config['cluster']['server'], **kube_server_options(excon_parameters)).tap(&:get)
-            rescue Excon::Error::Socket => err
-              raise Error::ConnectionRefused,
-                code: :kube_server_connection_refused,
-                data: { kube_cluster_config: kube_cluster_config, kube_user_config: kube_user_config, error: err.message }
-            end
-
-            return yield connection
-          ensure
-            Excon.defaults[:ssl_ca_file] = old_ssl_ca_file
-            Excon.defaults[:ssl_cert_store] = old_ssl_cert_store
-            Excon.defaults[:middlewares] = old_middlewares
+          connection = begin
+            Excon.new(kube_cluster_config['cluster']['server'], **kube_server_options(excon_parameters)).tap(&:get)
+          rescue Excon::Error::Socket => err
+            raise Error::ConnectionRefused,
+              code: :kube_server_connection_refused,
+              data: { kube_cluster_config: kube_cluster_config, kube_user_config: kube_user_config, error: err.message }
           end
+
+          return yield connection
         end
 
         def kube_server_options(excon_parameters = {})
@@ -219,6 +198,18 @@ module Dapp
             client_key_data = kube_config.fetch('users', [{}]).first.fetch('user', {}).fetch('client-key-data', nil)
             opts[:client_key_data] = Base64.decode64(client_key_data) if client_key_data
 
+            ssl_cert_store = OpenSSL::X509::Store.new
+            if ssl_ca_file = kube_config.fetch('clusters', [{}]).first.fetch('cluster', {}).fetch('certificate-authority', nil)
+              ssl_cert_store.add_file ssl_ca_file
+            elsif ssl_ca_data = kube_config.fetch('clusters', [{}]).first.fetch('cluster', {}).fetch('certificate-authority-data', nil)
+              ssl_cert_store.add_cert OpenSSL::X509::Certificate.new(Base64.decode64(ssl_ca_data))
+            end
+            opts[:ssl_cert_store] = ssl_cert_store
+
+            opts[:ssl_ca_file] = nil
+
+            opts[:middlewares] = [*Excon.defaults[:middlewares], Excon::Middleware::RedirectFollower]
+
             opts.merge!(excon_parameters)
           end
         end

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = '0.22.2'.freeze
+  VERSION = '0.22.3'.freeze
   BUILD_CACHE_VERSION = 25
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.22.2
+  version: 0.22.3
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-08 00:00:00.000000000 Z
+date: 2017-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout