dapp 0.11.0 → 0.12.0

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

@@ -1,6 +1,6 @@
 module Dapp
   module Dimg
-    class Dapp
+    module Dapp
       module Command
         module Run
           def run(docker_options, command)

data/lib/dapp/dimg/dapp/command/spush.rb

@@ -1,10 +1,11 @@
 module Dapp
   module Dimg
-    class Dapp
+    module Dapp
       module Command
         module Spush
-          def spush(repo)
-            validate_repo_name(repo)
+          def spush
+            repo = option_repo
+            validate_repo_name!(repo)
             one_dimg!
             Dimg.new(config: build_configs.first, dapp: self, ignore_git_fetch: true, should_be_built: true).tap do |dimg|
               dimg.export!(repo, format: spush_format)

data/lib/dapp/dimg/dapp/command/stage_image.rb

@@ -1,11 +1,11 @@
 module Dapp
   module Dimg
-    class Dapp
+    module Dapp
       module Command
         module StageImage
           def stage_image
             one_dimg!
-            puts Dimg.new(config: build_configs.first, dapp: self, ignore_git_fetch: true).stage_image_name(cli_options[:stage])
+            puts Dimg.new(config: build_configs.first, dapp: self, ignore_git_fetch: true).stage_image_name(options[:stage])
           end
         end
       end

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

@@ -1,6 +1,6 @@
 module Dapp
   module Dimg
-    class Dapp
+    module Dapp
       module Command
         module Stages
           module CleanupLocal

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

@@ -1,11 +1,11 @@
 module Dapp
   module Dimg
-    class Dapp
+    module Dapp
       module Command
         module Stages
           module CleanupRepo
-            def stages_cleanup_repo(repo)
-              lock_repo(repo) do
+            def stages_cleanup_repo
+              lock_repo(repo = option_repo) do
                 raise Error::Command, code: :stages_cleanup_required_option unless stages_cleanup_option?
 
                 registry = registry(repo)

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

@@ -1,13 +1,13 @@
 module Dapp
   module Dimg
-    class Dapp
+    module Dapp
       module Command
         module Stages
           module Common
             protected
 
             def registry(repo)
-              validate_repo_name(repo)
+              validate_repo_name!(repo)
               ::Dapp::Dimg::DockerRegistry.new(repo)
             end
 
@@ -59,11 +59,11 @@ module Dapp
             end
 
             def proper_repo_cache?
-              !!cli_options[:proper_repo_cache]
+              !!options[:proper_repo_cache]
             end
 
             def proper_git_commit?
-              !!cli_options[:proper_git_commit]
+              !!options[:proper_git_commit]
             end
 
             def stages_cleanup_option?

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

@@ -1,6 +1,6 @@
 module Dapp
   module Dimg
-    class Dapp
+    module Dapp
       module Command
         module Stages
           module FlushLocal

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

@@ -1,6 +1,6 @@
 module Dapp
   module Dimg
-    class Dapp
+    module Dapp
       module Command
         module Stages
           module FlushRepo

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

@@ -1,11 +1,12 @@
 module Dapp
   module Dimg
-    class Dapp
+    module Dapp
       module Command
         module Stages
           module Pull
-            def stages_pull(repo)
-              validate_repo_name(repo)
+            def stages_pull
+              repo = option_repo
+              validate_repo_name!(repo)
               build_configs.each do |config|
                 log_dimg_name_with_indent(config) do
                   Dimg.new(config: config, dapp: self, ignore_git_fetch: true).tap do |dimg|
@@ -16,7 +17,7 @@ module Dapp
             end
 
             def pull_all_stages?
-              !!cli_options[:pull_all_stages]
+              !!options[:pull_all_stages]
             end
           end
         end

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

@@ -1,11 +1,12 @@
 module Dapp
   module Dimg
-    class Dapp
+    module Dapp
       module Command
         module Stages
           module Push
-            def stages_push(repo)
-              validate_repo_name(repo)
+            def stages_push
+              repo = option_repo
+              validate_repo_name!(repo)
               build_configs.each do |config|
                 log_dimg_name_with_indent(config) do
                   Dimg.new(config: config, dapp: self, ignore_git_fetch: true, should_be_built: true).tap do |dimg|

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

