dapp 0.13.3 → 0.13.4

data/lib/dapp/dimg/git_repo/base.rb

@@ -83,7 +83,7 @@ module Dapp
         protected
 
         def git(**kwargs)
-          @git ||= Rugged::Repository.new(path, **kwargs)
+          @git ||= Rugged::Repository.new(path.to_s, **kwargs)
         end
 
         private

data/lib/dapp/dimg/git_repo/own.rb

@@ -11,7 +11,7 @@ module Dapp
         end
 
         def path
-          @path ||= Rugged::Repository.discover(dimg.home_path.to_s).path
+          @path ||= Pathname(Rugged::Repository.discover(dimg.home_path.to_s).path)
         rescue Rugged::RepositoryError => _e
           raise Error::Rugged, code: :local_git_repository_does_not_exist
         end

data/lib/dapp/dimg/git_repo/remote.rb

@@ -2,6 +2,8 @@ module Dapp
   module Dimg
     module GitRepo
       class Remote < Base
+        attr_reader :url
+
         def initialize(dimg, name, url:)
           super(dimg, name)
 
@@ -9,24 +11,21 @@ module Dapp
 
           dimg.dapp.log_secondary_process(dimg.dapp.t(code: 'process.git_artifact_clone', data: { url: url }), short: true) do
             begin
-              Rugged::Repository.clone_at(url, path, bare: true, credentials: _rugged_credentials)
+              if [:https, :ssh].include?(protocol) && !Rugged.features.include?(protocol)
+                raise Error::Rugged, code: :rugged_protocol_not_supported, data: { url: url, protocol: protocol }
+              end
+
+              Rugged::Repository.clone_at(url, path.to_s, bare: true, credentials: _rugged_credentials)
             rescue Rugged::NetworkError, Rugged::SslError => e
               raise Error::Rugged, code: :rugged_remote_error, data: { message: e.message, url: url }
             end
-          end unless File.directory?(path)
+          end unless path.directory?
         end
 
         def _rugged_credentials
           @_rugged_credentials ||= begin
-            ssh_url = begin
-              URI.parse(@url)
-              false
-            rescue URI::InvalidURIError
-              true
-            end
-
-            if ssh_url
-              host_with_user = @url.split(':', 2).first
+            if protocol == :ssh
+              host_with_user = url.split(':', 2).first
               username = host_with_user.split('@', 2).reverse.last
               Rugged::Credentials::SshKeyFromAgent.new(username: username)
             end
@@ -34,7 +33,7 @@ module Dapp
         end
 
         def path
-          dimg.build_path('git_repo_remote', name, Digest::MD5.hexdigest(@url)).to_s
+          Pathname(dimg.build_path('git_repo_remote', name, Digest::MD5.hexdigest(url)).to_s)
         end
 
         def fetch!(branch = nil)
@@ -61,8 +60,6 @@ module Dapp
 
         protected
 
-        attr_reader :url
-
         def git
           super(bare: true, credentials: _rugged_credentials)
         end
@@ -72,6 +69,18 @@ module Dapp
         def branch_format(name)
           "origin/#{name.reverse.chomp('origin/'.reverse).reverse}"
         end
+
+        def protocol
+          @protocol ||= begin
+            if (scheme = URI.parse(url).scheme).nil?
+              :noname
+            else
+              scheme
+            end
+          rescue URI::InvalidURIError
+            :ssh
+          end
+        end
       end
     end
   end

data/lib/dapp/dimg/image/docker.rb

@@ -22,21 +22,21 @@ module Dapp
 
         def untag!
           raise Error::Build, code: :image_already_untagged, data: { name: name } unless tagged?
-          dapp.shellout!("docker rmi #{name}")
+          dapp.shellout!("#{dapp.host_docker_bin} rmi #{name}")
           cache_reset
         end
 
         def push!
           raise Error::Build, code: :image_not_exist, data: { name: name } unless tagged?
           dapp.log_secondary_process(dapp.t(code: 'process.image_push', data: { name: name })) do
-            dapp.shellout!("docker push #{name}", log_verbose: true)
+            dapp.shellout!("#{dapp.host_docker_bin} push #{name}", verbose: true)
           end
         end
 
         def pull!
           return if tagged?
           dapp.log_secondary_process(dapp.t(code: 'process.image_pull', data: { name: name })) do
