dapp 0.25.2 → 0.25.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e621bab89ad61c67e23cf04b0d8a387a74af21db
-  data.tar.gz: a00d14ba87a66446ea9f376a9ce93ea379c47494
+  metadata.gz: 1ed288e948846770f90d1c832bfbd368c3c41017
+  data.tar.gz: 6e9509a2f5ace4b8031d6fa1f22642d99a201406
 SHA512:
-  metadata.gz: 0837bb35c3f21d45e54fbd96e48443730ebbc99c4aacd04404b9b54dafe772fdd5fa32a6cd5aebca1999b1240b14d1c15a48c1d7226a75c5f39c9fae3d114663
-  data.tar.gz: 8525baf0e9498d9a13ed274b51ea5b3167f87b8af85795ea5297af63e1a88c8c12115c75ca3d634338af8f6943f8db2562af0e4c0093eb9f2645e51f3d89bdca
+  metadata.gz: aeb3630fa8eba92c5a4d6ac3de2671a9f80042ae6f396c8cd2d7d5e0893782d1deb211e4cfbf5553b5ef2aa962d56758bf800d8c9d124e434c200b05f141d501
+  data.tar.gz: 57610668ec09c2f1d7a89a06443aa5f65675bd99e041fb863ee2fca0b8dd8e6699b97b7d4d12a30b45f0941069737a31e4805c79603708cf7bccba471e709114

data/lib/dapp/dapp/option_tags.rb

@@ -69,11 +69,17 @@ module Dapp
 
         {}.tap do |tags_by_scheme|
           if ENV['GITLAB_CI']
-            tags_by_scheme[:git_branch] = [ENV['CI_BUILD_REF_NAME']]
-            tags_by_scheme[:git_tag]    = [ENV['CI_BUILD_TAG']]
+            if ENV['CI_BUILD_TAG']
+              tags_by_scheme[:git_tag] = [ENV['CI_BUILD_TAG']]
+            elsif ENV['CI_BUILD_REF_NAME']
+              tags_by_scheme[:git_branch] = [ENV['CI_BUILD_REF_NAME']]
+            end
           elsif ENV['TRAVIS']
-            tags_by_scheme[:git_branch] = [ENV['TRAVIS_BRANCH']]
-            tags_by_scheme[:git_tag]    = [ENV['TRAVIS_TAG']]
+            if ENV['TRAVIS_TAG']
+              tags_by_scheme[:git_tag]    = [ENV['TRAVIS_TAG']]
+            elsif ENV['TRAVIS_BRANCH']
+              tags_by_scheme[:git_branch] = [ENV['TRAVIS_BRANCH']]
+            end
           else
             raise Error::Dapp, code: :ci_environment_required
           end

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = "0.25.2"
+  VERSION = "0.25.3"
   BUILD_CACHE_VERSION = 26
 end

metadata

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