@@ -1,11 +1,12 @@
 module Dapp
   module Dimg
-    class Dapp
+    module Dapp
       module Command
         module Tag
           def tag(tag)
             one_dimg!
-            raise Error::Command, code: :tag_command_incorrect_tag, data: { name: tag } unless ::Dapp::Dimg::Image::Docker.image_name?(tag)
+            validate_image_name!(tag)
+
             Dimg.new(config: build_configs.first, dapp: self, ignore_git_fetch: true, should_be_built: true).tap do |app|
               app.tag!(tag)
             end

data/lib/dapp/dimg/dapp/dapp.rb

@@ -0,0 +1,33 @@
+module Dapp
+  module Dimg
+    module Dapp
+      module Dapp
+        include Dappfile
+
+        include Command::Common
+        include Command::Run
+        include Command::Build
+        include Command::Bp
+        include Command::Push
+        include Command::Spush
+        include Command::Tag
+        include Command::List
+        include Command::Stages::CleanupLocal
+        include Command::Stages::CleanupRepo
+        include Command::Stages::FlushLocal
+        include Command::Stages::FlushRepo
+        include Command::Stages::Push
+        include Command::Stages::Pull
+        include Command::Stages::Common
+        include Command::Cleanup
+        include Command::Mrproper
+        include Command::StageImage
+        include Command::BuildContext::Import
+        include Command::BuildContext::Export
+        include Command::BuildContext::Common
+      end
+    end
+  end
+end
+
+::Dapp::Dapp.send(:include, ::Dapp::Dimg::Dapp::Dapp)

data/lib/dapp/dimg/dapp/dappfile.rb

@@ -0,0 +1,25 @@
+module Dapp
+  module Dimg
+    module Dapp
+      module Dappfile
+        def build_configs
+          @build_configs ||= begin
+            config._dimg.select do |dimg|
+              dimgs_patterns.any? { |pattern| dimg._name.nil? || File.fnmatch(pattern, dimg._name) }
+            end.tap do |dimgs|
+              raise ::Dapp::Error::Dapp, code: :no_such_dimg, data: { dimgs_patterns: dimgs_patterns.join(', ') } if dimgs.empty?
+            end
+          end
+        end
+
+        def dimgs_patterns
+          @dimgs_patterns ||= begin
+            (options[:dimgs_patterns] || []).tap do |dimgs_patterns|
+              dimgs_patterns << '*' unless dimgs_patterns.any?
+            end
+          end
+        end
+      end # Dappfile
+    end # Dapp
+  end # Dimg
+end # Dapp

data/lib/dapp/dimg/dimg.rb

@@ -130,7 +130,7 @@ module Dapp
       end
 
       def stage_image_name(stage_name)
-        stages.find { |stage| stage.send(:name) == stage_name }.image.name
+        stages.find { |stage| stage.name == stage_name }.image.name
       end
 
       def builder
@@ -150,7 +150,7 @@ module Dapp
       end
 
       def dev_mode?
-        config._dev_mode || dapp.dev_mode?
+        dapp.dev_mode?
       end
 
       def build_cache_version
@@ -168,7 +168,7 @@ module Dapp
       end
 
       def stage_should_be_introspected?(name)
-        dapp.cli_options[:introspect_stage] == name
+        dapp.options[:introspect_stage] == name
       end
 
       protected

data/lib/dapp/dimg/dimg/path.rb

@@ -7,7 +7,7 @@ module Dapp
         end
 
         def tmp_path(*path)
-          @tmp_path ||= Dir.mktmpdir('dapp-', dapp.cli_options[:tmp_dir_prefix] || '/tmp')
+          @tmp_path ||= Dir.mktmpdir('dapp-', dapp.options[:tmp_dir_prefix] || '/tmp')
           make_path(@tmp_path, *path).expand_path.tap { |p| p.parent.mkpath }
         end
 

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

@@ -3,7 +3,7 @@ module Dapp
     class Dimg
       module Stages
         def signature
