dapp 0.10.2 → 0.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1c1c851ed5f27bd25dd4b3cf8bc1b27431fe81c
-  data.tar.gz: 32d35c1a530a102622ad85129d74d790a5711e4b
+  metadata.gz: aec1102e5d09b9d7a2ff35bb28197754f04542ed
+  data.tar.gz: d109455833c5662a9acc3fb68cdc0486b90b393c
 SHA512:
-  metadata.gz: 1ed7f72ee220ac672365bd00b5a1bc2b62ea10132816439b627c5df61a1297f66b7e008410bcf5f23257ee5e6e845a9c54f0361c79607c5c99faea352ba0c523
-  data.tar.gz: 495cf5dc364223895564aa19c99a6590cfe58a44f0a6c492c04aabd35c8111601cc49ac8a7ef8a20f27c96d519227706f57e4796dd701c9d33d40761ae4b5fee
+  metadata.gz: ae41e33d7e21d2fde9d8958005b7ec2e92c4e7a3aa73066d2c95721749fdf312fcdddb60d1efa5cb7778f593e59829f9694b9eef2022fa176867c3403fedffda
+  data.tar.gz: 8033a3e5a29f7e323c0ea59511645f96f7a4075d38a257c721c1c6e91f7897e342c5ceb3bd9acf276293d72486c1625cebf9df1106f7ea2910b6382a372bb7c6

data/lib/dapp.rb

@@ -64,7 +64,6 @@ require 'dapp/dimg/builder/shell'
 require 'dapp/dimg/builder/none'
 require 'dapp/dimg/build/stage/mod/logging'
 require 'dapp/dimg/build/stage/mod/group'
-require 'dapp/dimg/build/stage/mod/git_artifact_dependencies'
 require 'dapp/dimg/build/stage/base'
 require 'dapp/dimg/build/stage/ga_base'
 require 'dapp/dimg/build/stage/ga_dependencies_base'

data/lib/dapp/dimg/build/stage/base.rb

@@ -168,7 +168,7 @@ module Dapp
           end
 
           def default_git_artifacts_dependencies(git_artifacts)
-            git_artifacts.map { |git_artifact| git_artifact.stage_dependencies_checksums(self) }
+            git_artifacts.map { |git_artifact| git_artifact.stage_dependencies_checksum(self) }
           end
 
           def dependencies

data/lib/dapp/dimg/build/stage/before_setup.rb

@@ -3,8 +3,6 @@ module Dapp
     module Build
       module Stage
         class BeforeSetup < Base
-          include Mod::GitArtifactsDependencies
-
           def initialize(dimg, next_stage)
             @prev_stage = AfterInstallArtifact.new(dimg, self)
             super

data/lib/dapp/dimg/build/stage/build_artifact.rb

@@ -3,8 +3,6 @@ module Dapp
     module Build
       module Stage
         class BuildArtifact < Base
-          include Mod::GitArtifactsDependencies
-
           def initialize(dimg)
             @prev_stage = GAArtifactPatch.new(dimg, self)
             @dimg = dimg

data/lib/dapp/dimg/build/stage/install/install.rb

@@ -5,7 +5,6 @@ module Dapp
         module Install
           class Install < Base
             include Mod::Group
-            include Mod::GitArtifactsDependencies
 
             def initialize(dimg, next_stage)
               @prev_stage = GAPreInstallPatch.new(dimg, self)

data/lib/dapp/dimg/build/stage/setup/setup.rb

@@ -5,7 +5,6 @@ module Dapp
         module Setup
           class Setup < Base
             include Mod::Group
-            include Mod::GitArtifactsDependencies
 
             def initialize(dimg, next_stage)
               @prev_stage = GAPreSetupPatch.new(dimg, self)

data/lib/dapp/dimg/git_artifact.rb

@@ -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
@@ -213,10 +225,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

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = '0.10.2'.freeze
-  BUILD_CACHE_VERSION = 7
+  VERSION = '0.10.3'.freeze
+  BUILD_CACHE_VERSION = 8
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.10.3
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-07 00:00:00.000000000 Z
+date: 2017-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -449,7 +449,6 @@ files:
 - lib/dapp/dimg/build/stage/install/ga_pre_install_patch.rb
 - lib/dapp/dimg/build/stage/install/ga_pre_install_patch_dependencies.rb
 - lib/dapp/dimg/build/stage/install/install.rb
-- lib/dapp/dimg/build/stage/mod/git_artifact_dependencies.rb
 - lib/dapp/dimg/build/stage/mod/group.rb
 - lib/dapp/dimg/build/stage/mod/logging.rb
 - lib/dapp/dimg/build/stage/setup/ga_post_setup_patch.rb

data/lib/dapp/dimg/build/stage/mod/git_artifact_dependencies.rb

@@ -1,23 +0,0 @@
-module Dapp
-  module Dimg
-    module Build
-      module Stage
-        module Mod
-          module GitArtifactsDependencies
-            def local_git_artifacts_dependencies
-              dimg.local_git_artifacts.map do |git_artifact|
-                args = []
-                args << self
-                if dimg.dev_mode?
-                  args << git_artifact.latest_commit
-                  args << nil
-                end
-                git_artifact.stage_dependencies_checksums(*args)
-              end
-            end
-          end
-        end # Mod
-      end # Stage
-    end # Build
-  end # Dimg
-end # Dapp