dapp 0.31.0 → 0.31.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5589825e906db3c287d0abc4cd312c9fcc8efc96e36945cb7e3655370d8b288d
-  data.tar.gz: a0164e08a37faf5f8c03bba714da833458ae7081549085e8aecf6a089f51f003
+  metadata.gz: acbc086c66b025c8c5740bfff5d0bdee5e741f66eca42099f0beeacb5a5af2ff
+  data.tar.gz: 3540b080c1791f3be5ecc317ed2350fe70f3fda3c3e3ac089d74a636ecad46ab
 SHA512:
-  metadata.gz: bafb007a39acc411b6add0c23a6f437120e7dd8235aeb9382de3ad025d8800e4cc1f7acd586d6eca933f0f45ef1d52e09bc358977f8d05f869098ffd0ba1076e
-  data.tar.gz: ea5c715b0f06b4170b424ec2231504e951e9b12f54a783dee04327cd662a802316a2274313d9cf61fd42eb0140d7be798643b17127f8230e7e33dd2cb6a44a16
+  metadata.gz: c32d9de226d357c3bfddb6891b3ebb7832738c7886fc0a7e61fd31b702d46435d119d3390996b3c734f7fb04b805b91bd8689b5686ceb8a4f7f0f591d6a3d7a9
+  data.tar.gz: 792857d5e53d9818b688b9599f3793f619261529cb86e7a82e8a6aa9aca5f0e348d06c684a44a8229618645cd662085238625baf7badb2e39b79afdd0ee24c35

data/config/en/common.yml

@@ -64,6 +64,7 @@ en:
       dapp_secret_key_not_found: "WARNING: Secrets haven't decoded: secret key not found in %{not_found_in}!"
       introspect_image_impossible: "WARNING: You can't introspect stage `%{name}`!"
       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}]"
     group:
       install: 'Install group'

data/config/en/net_status.yml

@@ -124,8 +124,10 @@ en:
       git_repository_reference_error: "Git repo `%{name}`: %{message}!"
       rugged_remote_error: "Remote git repo `%{url}`: `%{message}`!"
       local_git_repository_does_not_exist: "Local git repo (`%{path}`): doesn't exist!"
-      commit_not_found_in_local_git_repository: "Local git repo: commit `%{commit}` not found!\nIf commit has been rebased: run command `dapp dimg stages cleanup local --improper-git-commit`!"
+      commit_not_found_in_local_git_repository: "Local git repo (`%{path}`): commit `%{commit}` not found!\nIf commit has been rebased: run command `dapp dimg stages cleanup local --improper-git-commit`!"
       commit_not_found_in_remote_git_repository: "Remote git repo `%{url}`: commit `%{commit}` not found!\nIf commit has been rebased: run command `dapp dimg stages cleanup local --improper-git-commit`!"
+      git_local_submodule_commit_not_found: "Git repo `%{path}`: submodule commit `%{commit}` not found!"
+      git_remote_submodule_commit_not_found: "Git repo `%{url}`: submodule commit `%{commit}` not found!"
       branch_not_exist_in_remote_git_repository: "Remote git repo `%{url}`: branch `%{branch}` not exist!"
       rugged_protocol_not_supported: "Rugged has been compiled without support for `%{protocol}`.\nGit repositories will not be reachable via `%{protocol}` (`%{url}`).\nRugged.features should include `%{protocol}`."
       git_local_incorrect_gitmodules_params: "Local git repo with invalid `.gitmodules` file: %{error}"

data/lib/dapp/dimg/git_artifact.rb

@@ -158,19 +158,21 @@ module Dapp
         elsif cwd == ''
           :directory
         else
-          commit = repo.lookup_commit(stage.layer_commit(self))
+          cwd_type_by_commit(repo.lookup_commit(stage.layer_commit(self)))
+        end
+      end
 
-          cwd_entry = begin
-            commit.tree.path(cwd)
-          rescue Rugged::TreeError
-          end
+      def cwd_type_by_commit(commit)
+        cwd_entry = begin
+          commit.tree.path(cwd)
+        rescue Rugged::TreeError
+        end
 
-          if cwd_entry
-            if cwd_entry[:type] == :tree
-              :directory
-            else
-              :file
-            end
+        if cwd_entry
+          if cwd_entry[:type] == :tree
+            :directory
+          else
+            :file
           end
         end
       end
@@ -248,13 +250,16 @@ module Dapp
 
         stage_dependencies_key = [stage.name, commit]
 
+        @stage_dependencies_warning ||= {}
         @stage_dependencies_checksums ||= {}
         @stage_dependencies_checksums[stage_dependencies_key] ||= begin
           if dev_mode?
             dev_patch_hash(paths: paths)
           else