-          last_stage.send(:signature)
+          last_stage.signature
         end
 
         def stage_by_name(name)

data/lib/dapp/dimg/dimg/tags.rb

@@ -15,23 +15,23 @@ module Dapp
         end
 
         def simple_tags
-          dapp.cli_options[:tag]
+          dapp.options[:tag]
         end
 
         def branch_tags
-          return [] unless dapp.cli_options[:tag_branch]
+          return [] unless dapp.options[:tag_branch]
           raise Error::Dimg, code: :git_branch_without_name if (branch = git_repo.branch) == 'HEAD'
           [branch]
         end
 
         def commit_tags
-          return [] unless dapp.cli_options[:tag_commit]
+          return [] unless dapp.options[:tag_commit]
           commit = git_repo.latest_commit
           [commit]
         end
 
         def build_tags
-          return [] unless dapp.cli_options[:tag_build_id]
+          return [] unless dapp.options[:tag_build_id]
 
           if ENV['GITLAB_CI']
             build_id = ENV['CI_BUILD_ID']
@@ -45,7 +45,7 @@ module Dapp
         end
 
         def ci_tags
-          return [] unless dapp.cli_options[:tag_ci]
+          return [] unless dapp.options[:tag_ci]
 
           if ENV['GITLAB_CI']
             branch = ENV['CI_BUILD_REF_NAME']

data/lib/dapp/dimg/docker_registry.rb

@@ -15,13 +15,9 @@ module Dapp
       end
 
       def self.repo_name_format
-        separator = '[_.]|__|[-]*'
-        alpha_numeric = '[[:alnum:]]*'
-        component = "#{alpha_numeric}[#{separator}#{alpha_numeric}]*"
-        port_number = '[[:digit:]]+'
-        hostcomponent = '[[:alnum:]_-]*[[:alnum:]]'
-        hostname = "#{hostcomponent}[\\.#{hostcomponent}]*(?<port>:#{port_number})?"
-        "(?<hostname>#{hostname}/)?(?<repo_suffix>#{component}[/#{component}]*)"
+        rpart = '[a-z0-9]+(([_.]|__|-+)[a-z0-9]+)*'
+        hpart = '(?!-)[a-z0-9-]+(?<!-)'
+        "(?<hostname>#{hpart}(\\.#{hpart})*(?<port>:[0-9]+)?\/)?(?<repo_suffix>#{rpart}(\/#{rpart})*)"
       end
 
       def self.repo_name?(name)

data/lib/dapp/dimg/git_artifact.rb

@@ -12,7 +12,7 @@ module Dapp
         @repo = repo
         @name = name
 
-        @branch = branch || repo.dimg.dapp.cli_options[:git_artifact_branch] || repo.branch
+        @branch = branch || repo.dimg.dapp.options[:git_artifact_branch] || repo.branch
         @commit = commit
 
         @to = to
@@ -52,15 +52,27 @@ module Dapp
         patch_command(stage.prev_g_a_stage.layer_commit(self), nil)
       end
 
-      def stage_dependencies_checksums(stage, from_commit = nil, to_commit = latest_commit)
+      def stage_dependencies_checksum(stage)
         return [] if (stage_dependencies = stages_dependencies[stage.name]).empty?
 
-        paths = include_paths(true) + base_paths(stage_dependencies, true)
-        diff_patches(from_commit, to_commit, paths: paths).map do |patch|
-          delta_new_file = patch.delta.new_file
-          content = patch.hunks.map { |h| h.lines.select { |l| l.line_origin == :context }.map(&:content).join }.join
-          Digest::SHA256.hexdigest [delta_new_file[:path], content].join(':::')
+        paths = (include_paths(true) + base_paths(stage_dependencies, true)).uniq
+
+        to_commit = if repo.is_a? GitRepo::Own and repo.dimg.dev_mode?
+          nil
+        else
+          latest_commit
         end
