dapp 0.25.0 → 0.25.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9feef0467f4a300a3890d8c35fca220590a9fd19
-  data.tar.gz: eb7cb2377a0dd260976a6bbfd08c51cf50e4c4bf
+  metadata.gz: 3da7856304ed795022546a6c8c52219b0bf4972a
+  data.tar.gz: de4113e5a102587051925011ae772c1df10360c5
 SHA512:
-  metadata.gz: 0050bb050988788005d6af8dd2432ca5b3e9b02dd6f5fbd3203deab1adc36253f0d460ab31bac8c3ba17229a21c00ba1c6c180202496ff76a3e030cb665b360c
-  data.tar.gz: 19cc26da6da554416efa0969d0ccc88e061578cbd8b4147cf6af785eba4169555d7f10ec73fb85ee2a729c12d2795e793e1f6b86bb36d1900ec9154e7b94c23d
+  metadata.gz: bc756b6eec2c67b7dfb4dfb7dfb94f07750edb2e0d8c4e2454dc84e6e2de22ff0a502f35359f81e462498e570bf7c8d721868ce9304a954660a82837f177ae13
+  data.tar.gz: 7220a8eaccaa64444968ff16f7737b76ed931c428f8bf125efbc645430b2d0d33ff0cc422586925b05db174c6756455c6a3abf793a65e898b639405e48a5cf5a

data/lib/dapp/cli/command/options/tag.rb

@@ -5,11 +5,25 @@ module Dapp
         module Tag
           def self.extended(klass)
             klass.class_eval do
-              option :tag,
-                     long: '--tag TAG',
-                     description: 'Add tag (can be used one or more times)',
+              "Add tag (can be used one or more times), specified text will be slugified".tap do |desc|
+                option :tag,
+                        long: '--tag TAG',
+                        description: desc,
+                        default: [],
+                        proc: proc { |v| composite_options(:tags) << v }
+
+                option :tag_slug,
+                        long: '--tag-slug TAG',
+                        description: desc,
+                        default: [],
+                        proc: proc { |v| composite_options(:slug_tags) << v }
+              end
+
+              option :tag_plain,
+                     long: '--tag-plain TAG',
+                     description: "Add tag (can be used one or more times)",
                      default: [],
-                     proc: proc { |v| composite_options(:tags) << v }
+                     proc: proc { |v| composite_options(:plain_tags) << v }
 
               option :tag_branch,
                      long: '--tag-branch',

data/lib/dapp/dapp/option_tags.rb

@@ -7,12 +7,21 @@ module Dapp
 
       def tags_by_scheme
         @tags_by_scheme_name ||= begin
-          [simple_tags, branch_tags, commit_tags, build_tags, ci_tags].reduce({}) do |some_tags_by_scheme, tags_by_scheme|
-            tags_by_scheme.in_depth_merge(some_tags_by_scheme)
-          end.tap do |tags_by_scheme|
-            [:git_branch, :git_tag, :custom].each do |scheme|
-              tags_by_scheme[scheme].map!(&method(:consistent_uniq_slugify)) unless tags_by_scheme[scheme].nil?
+          {}.tap do |tags_by_scheme|
+            [slug_tags, branch_tags, ci_tags].each do |_tags_by_scheme|
+              _tags_by_scheme.each do |scheme, tags|
+                tags_by_scheme[scheme] ||= []
+                tags_by_scheme[scheme] += tags.map(&method(:consistent_uniq_slugify))
+              end
             end
+
+            [plain_tags, commit_tags, build_tags].each do |_tags_by_scheme|
+              _tags_by_scheme.each do |scheme, tags|
+                tags_by_scheme[scheme] ||= []
+                tags_by_scheme[scheme] += tags
+              end
+            end
+
             tags_by_scheme[:custom] = [:latest] if tags_by_scheme.values.flatten.empty?
           end
         end
@@ -22,8 +31,12 @@ module Dapp
         tags_by_scheme.values.flatten
       end
 
-      def simple_tags
-        { custom: options[:tag] }
+      def slug_tags
+        { custom: [*options[:tag], *options[:tag_slug]]}
+      end
+
+      def plain_tags
+        { custom: options[:tag_plain] }
       end
 
       def branch_tags

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = "0.25.0"
+  VERSION = "0.25.1"
   BUILD_CACHE_VERSION = 26
 end

metadata

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