dapp 0.31.6 → 0.31.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d3190dfca5d24fa447236af2b05be0a2448a2a48fb65694046c26f0330ee0ab
-  data.tar.gz: 6abd69f98d78a77640fc14d010d6f059cef55fc77aa125bc16276599b0b3cce4
+  metadata.gz: fd9c97ad66f0ed5aa2cace3d28b92f0faeab22173d934796cb497311525997e7
+  data.tar.gz: 6e6a8ff3a219c17759ece0d86f610db9c83a0629cff62aa6321197b9e1b0c6b1
 SHA512:
-  metadata.gz: b031c116de1204ec2854e34f76f4d46eaa60ce52dd2e059a3a0cd5470cf89a71cd3d55ad31c55d1ccba24edae1a2b76d0bc1af3669947f0736b555fef5e5cb3c
-  data.tar.gz: a9e6c93fe9d77f0798cb84ffda9dec64b59d7021e0ff59de32865aca2c21b846f3bd424acfa849ace184753bdd92c481f64ef0fd7a9a58a1305365268c43086d
+  metadata.gz: d1e636cd82217a4d42b0912addae3e82e531eb8d2c4101601007e7ba45ee586c05a03ccfda936e900bf6049c1da0f328730e4a9795617407e8ea79d78b9047e6
+  data.tar.gz: 53d516b0f8d109dd65550c35125674c3f06a635e5624ca942785296bc1c54f2bbafea25be72b5d8ad89aac671eb64fbe0cdf2324e717ca52ca2b7bc245148852

data/config/en/common.yml

@@ -66,6 +66,8 @@ en:
       stage_dependencies_not_found: "WARNING: Stage dependencies `%{dependencies}` haven't been found in repo `%{repo}`!"
       stage_dependencies_file_not_found: "WARNING: Stage dependencies `%{dependencies}` haven't been found in repo `%{repo}`!\nIf you want to consider specific file you should use one of the following git-artifact configuration:\n\n```\ngit:\n- add: /folder/file\n  to: /folder/file\n  stageDependencies:\n    install: ''\n```\n\n```\ngit:\n- add: /folder\n  to: /folder\n  includePaths: file\n  stageDependencies:\n    install: file\n```"
       unsupported_dapp_config_options: "WARNING: .dapp_config includes unsupported options [%{options}]: use only following options [%{supported_options}]"
+      submodule_mapping_not_found: "WARNING: Repository `%{repo}`: No submodule mapping found in `.gitmodules` for path `%{path}`!"
+      submodule_url_scheme_not_detected: "WARNING: Submodule url scheme of `%{url}` not detected: using local repository `%{path}`!"
     group:
       install: 'Install group'
       setup: 'Setup group'

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

@@ -57,14 +57,27 @@ module Dapp
           {}.tap do |params|
             params[:path]   = submodule.path
             params[:url]    = submodule_url(submodule.url)
-            params[:type]   = url_protocol(params[:url]) == :noname ? :local : :remote
+            params[:type]   = begin
+              if url_protocol(params[:url]) == :noname
+                submodule_absolute_path = File.join(File.dirname(path), params[:path])
+                dapp.log_warning(desc: { code: :submodule_url_scheme_not_detected,
+                                         data: { url: params[:url], path: submodule_absolute_path } })
+                :local
+              else
+                :remote
+              end
+            end
             params[:commit] = submodule.head_oid
           end
         end
 
         def submodules(commit, paths: [], exclude_paths: [])
-          Rugged::SubmoduleCollection.new(submodules_git(commit))
-            .select { |s| !ignore_directory?(s.path, paths: paths, exclude_paths: exclude_paths) }
+          Rugged::SubmoduleCollection.new(submodules_git(commit)).select do |submodule|
+            next false if ignore_directory?(submodule.path, paths: paths, exclude_paths: exclude_paths)
+            next true  if submodule.in_config?
+            dapp.log_warning(desc: { code: :submodule_mapping_not_found,
+                                     data: { path: submodule.path, repo: name } })
+          end
         end
 
         def submodules_git(commit)
@@ -75,7 +88,7 @@ module Dapp
               else
                 Rugged::Repository.clone_at(path.to_s, git_path.to_s).tap do |submodules_git|
                   begin
-                    submodules_git.checkout_tree(submodules_git.lookup(commit).tree)
+                    submodules_git.checkout(commit, strategy: :force)
                   rescue Rugged::ReferenceError
                     raise_submodule_commit_not_found!(commit)
                   end

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

@@ -28,7 +28,6 @@ module Dapp
 
         def submodules_params(commit, paths: [], exclude_paths: [])
           submodules(commit, paths: paths, exclude_paths: exclude_paths).map do |submodule|
-            next if commit.nil? && !submodule.in_config?
             submodule_params(submodule).tap do |params|
               params[:commit] = submodule.workdir_oid || params[:commit] if commit.nil?
               if submodule.in_workdir? && !submodule.uninitialized?

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = "0.31.6"
+  VERSION = "0.31.7"
   BUILD_CACHE_VERSION = 30
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.31.6
+  version: 0.31.7
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-10 00:00:00.000000000 Z
+date: 2018-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout