dapp 0.31.9 → 0.31.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: d7aec78205e512f683583d2b504fffdffa60bc53f862ff0e610fd2da1340f7d3
-  data.tar.gz: 4cf279885ce8fce74dd9023948bb7898b4a21becbb5973c1f42ecce2c805f655
+SHA1:
+  metadata.gz: 694eb48fc2804c27d295fb7a5ba39aa7ae3124db
+  data.tar.gz: 1a2131680db02ca4d20c748023b1d3eeac4a0720
 SHA512:
-  metadata.gz: 617748cc0deab81cc007ee306ec9b9864861334073cb6980af96140acffcc44d84c3d8330272b8faa9abc3291135e4fff18370310483836df7948f2cde7eb363
-  data.tar.gz: ccf9f4dd3c28e566360807a5397a10b557589d946b73e24805c8a0c280edc9b80d1ea465855b021f2052ec2671ca47dcc6e42328d8576cdcb163bf96f493d7a8
+  metadata.gz: 59e3627ddc707a065e47feb1e20ba10e84316dc6c20c8c0a914df3afae3125ec4629593da873b29da258b70e03c920dc43e97c3bccf8e3c4c0997c04235da9dc
+  data.tar.gz: 1f6d0d57c3c3f1b099a053f866641adb8fb5cf068af5493e35e5ecdb7f00eb127393a6ef0427deb2efc2574c468228375f987f42a13ab1367bdb6ac58e68d468

data/config/en/net_status.yml

@@ -85,7 +85,7 @@ en:
       stage_artifact_not_associated: "Artifact not associated with any stage: expected `before` or `after` attribute!"
       stage_artifact_double_associate: "Can't use `%{stage}` stage for artifact; already used in `%{conflict_stage}` stage!"
       stage_artifact_not_supported_associated_stage: "Bad artifact stage `%{stage}`!"
-      git_artifact_remote_branch_with_commit: "Remote git repo: use `commit` or `branch` directive!"
+      git_artifact_remote_with_refs: "Remote git repo: use `commit`, `tag` or `branch` directive!"
       artifact_conflict: "Conflict between artifacts!\n\n%{dappfile_context}"
       artifact_not_found: "Invalid Dappfile: artifact `%{name}` should be defined before import directive!"
       artifact_already_exists: "Invalid Dappfile: artifact `%{name}` already exists!"
@@ -129,6 +129,7 @@ en:
       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!"
+      tag_not_exist_in_remote_git_repository: "Remote git repo `%{url}`: tag `%{tag}` 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}"
       incorrect_gitmodules_file: "Git repo `%{name}` with invalid `.gitmodules` file: %{error}\n\n%{content}"

data/lib/dapp/dapp/command/sample/common.rb

@@ -6,7 +6,7 @@ module Dapp
           def _sample_list
             @sample_list ||= [].tap do |list|
               tree = begin
-                latest_commit = _sample_git_repo.latest_commit(_samples_git_repo_branch)
+                latest_commit = _sample_git_repo.latest_branch_commit(_samples_git_repo_branch)
                 latest_commit_tree = _sample_git_repo.lookup_commit(latest_commit).tree
 
                 if _samples_dir == '.'

data/lib/dapp/dapp/command/sample/create.rb

@@ -35,7 +35,7 @@ module Dapp
 
           def _sample_repo_blobs_entries(sample_name)
             _sample_git_repo
-              .blobs_entries(_sample_git_repo.latest_commit(_samples_git_repo_branch), paths: [_sample_directory(sample_name)])
+              .blobs_entries(_sample_git_repo.latest_branch_commit(_samples_git_repo_branch), paths: [_sample_directory(sample_name)])
               .reject { |_, entry| entry[:filemode] == 0o160000 }
           end
 

data/lib/dapp/dapp/option_tags.rb

@@ -53,7 +53,7 @@ module Dapp
 
       def commit_tags
         return {} unless options[:tag_commit]
-        { git_commit: [git_own_repo.latest_commit] }
+        { git_commit: [git_own_repo.head_commit] }
       end
 
       def build_tags
@@ -95,4 +95,4 @@ module Dapp
       end
     end # Tags
   end # Dapp
-end # Dapp
+end # Dapp

data/lib/dapp/dapp/sentry.rb

@@ -64,7 +64,7 @@ module Dapp
 
               extra_git["path"] = git_own_repo.path
               extra_git["workdir_path"] = git_own_repo.workdir_path
-              extra_git["latest_commit"] = git_own_repo.latest_commit unless git_own_repo.empty?
+              extra_git["latest_commit"] = git_own_repo.head_commit unless git_own_repo.empty?
             end
           end
 

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

@@ -5,7 +5,7 @@ module Dapp
         class GitArtifactRemote < GitArtifactLocal
           include ::Dapp::Helper::Url
 
-          attr_reader :_url, :_name, :_branch, :_commit
+          attr_reader :_url, :_name, :_branch, :_tag, :_commit
 
           def initialize(url, **kwargs, &blk)
             @_url  = url
@@ -18,6 +18,10 @@ module Dapp
             sub_directive_eval { @_branch = value.to_s }
           end
 
+          def tag(value)
+            sub_directive_eval { @_tag = value.to_s }
+          end
+
           def commit(value)
             sub_directive_eval { @_commit = value.to_s }
           end