+
+        diff_patches(nil, to_commit, paths: paths)
+          .sort_by {|patch| patch.delta.new_file[:path]}
+          .reduce(nil) {|prev_hash, patch|
+            Digest::SHA256.hexdigest [
+              prev_hash,
+              patch.delta.new_file[:path],
+              patch.delta.new_file[:mode].to_s,
+              patch.to_s
+            ].compact.join(':::')
+          }
       end
 
       def patch_size(from, to)
@@ -85,7 +97,7 @@ module Dapp
       end
 
       def latest_commit
-        @latest_commit ||= commit || repo.latest_commit(branch)
+        @latest_commit ||= (commit || repo.latest_commit(branch))
       end
 
       def paramshash
@@ -128,8 +140,12 @@ module Dapp
           Gem::Package::TarWriter.new(f) do |tar|
             diff_patches(nil, to_commit).each do |patch|
               entry = patch.delta.new_file
-              tar.add_file slice_cwd(entry[:path]), entry[:mode] do |tf|
-                tf.write repo.lookup_object(entry[:oid]).content
+              if entry[:mode] == 40960 # symlink
+                tar.add_symlink slice_cwd(entry[:path]), repo.lookup_object(entry[:oid]).content, entry[:mode]
+              else
+                tar.add_file slice_cwd(entry[:path]), entry[:mode] do |tf|
+                  tf.write repo.lookup_object(entry[:oid]).content
+                end
               end
             end
           end
@@ -213,10 +229,10 @@ module Dapp
       end
 
       def diff_patches(from, to, paths: include_paths_or_cwd)
-        (@diff_patches ||= {})[[from, to, paths]] = repo.patches(from, to,
-                                                                 paths: paths,
-                                                                 exclude_paths: exclude_paths(true),
-                                                                 force_text: true)
+        (@diff_patches ||= {})[[from, to, paths]] ||= repo.patches(from, to,
+                                                                   paths: paths,
+                                                                   exclude_paths: exclude_paths(true),
+                                                                   force_text: true)
       end
 
       def include_paths_or_cwd

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

@@ -15,6 +15,16 @@ module Dapp
           []
         end
 
+        # FIXME: Убрать логику исключения путей exclude_paths из данного класса,
+        # FIXME: т.к. большинство методов не поддерживают инвариант
+        # FIXME "всегда выдавать данные с исключенными путями".
+        # FIXME: Например, метод diff выдает данные без учета exclude_paths.
+        # FIXME: Лучше перенести фильтрацию в GitArtifact::diff_patches.
+        # FIXME: ИЛИ обеспечить этот инвариант, но это ограничит в возможностях
+        # FIXME: использование Rugged извне этого класса и это более сложный путь.
+        # FIXME: Лучше сейчас убрать фильтрацию, а добавить ее когда наберется достаточно
+        # FIXME: примеров использования.
+
         def patches(from, to, exclude_paths: [], **kwargs)
           diff(from, to, **kwargs).patches.select do |patch|
             !exclude_paths.any? { |p| check_path?(patch.delta.new_file[:path], p) }
@@ -22,7 +32,9 @@ module Dapp
         end
 
         def diff(from, to, **kwargs)
-          if from.nil?
+          if to.nil?
+            raise "Workdir diff not supported for #{self.class}"
+          elsif from.nil?
             Rugged::Tree.diff(git, nil, to, **kwargs)
           else
             lookup_commit(from).diff(lookup_commit(to), **kwargs)

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

@@ -16,8 +16,16 @@ module Dapp
           raise Error::Rugged, code: :local_git_repository_does_not_exist
         end
 
+        # NOTICE: Параметры {from: nil, to: nil} можно указать только для Own repo.
+        # NOTICE: Для Remote repo такой вызов не имеет смысла и это ошибка пользователя класса Remote.
+
         def diff(from, to, **kwargs)
-          if to.nil?
+          if from.nil? and to.nil?
+            mid_commit = latest_commit
+            diff_obj = super(nil, mid_commit, **kwargs)
+            diff_obj.merge! git.lookup(mid_commit).diff_workdir(**kwargs)
+            diff_obj
+          elsif to.nil?
             git.lookup(from).diff_workdir(**kwargs)
           else
             super