dapp 0.14.12 → 0.14.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13bccb197061f7d78e8f74f498248f6aa2c19833
-  data.tar.gz: d5a9c8d733f8d3f9562d3af9219930220aa78c90
+  metadata.gz: 466d76237b9cd32cacddaa69e3b86b673f0fb2b9
+  data.tar.gz: f8ced9c91a8aa80d2ad9ac8b352dbcd6ac2c534a
 SHA512:
-  metadata.gz: ca8cf1edb04f43bfac8303ff27696214ce848a013d04c2c19c3e1ffa8f81274032f1e1a533459d1dce5b31a634a191e632b99d96880b9cc9030bef27e27320f9
-  data.tar.gz: b7a031ef19524e04b38cb274d5ddd5261275ffe94591401001eee285a9eff17ac78264ff39de5dc6cef1d1ad658ae95906ba54e265d83c8db7a44c8b7e2fdfbf
+  metadata.gz: 4103ba572ba370b662a8be1cf78650fa1cdf77826ad9eae30a8c2ac43efe4a5fab3ca532ace3ab33e0243b0a0ae0550f8c344e517b6f294ecd915a710dc19e6d
+  data.tar.gz: f48ce8e3229dc74e548a6f442d242c2564b02dcac0bbe2f7aebdc120884b4c1eb7343bbdd37b7dd3f6ef98878ed2184369baa70d44ae6ec4fece0582b56fe618

data/config/en/net_status.yml

@@ -116,6 +116,7 @@ en:
       commit_not_found_in_remote_git_repository: "Remote git repo `%{url}`: commit `%{commit}` not found!\nIf commit has been rebased: run command `dapp dimg stages cleanup local --improper-git-commit`!"
       branch_not_exist_in_remote_git_repository: "Remote git repo `%{url}`: branch `%{branch}` not exist!"
       rugged_protocol_not_supported: "Rugged has been compiled without support for `%{protocol}`.\nGit repositories will not be reachable via `%{protocol}` (`%{url}`).\nRugged.features should include `%{protocol}`."
+      submodule_not_supported: "Git submodules not supported! (`%{path}`)"
     lock:
       timeout: "Could not obtain lock for `%{name}` within %{timeout} seconds"
     app:

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

@@ -56,6 +56,20 @@ module Dapp
           super()
         end
 
+        def run_dapp_command(run_method, *args)
+          dapp = ::Dapp::Dapp.new(*args)
+          begin
+            dapp.host_docker_login
+            if run_method.nil?
+              yield dapp if block_given?
+            else
+              dapp.public_send(run_method)
+            end
+          ensure
+            dapp.terminate
+          end
+        end
+
         def run(_argv = ARGV)
           raise
         end

data/lib/dapp/dapp.rb

@@ -13,6 +13,7 @@ module Dapp
 
     include SshAgent
     include Helper::Sha256
+    extend Helper::Trivia
     include Helper::Trivia
     include Helper::Tar
 
@@ -24,12 +25,16 @@ module Dapp
     attr_reader :options
 
     def initialize(options: {})
-      @options = options
+      self.class.options.merge!(options)
       Logging::I18n.initialize
       validate_config_options!
       Logging::Paint.initialize(option_color)
     end
 
+    def options
+      self.class.options
+    end
+
     def name
       @name ||= begin
         if git_url
@@ -67,7 +72,7 @@ module Dapp
     end
 
     def tmp_base_dir
-      File.expand_path(options[:tmp_dir_prefix] || '/tmp')
+      self.class.tmp_base_dir
     end
 
     def build_path(*path)
@@ -98,26 +103,73 @@ module Dapp
       name
     end
 
+    def terminate
+      FileUtils.rmtree(host_docker_tmp_config_dir)
+    end
+
     def host_docker
       self.class.host_docker
     end
 
-    def self.host_docker
-      @host_docker ||= begin
-        raise Error::Dapp, code: :docker_not_found if (res = shellout('which docker')).exitstatus.nonzero?
-        docker_bin = res.stdout.strip
+    def host_docker_tmp_config_dir
+      self.class.host_docker_tmp_config_dir
+    end
+
+    def host_docker_login
+      return unless option_repo
+
+      login = proc {|u, p| shellout!("#{host_docker} login #{option_repo} -u #{u} -p #{p}")}
+      if options.key?(:registry_username) && options.key?(:registry_password)
+        login.call(options[:registry_username], options[:registry_password])
+      elsif ENV.key?('CI_JOB_TOKEN')
+        login.call('gitlab-ci-token', ENV['CI_JOB_TOKEN'])
+      end
+    end
+
+    class << self
+      def options
+        @options ||= {}
+      end
+
+      def host_docker
+        @host_docker ||= begin
+          raise Error::Dapp, code: :docker_not_found if (res = shellout('which docker')).exitstatus.nonzero?
+          docker_bin = res.stdout.strip
+
+          current_docker_version = shellout!("#{docker_bin} --version").stdout.strip
+          required_docker_version = '1.10.0'
+
+          if Gem::Version.new(required_docker_version) >= Gem::Version.new(current_docker_version[/(\d+\.)+\d+/])
+            raise Error::Dapp, code: :docker_version, data: { version: required_docker_version }
+          end
 
