nixenvironment 0.0.154 → 0.0.155

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e254a82fa92ae3fd4d9c70ad1a4f7b9f172b7b09cce5ce47e8f3696ccfbf933d
-  data.tar.gz: 43fe39225fa26344eec9452c1de970faabb305ce278a8383b0138bfba1e69e10
+  metadata.gz: b887aef7b7d8be7c8b2abd53e86e3b944caf3bc524082b0e0c7de7ef7531c441
+  data.tar.gz: 07bf1d90a24f619ddb79aef9c63e6ad10eb2bec19a246d590b7fa29daa113dac
 SHA512:
-  metadata.gz: 8c180300159a23e6b304ad340fc5a35a7a564c0ab37eae4168f5e84bbd6013737f1d4c1aec874ee3b2443b52fdffd1ffbcc897a61918bb8cc0e52cbe0c96a21c
-  data.tar.gz: 84267868ec2cc9214c8b21d44b3d081e4b44465318aeec3fb81348361d8d25abecdae0d77cf175e5187f2bdb599c80832d4232e18ee998c0528fec561e7db11a
+  metadata.gz: ad861b76ce1d3344a5075e38d83c15bb9c4dab300d2c5744b7cd8801589e97d9b074577cce0019648e2f5c3a348b8e769d49dfef393fe5bf768a19e33e4ef546
+  data.tar.gz: 35171781ce8f2e87eb58592b989bff987fe15278eac71619dd92dcdb6346bbd8386f711f026fd38d17dcf75710d77d6ceb325af6c51b1ee5e1a157708455c7f2

data/lib/nixenvironment/build_env_vars_loader.rb

@@ -78,6 +78,13 @@ WORKING_COPY_IS_CLEAN='#{working_copy_is_clean}'\" > #{AUTOGENERATED_LAST_REVISI
       build_env_vars[CURRENT_APP_VERSION_KEY]   = current_app_version
       build_env_vars[CURRENT_BUILD_VERSION_KEY] = monotonic_revision
 
+
+      # TODO: not correct compare in this part of code, but current_app_version we getting only here
+      date_format = ENV['USE_DATEFORMAT']
+      unless date_format == nil
+        build_env_vars[CURRENT_APP_VERSION_KEY] = ""
+      end
+      
       puts
       puts "#{EMBEDDED_PROFILE_NAME_KEY} = #{embedded_profile_name}" # TODO: find out why it's blank!!!
       puts "#{CURRENT_APP_VERSION_KEY} = #{current_app_version}"

data/lib/nixenvironment/scm.rb

@@ -41,14 +41,14 @@ module Nixenvironment
           if date_format == nil
             # number of pushes before current
             current_monotonic_revision = %x[ git rev-list --all --count ]
+            if current_revision == last_revision_in_repo
+              current_monotonic_revision = current_monotonic_revision.succ
+            end
           else
             # revision in datetime format
             current_monotonic_revision = %x[ git log -1 --date=format:"%Y%m%d" --format="%ad" ]
           end
 
-          if current_revision == last_revision_in_repo
-            current_monotonic_revision = current_monotonic_revision.succ
-          end
 
           status = %x[ git status --porcelain ]
 

data/lib/nixenvironment/version.rb

@@ -1,3 +1,3 @@
 module Nixenvironment
-  VERSION = '0.0.154'
+  VERSION = '0.0.155'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nixenvironment
 version: !ruby/object:Gem::Version
-  version: 0.0.154
+  version: 0.0.155
 platform: ruby
 authors:
 - Karen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-21 00:00:00.000000000 Z
+date: 2019-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods