dapp 0.10.4 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebff6933b83298b6ecb85ea23c7a2fe1db96dea0
-  data.tar.gz: 92b09ea990eadd0be1ea22bbd55537d4f21ad9be
+  metadata.gz: b9bde6d6e0a2f2f7d9d630dfd5307d87900aefba
+  data.tar.gz: 4cfa173162595e257a8e5e0f0c8fbd70dba8c576
 SHA512:
-  metadata.gz: 92599680d7a9da9693c5796962e6522f2548749502f7f4e74201c4b0ab734de05726f0a12e966c901caedb45f03af5ea3080ecc4b1f9de269c569774df0e7bc8
-  data.tar.gz: f67dd984507cd589e1dbcf845ec57783ff53195f0cea54191968aef45179ab4f9f7675bf6f8fd6c1d224ee4930d5a0c837a26796959a47fba5d51809f2fff361
+  metadata.gz: 0a5fcb98d67e9d4111b22d4252623e661c348dfdb1bc0d7ff4404a2db8d9f1ba164782aa0953c8186edd641363f067261d251ecf8f505805daa18add74f5088e
+  data.tar.gz: 7d001567b2075340f756334d281c23d7eb4bff6331d34299e23203d79a04fb0e0730217f2c8ccf424b52862d30adf65c4f07f0046424e0046c557ae4fff0f333

data/lib/dapp.rb

@@ -64,6 +64,7 @@ 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/dapp/deps/base.rb

@@ -24,8 +24,8 @@ module Dapp
         end
 
         %w(rm rsync diff date cat
-           stat readlink test sleep mkdir
-           install sed cp true find
+           stat test sleep mkdir find
+           install sed cp true
            bash tar sudo).each do |cmd|
           define_method("#{cmd}_bin") { "/.dapp/deps/base/#{BASE_VERSION}/bin/#{cmd}" }
         end

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

@@ -30,44 +30,32 @@ module Dapp
 
           # rubocop:disable Metrics/ParameterLists
           def safe_cp(from, to, owner, group, include_paths = [], exclude_paths = [])
-            ''.tap do |cmd|
-              cmd << dimg.dapp.rsync_bin
-              cmd << ' --archive --links'
-              cmd << " --chown=#{owner}:#{group}" if owner or group
-
-              if include_paths.any?
-                # Если указали include_paths — это означает, что надо копировать
-                # только указанные пути. Поэтому exclude_paths в приоритете, т.к. в данном режиме
-                # exclude_paths может относится только к путям, указанным в include_paths.
-                # При этом случай, когда в include_paths указали более специальный путь, чем в exclude_paths,
-                # будет обрабатываться в пользу exclude, этот путь не скопируется.
-                exclude_paths.each do |p|
-                  cmd << " --filter='-/ #{File.join(from, p)}'"
-                end
-
-                include_paths.each do |p|
-                  # * На данный момент не знаем директорию или файл имел в виду пользователь,
-                  #   поэтому подставляем фильтры для обоих возможных случаев.
-                  # * Автоматом подставляем паттерн ** для включения файлов, содержащихся в
-                  #   директории, которую пользователь указал в include_paths.
-                  cmd << " --filter='+/ #{File.join(from, p)}'"
-                  cmd << " --filter='+/ #{File.join(from, p, '**')}'"
-                end
-
-                # Все что не подошло по include — исключается
-                cmd << " --filter='-/ #{File.join(from, '**')}'"
-              else
-                exclude_paths.each do |p|
-                  cmd << " --filter='-/ #{File.join(from, p)}'"
-                end
-              end
-
-              # Слэш после from — это инструкция rsync'у для копирования
-              # содержимого директории from, а не самой директории.
-              cmd << " #{from}/ #{to}"
+            credentials = ''
+            credentials += "-o #{owner} " if owner
+            credentials += "-g #{group} " if group
+            excludes = find_command_excludes(from, exclude_paths).join(' ')
+
+            copy_files = proc do |from_, path_ = ''|
+              "if [[ -d #{File.join(from_, path_)} ]] || [[ -f #{File.join(from_, path_)} ]]; then " \
+              "#{dimg.dapp.find_bin} #{File.join(from_, path_)} #{excludes} -type f -exec " \
+              "#{dimg.dapp.bash_bin} -ec '#{dimg.dapp.install_bin} -D #{credentials} \"{}\" " \
+              "\"#{File.join(to, '$(echo "{}" | ' \
+              "#{dimg.dapp.sed_bin} -e \"s/^#{from_.gsub('/', '\\/')}\\///g\")")}\"' \\; ;" \
+              'fi'
             end
+
+            commands = []
+            commands << [dimg.dapp.install_bin, credentials, '-d', to].join(' ')
+            commands.concat(include_paths.empty? ? Array(copy_files.call(from)) : include_paths.map { |path| copy_files.call(from, path) })
+            commands << "#{dimg.dapp.find_bin} #{to} -type d -exec " \
+                        "#{dimg.dapp.bash_bin} -ec '#{dimg.dapp.install_bin} -d #{credentials} {}' \\;"
+            commands.join(' && ')
           end
           # rubocop:enable Metrics/ParameterLists
+
+          def find_command_excludes(from, exclude_paths)
+            exclude_paths.map { |path| "-not \\( -path #{File.join(from, path)} -prune \\)" }
+          end
         end # ArtifactDefault
       end # Stage
     end # Build

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_checksum(self) }
+            git_artifacts.map { |git_artifact| git_artifact.stage_dependencies_checksums(self) }
           end
 
           def dependencies

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

@@ -3,6 +3,8 @@ 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,6 +3,8 @@ 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,6 +5,7 @@ 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/mod/git_artifact_dependencies.rb

@@ -0,0 +1,23 @@
+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

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

@@ -5,6 +5,7 @@ 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,27 +52,15 @@ module Dapp
         patch_command(stage.prev_g_a_stage.layer_commit(self), nil)
       end
 
-      def stage_dependencies_checksum(stage)
+      def stage_dependencies_checksums(stage, from_commit = nil, to_commit = latest_commit)
         return [] if (stage_dependencies = stages_dependencies[stage.name]).empty?
 
-        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
+        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(':::')
         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)
@@ -97,7 +85,7 @@ module Dapp
       end
 
       def latest_commit
-        @latest_commit ||= (commit || repo.latest_commit(branch))
+        @latest_commit ||= commit || repo.latest_commit(branch)
       end
 
       def paramshash
@@ -140,12 +128,8 @@ module Dapp
           Gem::Package::TarWriter.new(f) do |tar|
             diff_patches(nil, to_commit).each do |patch|
               entry = patch.delta.new_file
-              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
+              tar.add_file slice_cwd(entry[:path]), entry[:mode] do |tf|
+                tf.write repo.lookup_object(entry[:oid]).content
               end
             end
           end
@@ -229,10 +213,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,16 +15,6 @@ 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) }
@@ -32,9 +22,7 @@ module Dapp
         end
 
         def diff(from, to, **kwargs)
-          if to.nil?
-            raise "Workdir diff not supported for #{self.class}"
-          elsif from.nil?
+          if 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,16 +16,8 @@ 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 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?
+          if to.nil?
             git.lookup(from).diff_workdir(**kwargs)
           else
             super

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = '0.10.4'.freeze
-  BUILD_CACHE_VERSION = 9
+  VERSION = '0.11.0'.freeze
+  BUILD_CACHE_VERSION = 7
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.10.4
+  version: 0.11.0
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-26 00:00:00.000000000 Z
+date: 2017-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -449,6 +449,7 @@ 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
@@ -592,7 +593,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.8