-        current_docker_version = shellout!("#{docker_bin} --version").stdout.strip
-        required_docker_version = '1.10.0'
+          [].tap do |cmd|
+            cmd << docker_bin
+            cmd << "--config #{host_docker_config_dir}"
+          end.join(' ')
+        end
+      end
 
-        if Gem::Version.new(required_docker_version) >= Gem::Version.new(current_docker_version[/(\d+\.)+\d+/])
-          raise Error::Dapp, code: :docker_version, data: { version: required_docker_version }
+      def host_docker_config_dir
+        if options_with_docker_credentials?
+          host_docker_tmp_config_dir
+        elsif ENV.key?('DAPP_DOCKER_CONFIG')
+          ENV['DAPP_DOCKER_CONFIG']
+        else
+          File.join(Dir.home, '.docker')
         end
+      end
+
+      def options_with_docker_credentials?
+        (options.key?(:registry_username) && options.key?(:registry_password)) || ENV.key?('CI_JOB_TOKEN')
+      end
+
+      def host_docker_tmp_config_dir
+        @host_docker_tmp_config_dir ||= Dir.mktmpdir('dapp-', tmp_base_dir)
+      end
 
-        [].tap do |cmd|
-          cmd << docker_bin
-          cmd << "--config #{ENV['DAPP_DOCKER_CONFIG']}" if ENV.key?('DAPP_DOCKER_CONFIG')
-        end.join(' ')
+      def tmp_base_dir
+        File.expand_path(options[:tmp_dir_prefix] || '/tmp')
       end
     end
   end # Dapp

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

@@ -3,7 +3,7 @@ module Dapp::Dimg::CLI
     class Base < ::Dapp::CLI::Command::Base
       def run(argv = ARGV)
         self.class.parse_options(self, argv)
-        ::Dapp::Dapp.new(options: cli_options(dimgs_patterns: cli_arguments)).public_send(run_method)
+        run_dapp_command(run_method, options: cli_options(dimgs_patterns: cli_arguments))
       end
 
       def run_method

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

@@ -50,10 +50,16 @@ BANNER
                long: '--with-stages',
                boolean: true
 
+        option :registry_username,
+               long: '--registry-username USERNAME'
+
+        option :registry_password,
+               long: '--registry-password PASSWORD'
+
         def run(argv = ARGV)
           self.class.parse_options(self, argv)
           repo = self.class.required_argument(self, 'repo')
-          ::Dapp::Dapp.new(options: cli_options(dimgs_patterns: cli_arguments, repo: repo)).public_send(class_to_lowercase)
+          run_dapp_command(run_method, options: cli_options(dimgs_patterns: cli_arguments, repo: repo))
         end
       end
     end

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

@@ -51,7 +51,9 @@ BANNER
           index = filtered_args.index('--') || filtered_args.count
           docker_options = index.nonzero? ? filtered_args.slice(0..index - 1) : []
           command = filtered_args.slice(index + 1..-1) || []
-          ::Dapp::Dapp.new(options: cli_options(dimgs_patterns: patterns)).run(docker_options, command)
+          run_dapp_command(nil, options: cli_options(dimgs_patterns: patterns)) do |dapp|
+            dapp.run(docker_options, command)
+          end
         end
       end
     end

data/lib/dapp/dimg/cli/command/dimg/stages/cleanup_local.rb

@@ -24,10 +24,16 @@ BANNER
                  long: '--improper-repo-cache',
                  boolean: true
 
+          option :registry_username,
+                 long: '--registry-username USERNAME'
+
+          option :registry_password,
+                 long: '--registry-password PASSWORD'
+
           def run(argv = ARGV)
             self.class.parse_options(self, argv)
             repository = repo
-            ::Dapp::Dapp.new(options: cli_options(dimgs_patterns: cli_arguments, repo: repository)).send(run_method)
+            run_dapp_command(run_method, options: cli_options(dimgs_patterns: cli_arguments, repo: repository))
           end
 
           def repo

data/lib/dapp/dimg/cli/command/dimg/stages/flush_local.rb

@@ -14,7 +14,7 @@ Options:
 BANNER
           def run(argv = ARGV)
             self.class.parse_options(self, argv)
-            ::Dapp::Dapp.new(options: cli_options(dimgs_patterns: cli_arguments)).stages_flush_local
+            run_dapp_command(:stages_flush_local, options: cli_options(dimgs_patterns: cli_arguments))
           end
         end
       end

data/lib/dapp/dimg/cli/command/dimg/stages/flush_repo.rb

@@ -12,10 +12,16 @@ Usage:
 
 Options:
 BANNER
+          option :registry_username,
+                 long: '--registry-username USERNAME'
+
+          option :registry_password,
+                 long: '--registry-password PASSWORD'
+
           def run(argv = ARGV)
             self.class.parse_options(self, argv)
             repo = self.class.required_argument(self, 'repo')
-            ::Dapp::Dapp.new(options: cli_options(dimgs_patterns: cli_arguments, repo: repo)).stages_flush_repo
+            run_dapp_command(:stages_flush_repo, options: cli_options(dimgs_patterns: cli_arguments, repo: repo))
           end
         end
       end

data/lib/dapp/dimg/cli/command/dimg/stages/pull.rb

@@ -16,10 +16,16 @@ BANNER
                  long: '--all',
                  boolean: true
 
+          option :registry_username,
+                 long: '--registry-username USERNAME'
+
+          option :registry_password,
+                 long: '--registry-password PASSWORD'
+
           def run(argv = ARGV)
             self.class.parse_options(self, argv)
             repo = self.class.required_argument(self, 'repo')
-            ::Dapp::Dapp.new(options: cli_options(dimgs_patterns: cli_arguments, repo: repo)).stages_pull
+            run_dapp_command(:stages_pull, options: cli_options(dimgs_patterns: cli_arguments, repo: repo))
           end
         end
       end

data/lib/dapp/dimg/cli/command/dimg/stages/push.rb

@@ -12,10 +12,16 @@ Usage:
 
 Options:
 BANNER
+          option :registry_username,
+                 long: '--registry-username USERNAME'
+
+          option :registry_password,
+                 long: '--registry-password PASSWORD'
+
           def run(argv = ARGV)
             self.class.parse_options(self, argv)
             repo = self.class.required_argument(self, 'repo')
-            ::Dapp::Dapp.new(options: cli_options(dimgs_patterns: cli_arguments, repo: repo)).stages_push
+            run_dapp_command(:stages_push, options: cli_options(dimgs_patterns: cli_arguments, repo: repo))
           end
         end
       end

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

@@ -16,7 +16,9 @@ BANNER
         def run(argv = ARGV)
           self.class.parse_options(self, argv)
           tag = self.class.required_argument(self, 'tag')
-          ::Dapp::Dapp.new(options: cli_options(dimgs_patterns: cli_arguments)).public_send(class_to_lowercase, tag)
+          run_dapp_command(nil, options: cli_options(dimgs_patterns: cli_arguments)) do
+            dapp.public_send(run_method, tag)
+          end
         end
       end
     end

data/lib/dapp/dimg/dapp/command/stages/cleanup_local.rb

@@ -35,10 +35,14 @@ module Dapp
               lock("#{name}.images") do
                 log_step_with_indent(name) do
                   dapp_dangling_images_flush
-                  dimgs, stages = dapp_images_hash.partition { |_, image_id| repo_dimgs.values.include?(image_id) }
-                  dimgs = dimgs.to_h
-                  stages = stages.to_h
-                  dimgs.each { |_, aiid| except_image_with_parents(aiid, stages) }
+                  dimgs, stages = dapp_images_hash.partition { |_, image_spec| repo_dimgs.values.include?(image_spec[:id]) }.map(&:to_h)
+                  dimgs.each { |_, dimg_spec| except_image_with_parents(dimg_spec[:id], stages) }
+
+                  # Удаление только образов старше 2ч
+                  stages.delete_if do |_, stage_spec|
+                    Time.now - stage_spec[:created_at] < 2*60*60
+                  end
+
                   remove_images(stages.keys)
                 end
               end
@@ -60,9 +64,11 @@ module Dapp
             end
 
             def dapp_images_hash
