dapp 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84ec210f8b9be2cedca8656153394c71bd290af9
-  data.tar.gz: c99afb59f2fc0e60adaf880025dd1a14007b33b3
+  metadata.gz: b9a2256c433ec1a0ba5025f5bb51d6c1d32f9dbc
+  data.tar.gz: 54183e3a8a445fa1500e632f54dc8d7073c733bd
 SHA512:
-  metadata.gz: 5e5b9adb74849cf1fe3e6f55ff94d20f3931f38fe666275a045cef4fd6aff8c1023b005d719878f65a590d6d9915a9e8a1a363f6f208c86efd069d35fbcd853b
-  data.tar.gz: fd3e4c87500426e469ca878120e2ac4867c598baec0fd48438c8fe1e2ec8f6bbd086b983bd516708a790afd4c26848ee9ec885938bf9d4a9387ca04278b6dc55
+  metadata.gz: 0c2769fec1709ae73c2c483b70e38e1ac7816f809fab9455a1f19208bdb0a63d6541c98962906b0a22f8ca1880d4d65ad7657f9872d16bb7978927ec3c969662
+  data.tar.gz: 46464a15195b713fa5ddf7ae85d6c98db53390f6e7c3608bdab6da7f72a29515da2ffc806cd9f909cb390c23cee45b39f6bd9ea81bdf7c882c1812a9a41e682e

data/config/en/net_status.yml

@@ -50,6 +50,7 @@ en:
       stage_artifact_double_associate: "Cannot use `%{stage}` stage for artifact, already used in `%{conflict_stage}` stage!"
       stage_artifact_not_supported_associated_stage: "Bad artifact stage `%{stage}`!"
       git_artifact_remote_unsupported_protocol: "Remote git repo `%{url}`: unsupported protocol!"
+      git_artifact_remote_branch_with_commit: "Remote git repo: use `commit` or `branch` directive!"
       artifact_conflict: "Conflict between artifacts paths!"
       scratch_unsupported_directive: "Scratch dimg has unsupported directive `%{directive}`!"
       scratch_artifact_required: "Scratch dimg without artifacts!"
@@ -67,7 +68,8 @@ en:
     rugged:
       rugged_remote_error: "Remote git repo `%{url}`: `%{message}`!"
       local_git_repository_does_not_exist: "Local git repo: doesn't exist!"
-      commit_not_found_in_local_git_repository: "Local git repo: commit `%{commit}` not found (run command `dapp stages cleanup local --improper-git-commit`)!"
-      commit_not_found_in_remote_git_repository: "Remote git repo `%{url}`: commit `%{commit}` not found (run command `dapp stages cleanup local --improper-git-commit`)!"
+      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_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`!"
+      branch_not_exist_in_remote_git_repository: "Remote git repo `%{url}`: branch `%{branch}` not exist!"
     lock:
       timeout: "Could not obtain lock for `%{name}` within %{timeout} seconds"

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

@@ -39,11 +39,29 @@ module Dapp
           end
 
           def empty?
-            dependencies_empty? || dimg.git_artifacts.all? { |git_artifact| !git_artifact.any_changes?(prev_g_a_stage.layer_commit(git_artifact)) }
+            dependencies_empty? || git_artifacts_without_changes?
           end
 
           private
 
+          def git_artifacts_without_changes?
+            local_git_artifacts_without_changes? && remote_git_artifacts_without_changes?
+          end
+
+          def local_git_artifacts_without_changes?
+            dimg.local_git_artifacts.all? do |git_artifact|
+              from_commit = prev_g_a_stage.layer_commit(git_artifact)
+              to_commit = dimg.dev_mode? ? nil : layer_commit(git_artifact)
+              !git_artifact.any_changes?(from_commit, to_commit)
+            end
+          end
+
+          def remote_git_artifacts_without_changes?
+            dimg.remote_git_artifacts.all? do |git_artifact|
+              !git_artifact.any_changes?(prev_g_a_stage.layer_commit(git_artifact), layer_commit(git_artifact))
+            end
+          end
+
           def commit_list
             dimg.git_artifacts.map { |git_artifact| layer_commit(git_artifact) }
           end

data/lib/dapp/dimg/config/directive/git_artifact_remote.rb

@@ -28,7 +28,7 @@ module Dapp
             attr_accessor :_url, :_name, :_branch, :_commit
 
             def _artifact_options
-              super.merge(name: _name, branch: _branch)
+              super.merge(name: _name, branch: _branch, commit: _commit)
             end
 
             protected
@@ -40,6 +40,11 @@ module Dapp
             def commit(value)
               @_commit = value
             end
+
+            def validate!
+              super
+              raise Error::Config, code: :git_artifact_remote_branch_with_commit if !_branch.nil? && !_commit.nil?
+            end
           end
 
           protected

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

@@ -30,7 +30,7 @@ module Dapp
 
         def lookup_commit(commit)
           super
-        rescue Rugged::OdbError => _e
+        rescue Rugged::OdbError, TypeError => _e
           raise Error::Rugged, code: :commit_not_found_in_local_git_repository, data: { commit: commit }
         end
       end

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

@@ -24,16 +24,21 @@ module Dapp
           branch ||= self.branch
           dimg.dapp.log_secondary_process(dimg.dapp.t(code: 'process.git_artifact_fetch', data: { name: name }), short: true) do
             git.fetch('origin', [branch])
+            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?
         end
 
-        def latest_commit(branch)
-          git.ref("refs/remotes/origin/#{branch}").target_id
+        def branch_exist?(name)
+          git.branches.exist?(branch_format(name))
+        end
+
+        def latest_commit(name)
+          git.ref("refs/remotes/#{branch_format(name)}").target_id
         end
 
         def lookup_commit(commit)
           super
-        rescue Rugged::OdbError => _e
+        rescue Rugged::OdbError, TypeError => _e
           raise Error::Rugged, code: :commit_not_found_in_remote_git_repository, data: { commit: commit, url: url }
         end
 
@@ -44,6 +49,12 @@ module Dapp
         def git
           super(bare: true)
         end
+
+        private
+
+        def branch_format(name)
+          "origin/#{name.reverse.chomp('origin/'.reverse).reverse}"
+        end
       end
     end
   end

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = '0.9.2'.freeze
+  VERSION = '0.9.3'.freeze
   BUILD_CACHE_VERSION = 7
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Dmitry Stolyarov