-            if (entries = repo_entries(commit, paths: paths)).empty?
-              repo.dapp.log_warning(desc: { code: :stage_dependencies_not_found,
+            if (entries = repo_entries(commit, paths: paths)).empty? && @stage_dependencies_warning[stage.name].nil?
+              @stage_dependencies_warning[stage.name] = true
+              code = cwd_type_by_commit(repo.lookup_commit(commit)) == :file ? :stage_dependencies_file_not_found : :stage_dependencies_not_found
+              repo.dapp.log_warning(desc: { code: code,
                                             data: { repo: repo.respond_to?(:url) ? repo.url : 'local',
                                                     dependencies: stage_dependencies.join(', ') } })
             end

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

@@ -67,8 +67,30 @@ module Dapp
             .select { |s| !ignore_directory?(s.path, paths: paths, exclude_paths: exclude_paths) }
         end
 
-        def submodules_git(_)
-          git
+        def submodules_git(commit)
+          submodules_git_path(commit).tap do |git_path|
+            break begin
+              if git_path.directory?
+                Rugged::Repository.new(git_path.to_s)
+              else
+                Rugged::Repository.clone_at(path.to_s, git_path.to_s).tap do |submodules_git|
+                  begin
+                    submodules_git.checkout(commit)
+                  rescue Rugged::ReferenceError
+                    raise_submodule_commit_not_found!(commit)
+                  end
+                end
+              end
+            end
+          end
+        end
+
+        def submodules_git_path(commit)
+          Pathname(File.join(dapp.host_docker_tmp_config_dir, "submodule", dapp.consistent_uniq_slugify(name), commit).to_s)
+        end
+
+        def raise_submodule_commit_not_found!(_)
+          raise
         end
 
         def submodule_url(gitsubmodule_url)

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

@@ -30,18 +30,19 @@ module Dapp
           submodules(commit, paths: paths, exclude_paths: exclude_paths).map do |submodule|
             next if commit.nil? && !submodule.in_config?
             submodule_params(submodule).tap do |params|
-              if commit.nil?
-                submodule_path = File.join(workdir_path, params[:path])
-                params[:commit] = submodule.workdir_oid || submodule.head_oid
-                if git_repo_exist?(submodule_path)
-                  dapp.log_info("Using local submodule `#{params[:path]}`!")
-                  params[:type] = :local
-                end
+              params[:commit] = submodule.workdir_oid || params[:commit] if commit.nil?
+              if submodule.in_workdir? && !submodule.uninitialized?
+                dapp.log_info("Using local submodule repository `#{params[:path]}`!")
+                params[:type] = :local
               end
             end
           end.compact
         end
 
+        def raise_submodule_commit_not_found!(commit)
+          raise Error::Rugged, code: :git_local_submodule_commit_not_found, data: { commit: commit, path: path }
+        end
+
         def ignore_patch?(patch, paths: [], exclude_paths: [])
           delta_new_file = patch.delta.new_file
           args = [delta_new_file[:path], paths: paths, exclude_paths: exclude_paths]
@@ -79,7 +80,7 @@ module Dapp
         def lookup_commit(commit)
           super
         rescue Rugged::OdbError, TypeError => _e
-          raise Error::Rugged, code: :commit_not_found_in_local_git_repository, data: { commit: commit }
+          raise Error::Rugged, code: :commit_not_found_in_local_git_repository, data: { commit: commit, path: path }
         end
 
         protected

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

@@ -9,6 +9,10 @@ module Dapp
         def exclude_paths
           dapp.local_git_artifact_exclude_paths
         end
+
+        def submodules_git(_)
+          git
+        end
       end
     end
   end

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

@@ -100,22 +100,8 @@ module Dapp
           raise Error::Rugged, code: :commit_not_found_in_remote_git_repository, data: { commit: commit, url: url }
         end
 
-        def submodules_git(commit)
-          submodules_git_path(commit).tap do |git_path|
-            break begin
-              if git_path.directory?
-                Rugged::Repository.new(git_path.to_s)
-              else
-                Rugged::Repository.clone_at(path.to_s, git_path.to_s).tap do |submodules_git|
-                  submodules_git.checkout(commit)
-                end
-              end
-            end
-          end
-        end
-
-        def submodules_git_path(commit)
-          Pathname(File.join(dapp.host_docker_tmp_config_dir, "submodule", dapp.consistent_uniq_slugify(name), commit).to_s)
+        def raise_submodule_commit_not_found!(commit)
+          raise Error::Rugged, code: :git_remote_submodule_commit_not_found, data: { commit: commit, url: url }
         end
 
         protected

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = "0.31.0"
+  VERSION = "0.31.1"
   BUILD_CACHE_VERSION = 30
 end

metadata

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