-              shellout!(%(#{host_docker} images --format "{{.Repository}}:{{.Tag}};{{.ID}}" --no-trunc #{stage_cache})).stdout.lines.map do |line|
-                line.strip.split(';')
-              end.to_h
+              shellout!(%(#{host_docker} images --format "{{.Repository}}:{{.Tag}};{{.ID}};{{.CreatedAt}}" --no-trunc #{stage_cache}))
+                .stdout.lines.map do |line|
+                  name, id, created_at = line.strip.split(';', 3)
+                  [name, {name: name, id: id, created_at: Time.parse(created_at)}]
+                end.to_h
             end
 
             def except_image_with_parents(image_id, stages)
@@ -70,11 +76,11 @@ module Dapp
                 image_dapp_artifacts_label(image_id).each { |aiid| except_image_with_parents(aiid, stages) }
                 iid = image_id
                 loop do
-                  stages.delete_if { |_, siid| siid == iid }
+                  stages.delete_if { |_, stage_spec| stage_spec[:id] == iid }
                   break if (iid = image_parent(iid)).empty?
                 end
               else
-                stages.delete_if { |_, siid| siid == image_id }
+                stages.delete_if { |_, stage_spec| stage_spec[:id] == image_id }
               end
             end
 

data/lib/dapp/dimg/docker_registry/base/authorization.rb

@@ -46,7 +46,7 @@ module Dapp
           end
 
           def auths_section_from_docker_config
-            file = Pathname(File.join(Dir.home, '.docker', 'config.json'))
+            file = Pathname(::Dapp::Dapp.host_docker_config_dir, 'config.json')
             user_not_authorized! unless file.exist?
             JSON.load(file.read)['auths'].tap { |auths| user_not_authorized! if auths.nil? }
           end

data/lib/dapp/dimg/git_artifact.rb

@@ -258,7 +258,7 @@ module Dapp
       def archive_diff_pathes(stage, from_commit, to_commit)
         diff_patches(from_commit, to_commit).each do |patch|
           entry = patch.delta.new_file
-
+          raise_if_submodule_patch!(patch)
           content = begin
             if to_commit == nil
               next unless (path = repo.path.dirname.join(entry[:path])).file?
@@ -295,11 +295,21 @@ module Dapp
 
       def patch_file(stage, from_commit, to_commit)
         File.open(repo.dimg.tmp_path('patches', patch_file_name(from_commit, to_commit)), File::RDWR | File::CREAT) do |f|
-          diff_patches(from_commit, to_commit).each { |patch| f.write change_patch_new_file_path(stage, patch) }
+          diff_patches(from_commit, to_commit).each do |patch|
+            raise_if_submodule_patch!(patch)
+            f.write change_patch_new_file_path(stage, patch)
+          end
         end
         repo.dimg.container_tmp_path('patches', patch_file_name(from_commit, to_commit))
       end
 
+      def raise_if_submodule_patch!(patch) # FIXME
+        entry = patch.delta.new_file
+        if entry[:mode] == 57344 # submodule
+          raise Error::Rugged, code: :submodule_not_supported, data: { path: repo.path.dirname.join(entry[:path]) }
+        end
+      end
+
       # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       def change_patch_new_file_path(stage, patch)
         patch.to_s.lines.tap do |lines|

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

@@ -3,7 +3,7 @@ module Dapp::Kube::CLI
     class Base < ::Dapp::CLI::Command::Base
       def run(argv = ARGV)
         self.class.parse_options(self, argv)
-        ::Dapp::Dapp.new(options: cli_options).public_send(run_method)
+        run_dapp_command(run_method, options: cli_options)
       end
 
       def run_method

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

@@ -41,10 +41,16 @@ 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'
+
       def run(argv = ARGV)
         self.class.parse_options(self, argv)
         repo = self.class.required_argument(self, 'repo')
-        ::Dapp::Dapp.new(options: cli_options(repo: repo)).public_send(run_method)
+        run_dapp_command(run_method, options: cli_options(repo: repo))
       end
     end
   end

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

@@ -17,7 +17,9 @@ BANNER
       def run(argv = ARGV)
         self.class.parse_options(self, argv)
         file_path = self.class.required_argument(self, 'FILE_PATH')
-        ::Dapp::Dapp.new(options: cli_options).public_send(run_method, file_path)
+        run_dapp_command(nil, options: cli_options) do |dapp|
+          dapp.public_send(run_method, file_path)
+        end
       end
     end
   end

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

@@ -26,7 +26,9 @@ BANNER
             self.class.required_argument(self, 'FILE_PATH')
           end
         end
-        ::Dapp::Dapp.new(options: cli_options).public_send(run_method, file_path)
+        run_dapp_command(nil, options: cli_options) do |dapp|
+          dapp.public_send(run_method, file_path)
+        end
       end
     end
   end

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

@@ -21,7 +21,9 @@ BANNER
       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)
+        run_dapp_command(nil, options: cli_options) do |dapp|
+          dapp.public_send(run_method, file_path)
+        end
       end
     end
   end

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

@@ -16,7 +16,9 @@ BANNER
 
       def run(argv = ARGV)
         self.class.parse_options(self, argv)
-        ::Dapp::Dapp.new(options: cli_options).public_send(run_method, *cli_arguments)
+        run_dapp_command(nil, options: cli_options) do |dapp|
+          dapp.public_send(run_method, *cli_arguments)
+        end
       end
     end
   end

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = '0.14.12'.freeze
+  VERSION = '0.14.13'.freeze
   BUILD_CACHE_VERSION = 16
 end

metadata

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