dapp 0.7.27 → 0.7.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b692752064c3eee53ea7af966c4fcfcd9c5e25bb
-  data.tar.gz: db2a6743a82d5d7c8dd1ccaa09912fcdb9a9603f
+  metadata.gz: 591dfeda702d8e91d15e1e3da4152556324a7d1a
+  data.tar.gz: e9d75837a10c303a8af9de51de347c098a33a66a
 SHA512:
-  metadata.gz: a524bbf2e90d4bc4d7a560cb201a9909ef323fbbdb7ef8efa08f8b24e55fc0886a993956defea5f48c0f46d79a9c299f15413a688dcb80142de956f88a7bfd6d
-  data.tar.gz: 1b8dbd3ba19736e5a1edd16d16f2a5331964a909fd3cb3b728fb0750257a6d1b7f287d05ad20aa5d497bfb819dfdd5a61526869d43850a5814a13a47bdf9d7d8
+  metadata.gz: 857a9902f01ef9f65def9481cd538aa71902b9908f569faeeaf1256409bb567228689bf53782bc1c3c20669356abb2be92a8cd42de2091d149d2b05a58f2f512
+  data.tar.gz: af3996880805bff85b6bf26d0e42464c710e6d2729c06cdbf6e4e8683e760e042fa7e7a117a4a81ff8594bca96d7e61b81713a4831984483b829c3f86de72d84

data/config/en/net_status.yml

@@ -45,6 +45,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!"
@@ -66,7 +67,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 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 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/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/git_artifact.rb

@@ -85,7 +85,7 @@ module Dapp
     end
 
     def paramshash
-      Digest::SHA256.hexdigest [full_name, to, cwd, *include_paths, *exclude_paths, owner, group].map(&:to_s).join(':::')
+      Digest::SHA256.hexdigest [full_name, to, cwd, commit, branch, *include_paths, *exclude_paths, owner, group].map(&:to_s).join(':::')
     end
 
     def exclude_paths(with_cwd = false)

data/lib/dapp/git_repo/own.rb

@@ -22,7 +22,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/git_repo/remote.rb

@@ -10,9 +10,7 @@ module Dapp
         dimg.project.log_secondary_process(dimg.project.t(code: 'process.git_artifact_clone', data: { name: name }), short: true) do
           begin
             Rugged::Repository.clone_at(url, path, bare: true)
-          rescue Rugged::NetworkError => e
-            raise Error::Rugged, code: :rugged_remote_error, data: { message: e.message, url: url }
-          rescue Rugged::SslError => e
+          rescue Rugged::NetworkError, Rugged::SslError => e
             raise Error::Rugged, code: :rugged_remote_error, data: { message: e.message, url: url }
           end
         end unless File.directory?(path)
@@ -22,9 +20,18 @@ module Dapp
         branch ||= self.branch
         dimg.project.log_secondary_process(dimg.project.t(code: 'process.git_artifact_fetch', data: { name: name }), short: true) do
           git_bare.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.project.dry_run?
       end
 
+      def branch_exist?(name)
+        git_bare.branches.exist?(branch_format(name))
+      end
+
+      def latest_commit(name)
+        git_bare.ref("refs/remotes/#{branch_format(name)}").target_id
+      end
+
       def cleanup!
         super
         FileUtils.rm_rf path
@@ -32,13 +39,19 @@ module Dapp
 
       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
 
       protected
 
       attr_reader :url
+
+      private
+
+      def branch_format(name)
+        "origin/#{name.reverse.chomp('origin/'.reverse).reverse}"
+      end
     end
   end
 end

data/lib/dapp/version.rb

@@ -1,5 +1,5 @@
 # Version
 module Dapp
-  VERSION = '0.7.27'.freeze
+  VERSION = '0.7.28'.freeze
   BUILD_CACHE_VERSION = 6
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.7.27
+  version: 0.7.28
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-09 00:00:00.000000000 Z
+date: 2017-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout