dapp 0.12.5 → 0.12.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d25709523dd172df086e6c7de18bb46739dbfc78
-  data.tar.gz: f14424ea795a7c5b9de80e7a3057764cf98bb81f
+  metadata.gz: 6d1e9d464c7b24a1359245aed3b9b49d4eb606fd
+  data.tar.gz: 203871c1836df77f375baf8322edfff1306cb5f7
 SHA512:
-  metadata.gz: b18fa97693998f875380bc32d8911052120097a7a4f58e1381855496551aee42a9a094fdec1cacba7010b44b4a74af1813e36cfd19ca508df4b841b609613e37
-  data.tar.gz: da2e9deb6a8ded95c121c7e8a7b338b3444f1e1fc5035f2b980c954fb7fb68dbe84d106cc6b1ec39fe81eef7c392b3357b93ea3d23a82799e9f18da5754c9b28
+  metadata.gz: 4b29e0ed69188e7172a0c540166aa29e2303f25150e7bb6a86df4dbe2deeeaaa86dc01e45699dee163fbcb4f7b0b3f0228526dc0954d7c70e112d177045e1742
+  data.tar.gz: 44ae5e00c9c1f6c5256010723e383546235a6778ece650177d0e3c6d8649bb15ebb7764ef92075fce71fa9c6c552cfd17358be2fe9fec4a85c62ba65bbf22aa8

data/config/en/common.yml

@@ -13,8 +13,8 @@ en:
     process:
       artifact_copy: "copying artifact `%{name}`"
       artifact_building: "building artifact `%{name}`"
-      git_artifact_clone: "cloning remote git_artifact `%{name}`"
-      git_artifact_fetch: "fetching remote git_artifact `%{name}`"
+      git_artifact_clone: "cloning remote git_artifact `%{url}`"
+      git_artifact_fetch: "fetching remote git_artifact `%{url}`"
       vendoring_builder_cookbooks: 'vendoring builder cookbooks'
       waiting_resouce_lock: "waiting for locked resource `%{name}`"
       gitartifact_container_creating: 'creating dappdeps/gitartifact container'

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

@@ -46,12 +46,19 @@ module Dapp
                 end
 
                 include_paths.each do |p|
+                  target_path = File.join(from, p)
+
+                  # Генерируем разрешающее правило для каждого элемента пути
+                  Pathname.new(target_path).descend do |path_part|
+                    cmd << " --filter='+/ #{path_part}'"
+                  end
+
                   # * На данный момент не знаем директорию или файл имел в виду пользователь,
                   #   поэтому подставляем фильтры для обоих возможных случаев.
                   # * Автоматом подставляем паттерн ** для включения файлов, содержащихся в
                   #   директории, которую пользователь указал в include_paths.
-                  cmd << " --filter='+/ #{File.join(from, p)}'"
-                  cmd << " --filter='+/ #{File.join(from, p, '**')}'"
+                  cmd << " --filter='+/ #{target_path}'"
+                  cmd << " --filter='+/ #{File.join(target_path, '**')}'"
                 end
 
                 # Все что не подошло по include — исключается

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

@@ -7,7 +7,7 @@ module Dapp
 
           @url = url
 
-          dimg.dapp.log_secondary_process(dimg.dapp.t(code: 'process.git_artifact_clone', data: { name: name }), short: true) do
+          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)
             rescue Rugged::NetworkError, Rugged::SslError => e
@@ -39,7 +39,7 @@ module Dapp
 
         def fetch!(branch = nil)
           branch ||= self.branch
-          dimg.dapp.log_secondary_process(dimg.dapp.t(code: 'process.git_artifact_fetch', data: { name: name }), short: true) do
+          dimg.dapp.log_secondary_process(dimg.dapp.t(code: 'process.git_artifact_fetch', data: { url: url }), short: true) do
             git.fetch('origin', [branch], credentials: _rugged_credentials)
             raise Error::Rugged, code: :branch_not_exist_in_remote_git_repository, data: { branch: branch, url: url } unless branch_exist?(branch)
           end unless dimg.ignore_git_fetch || dimg.dapp.dry_run?

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = '0.12.5'.freeze
-  BUILD_CACHE_VERSION = 11
+  VERSION = '0.12.6'.freeze
+  BUILD_CACHE_VERSION = 12
 end

metadata

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