@@ -27,6 +31,7 @@ module Dapp
               export._url    = @_url
               export._name   = @_name
               export._branch ||= @_branch
+              export._tag    ||= @_tag
               export._commit ||= @_commit
 
               yield(export) if block_given?
@@ -34,23 +39,28 @@ module Dapp
           end
 
           class Export < GitArtifactLocal::Export
-            attr_accessor :_url, :_name, :_branch, :_commit
+            attr_accessor :_url, :_name, :_branch, :_tag, :_commit
 
             def _artifact_options
-              super.merge(name: _name, branch: _branch, commit: _commit)
+              super.merge(name: _name, branch: _branch, tag: _tag, commit: _commit)
             end
 
             def branch(value)
               sub_directive_eval { @_branch = value.to_s }
             end
 
+            def tag(value)
+              sub_directive_eval { @_tag = value.to_s }
+            end
+
             def commit(value)
               sub_directive_eval { @_commit = value.to_s }
             end
 
             def validate!
               super
-              raise ::Dapp::Error::Config, code: :git_artifact_remote_branch_with_commit if !_branch.nil? && !_commit.nil?
+              refs = [_branch, _tag, _commit].compact
+              raise ::Dapp::Error::Config, code: :git_artifact_remote_with_refs if refs.length > 1
             end
           end
         end

data/lib/dapp/dimg/git_artifact.rb

@@ -12,7 +12,7 @@ module Dapp
       # FIXME: переименовать cwd в from
 
       # rubocop:disable Metrics/ParameterLists
-      def initialize(repo, dimg, to:, name: nil, branch: nil, commit: nil,
+      def initialize(repo, dimg, to:, name: nil, branch: nil, tag: nil, commit: nil,
                      cwd: nil, include_paths: nil, exclude_paths: nil, owner: nil, group: nil, as: nil,
                      stages_dependencies: {}, ignore_signature_auto_calculation: false)
         @repo = repo
@@ -21,7 +21,8 @@ module Dapp
 
         @ignore_signature_auto_calculation = ignore_signature_auto_calculation
 
-        @branch = branch || repo.branch
+        @branch = branch
+        @tag = tag
         @commit = commit
 
         @to = to
@@ -296,7 +297,15 @@ module Dapp
 
       def latest_commit
         @latest_commit ||= begin
-          (commit || repo.latest_commit(branch)).tap do |c|
+          commit || begin
+            if !tag.nil?
+              repo.latest_tag_commit(tag)
+            elsif !branch.nil?
+              repo.latest_branch_commit(branch)
+            else
+              repo.head_commit
+            end
+          end.tap do |c|
             repo.dapp.log_info("Repository `#{repo.name}`: latest commit `#{c}` to `#{to}`") unless ignore_signature_auto_calculation
           end
         end
@@ -332,6 +341,7 @@ module Dapp
       attr_reader :to
       attr_reader :commit
       attr_reader :branch
+      attr_reader :tag
       attr_reader :cwd
       attr_reader :owner
       attr_reader :group

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

@@ -169,7 +169,15 @@ module Dapp
           git.exists?(commit)
         end
 
-        def latest_commit(_branch)
+        def head_commit
+          git.head.target_id
+        end
+
+        def latest_branch_commit(_)
+          raise
+        end
+
+        def latest_tag_commit(_)
           raise
         end
 

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

@@ -61,7 +61,7 @@ module Dapp
 
         def diff(from, to, **kwargs)
           if from.nil? and to.nil?
-            mid_commit = latest_commit
+            mid_commit = head_commit
             diff_obj = super(nil, mid_commit, **kwargs)
             diff_obj.merge! git.lookup(mid_commit).diff_workdir(**kwargs)
             diff_obj
@@ -72,10 +72,6 @@ module Dapp
           end
         end
 
-        def latest_commit(_branch = nil)
-          git.head.target_id
-        end
-
         def lookup_commit(commit)
           super
         rescue Rugged::OdbError, TypeError => _e

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

@@ -76,13 +76,20 @@ module Dapp
           end unless dapp.dry_run?
         end
 
-        def latest_commit(branch)
+        def latest_branch_commit(branch)
           git.ref("refs/remotes/#{branch_format(branch)}").tap do |ref|
             raise Error::Rugged, code: :branch_not_exist_in_remote_git_repository, data: { branch: branch, url: url } if ref.nil?
             break ref.target_id
           end
         end
 
+        def latest_tag_commit(tag)
+          git.tags[tag].tap do |t|
+            raise Error::Rugged, code: :tag_not_exist_in_remote_git_repository, data: { tag: tag, url: url } if t.nil?
+            break t.target_id
+          end
+        end
+
         def lookup_commit(commit)
           super
         rescue Rugged::OdbError, TypeError => _e

data/lib/dapp/kube/helm/release.rb

@@ -122,6 +122,7 @@ module Dapp
             helm_additional_values_options,
             helm_set_options(without_registry: true),
             ("--namespace #{namespace}" if namespace),
+            "--name #{name}",
           ].compact.join(" ")
 
           cmd.stdout

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = "0.31.9"
+  VERSION = "0.31.10"
   BUILD_CACHE_VERSION = 30
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.31.9
+  version: 0.31.10
 platform: ruby
 authors:
 - Dmitry Stolyarov
@@ -744,7 +744,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Build docker packaged apps using chef or shell