-            dapp.shellout!("docker pull #{name}", log_verbose: true)
+            dapp.shellout!("#{dapp.host_docker_bin} pull #{name}", verbose: true)
           end
           cache_reset
         end
@@ -56,7 +56,7 @@ module Dapp
         end
 
         def self.image_config_option(image_id:, option:)
-          output = ::Dapp::Dapp.shellout!("docker inspect --format='{{json .Config.#{option.to_s.capitalize}}}' #{image_id}").stdout.strip
+          output = ::Dapp::Dapp.shellout!("#{::Dapp::Dapp.host_docker_bin} inspect --format='{{json .Config.#{option.to_s.capitalize}}}' #{image_id}").stdout.strip
           output == 'null' ? [] : JSON.parse(output)
         end
 
@@ -87,18 +87,18 @@ module Dapp
             !(/^#{tag_format}$/ =~ name).nil?
           end
 
-          def tag!(id:, tag:)
-            ::Dapp::Dapp.shellout!("docker tag #{id} #{tag}")
+          def tag!(id:, tag:, verbose: false, quiet: false)
+            ::Dapp::Dapp.shellout!("#{::Dapp::Dapp.host_docker_bin} tag #{id} #{tag}", verbose: verbose, quiet: quiet)
             cache_reset
           end
 
-          def save!(image_or_images, file_path)
+          def save!(image_or_images, file_path, verbose: false, quiet: false)
             images = Array(image_or_images).join(' ')
-            ::Dapp::Dapp.shellout!("docker save -o #{file_path} #{images}", log_verbose: true)
+            ::Dapp::Dapp.shellout!("#{::Dapp::Dapp.host_docker_bin} save -o #{file_path} #{images}", verbose: verbose, quiet: quiet)
           end
 
-          def load!(file_path)
-            ::Dapp::Dapp.shellout!("docker load -i #{file_path}", log_verbose: true)
+          def load!(file_path, verbose: false, quiet: false)
+            ::Dapp::Dapp.shellout!("#{::Dapp::Dapp.host_docker_bin} load -i #{file_path}", verbose: verbose, quiet: quiet)
           end
 
           def cache
@@ -107,7 +107,7 @@ module Dapp
 
           def cache_reset(name = '')
             cache.delete(name)
-            ::Dapp::Dapp.shellout!("docker images --format='{{.Repository}}:{{.Tag}};{{.ID}};{{.CreatedAt}};{{.Size}}' --no-trunc #{name}")
+            ::Dapp::Dapp.shellout!("#{::Dapp::Dapp.host_docker_bin} images --format='{{.Repository}}:{{.Tag}};{{.ID}};{{.CreatedAt}};{{.Size}}' --no-trunc #{name}")
                         .stdout
                         .lines
                         .each do |l|

data/lib/dapp/dimg/image/scratch.rb

@@ -2,6 +2,8 @@ module Dapp
   module Dimg
     module Image
       class Scratch < Stage
+        include Helper::Tar
+
         def initialize(**_kwargs)
           super
           @from_archives = []
@@ -12,20 +14,42 @@ module Dapp
         end
 
         def build!(**_kwargs)
-          raise
-
-          # FIXME: system-shellout rejected
-          # build_from_command = if from_archives.empty?
-          #                        "#{dapp.tar_bin} c --files-from /dev/null"
-          #                      else
-          #                        "#{dapp.cat_bin} #{from_archives.join(' ')}"
-          #                      end
-          # @built_id = dapp.system_shellout!("#{build_from_command} | docker import #{prepared_change} - ").stdout.strip
+          @built_id = dapp.shellout!("docker import #{prepared_change} #{archive}").stdout.strip
+        ensure
+          FileUtils.rm_rf(tmp_path)
         end
 
         protected
 
         attr_accessor :from_archives
+
+        def archive
+          tmp_path('archive.tar').tap do |archive_path|
+            tar_write(archive_path) do |common_tar|
+              from_archives.each do |from_archive|
+                tar_gz_read(from_archive) do |tar|
+                  tar.each_entry do |entry|
+                    mode = entry.header.mode
+                    path = entry.full_name
+
+                    if entry.directory?
+                      common_tar.mkdir path, mode
+                    else
+                      common_tar.add_file path, mode do |tf|
+                        tf.write entry.read
+                      end
+                    end
+                  end
+                end
+              end
+            end
+          end
+        end
+
+        def tmp_path(*path)
+          @tmp_path ||= Dir.mktmpdir('dapp-scratch-', dapp.tmp_base_dir)
+          dapp.make_path(@tmp_path, *path).expand_path.tap { |p| p.parent.mkpath }
+        end
       end # Stage
     end # Image
   end # Dimg

data/lib/dapp/dimg/image/stage.rb

@@ -25,7 +25,7 @@ module Dapp
           run!
           @built_id = commit!
         ensure
-          dapp.shellout("docker rm #{container_name}")
+          dapp.shellout("#{dapp.host_docker_bin} rm #{container_name}")
         end
 
         def built?
@@ -70,7 +70,7 @@ module Dapp
 
         def run!
           raise Error::Build, code: :built_id_not_defined if from.built_id.nil?
-          dapp.shellout!("docker run #{prepared_options} #{from.built_id} -ec '#{prepared_bash_command}'", log_verbose: true)
+          dapp.shellout!("#{dapp.host_docker_bin} run #{prepared_options} #{from.built_id} -ec '#{prepared_bash_command}'", verbose: true)
         rescue ::Dapp::Error::Shellout => error
           dapp.log_warning(desc: { code: :launched_command, data: { command: prepared_commands.join(' && ') }, context: :container })
 
@@ -83,7 +83,7 @@ module Dapp
         end
 
         def commit!
-          dapp.shellout!("docker commit #{prepared_change} #{container_name}").stdout.strip
+          dapp.shellout!("#{dapp.host_docker_bin} commit #{prepared_change} #{container_name}").stdout.strip
         end
 
         def clone!(name)

data/lib/dapp/helper/cli.rb

@@ -69,6 +69,14 @@ module Dapp
         @composite_options ||= {}
         @composite_options[opt] ||= []
       end
+
+      def in_validate!(v, list)
+        raise OptionParser::InvalidArgument, "`#{v}` is not included in the list [#{list_msg_format(list)}]" unless list.include?(v)
+      end
+
+      def list_msg_format(list)
+        list.map { |s| "'#{s}'"}.join(', ')
+      end
     end
   end # Helper
 end # Dapp

data/lib/dapp/helper/tar.rb

@@ -0,0 +1,31 @@
+module Dapp
+  module Helper
+    module Tar
+      def tar_write(path)
+        File.open(path, File::RDWR | File::CREAT) do |f|
+          Gem::Package::TarWriter.new(f) do |tar|
+            yield tar if block_given?
+          end
+        end
+      end
+
+      def tar_read(path)
+        File.open(path, File::RDONLY) do |f|
+          Gem::Package::TarReader.new(f) do |tar|
+            yield tar if block_given?
+          end
+        end
+      end
+
+      def tar_gz_read(path)
+        File.open(path, File::RDONLY) do |f_gz|
+          Zlib::GzipReader.wrap(f_gz) do |f|
+            Gem::Package::TarReader.new(f) do |tar|
+              yield tar if block_given?
+            end
+          end
+        end
+      end
+    end # Tar
+  end # Helper
+end # Dapp

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

@@ -1,18 +1,19 @@
 module Dapp::Kube::CLI
   module Command
     class Kube < ::Dapp::CLI
-      SUBCOMMANDS = ['secret generate', 'secret key generate', 'secret file encrypt', 'deploy', 'dismiss'].freeze
+      SUBCOMMANDS = ['secret generate', 'secret key generate', 'deploy', 'dismiss', 'secret extract', 'minikube setup'].freeze
 
       banner <<BANNER.freeze
-Usage: dapp kube sub-command [sub-command options]
+Usage: dapp kube subcommand [subcommand options]
 
 Available subcommands: (for details, dapp kube SUB-COMMAND --help)
 
   dapp kube deploy [options] REPO
   dapp kube dismiss [options]
-  dapp kube secret generate [options]
   dapp kube secret key generate [options]
-  dapp kube secret file encrypt FILE_PATH [options]
+  dapp kube secret generate [FILE_PATH] [options]
+  dapp kube secret extract [FILE_PATH] [options]
+  dapp kube minikube setup
 
 Options:
 BANNER

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

@@ -30,6 +30,11 @@ BANNER
              default: [],
              proc: proc { |v| composite_options(:helm_values) << v }
 
+      option :helm_secret_values_options,
+             long: '--secret-values FILE_PATH',
+             default: [],
+             proc: proc { |v| composite_options(:helm_secret_values) << v }
+
       def run(argv = ARGV)
         self.class.parse_options(self, argv)
         repo = self.class.required_argument(self, 'repo')

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

@@ -0,0 +1,13 @@
+module Dapp::Kube::CLI::Command
+  class Kube < ::Dapp::CLI
+    class MinikubeSetup < Base
+      banner <<BANNER.freeze
+Usage:
+
+  dapp kube minikube setup
+
+Options:
+BANNER
+    end
+  end
+end

data/lib/dapp/kube/cli/command/kube/{secret_file_encrypt.rb → secret_extract.rb}

@@ -1,10 +1,10 @@
 module Dapp::Kube::CLI::Command
   class Kube < ::Dapp::CLI
-    class SecretFileEncrypt < Base
+    class SecretExtract < Base
       banner <<BANNER.freeze
 Usage:
 
-  dapp kube secret file encrypt FILE [options]
+  dapp kube secret extract [FILE_PATH] [options]
 
 Options:
 BANNER
@@ -15,7 +15,7 @@ BANNER
 
       def run(argv = ARGV)
         self.class.parse_options(self, argv)
-        file_path = self.class.required_argument(self, 'file')
+        file_path = cli_arguments.empty? ? nil : cli_arguments.first
         ::Dapp::Dapp.new(options: cli_options).public_send(run_method, file_path)
       end
     end

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

@@ -4,10 +4,20 @@ module Dapp::Kube::CLI::Command
       banner <<BANNER.freeze
 Usage:
 
-  dapp kube secret generate
+  dapp kube secret generate [FILE_PATH] [options]
 
 Options:
 BANNER
+
+      option :output_file_path,
+             short: '-o OUTPUT_FILE_PATH',
+             required: false
+
+      def run(argv = ARGV)
+        self.class.parse_options(self, argv)
+        file_path = cli_arguments.empty? ? nil : cli_arguments.first
+        ::Dapp::Dapp.new(options: cli_options).public_send(run_method, file_path)
+      end
     end
   end
 end

data/lib/dapp/kube/client.rb

@@ -7,7 +7,7 @@ module Dapp
       end
 
       def namespace
-        @namespace || kube_context_config['context']['namespace']
+        @namespace || kube_context_config['context']['namespace'] || 'default'
       end
 
       # Чтобы не перегружать методы явной передачей namespace.

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

@@ -1,7 +1,7 @@
 module Dapp
   module Kube
     module Client::Error
-      class Base < ::Dapp::Deployment::Error::Kubernetes
+      class Base < ::Dapp::Kube::Error::Kubernetes
         def initialize(**net_status)
           super(**net_status, context: :kubernetes)
         end

data/lib/dapp/kube/dapp/command/common.rb

@@ -12,19 +12,44 @@ module Dapp
           end
 
           def kube_namespace
-            options[:namespace].tr('_', '-')
+            kubernetes.namespace
+          end
+
+          def secret_key_should_exist!
+            raise(Error::Command,
+              code: :secret_key_not_found,
+              data: {not_found_in: secret_key_not_found_in.join(', ')}
+            ) if secret.nil?
           end
 
           def secret
             @secret ||= begin
-              secret_key = ENV['DAPP_SECRET_KEY']
-              secret_key ||= path('.dapp_secret_key').read.chomp if path('.dapp_secret_key').file?
+              unless secret_key = ENV['DAPP_SECRET_KEY']
+                secret_key_not_found_in << '`DAPP_SECRET_KEY`'
+
+                if dappfile_exists?
+                  file_path = path('.dapp_secret_key')
+                  if file_path.file?
+                    secret_key = path('.dapp_secret_key').read.chomp
+                  else
+                    secret_key_not_found_in << "`#{file_path}`"
+                  end
+                end
+              end
+
               Secret.new(secret_key) if secret_key
             end
           end
 
+          def secret_key_not_found_in
+            @secret_key_not_found_in ||= []
+          end
+
           def kubernetes
-            @kubernetes ||= Client.new(namespace: kube_namespace)
+            @kubernetes ||= begin
+              namespace = options[:namespace].nil? ? nil : options[:namespace].tr('_', '-')
+              Client.new(namespace: namespace)
+            end
           end
         end
       end