nixenvironment 0.0.157 → 0.0.158

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1854a942fcd0763f98dac3febaedc9ce41909ef8f36a183b22155e12ae597447
-  data.tar.gz: fb6babdc92b77a9bbe918c7e28b7a12b415e227eb4cc73d49b199ceb9916570f
+  metadata.gz: 1f26bfb369f715e1ed1ea43be611edb4b5b9d07156048265a1b16ae0f963ee05
+  data.tar.gz: 18850f9096d43b6a2a44c6610d757a116fc049b8fdeee7407e39d423fcb41f51
 SHA512:
-  metadata.gz: 9d5d0fc3e45ba8b270ed1a487000e9e01559cc359030b52aa278666b8a27f2c39e10338070cc3a6758bf16298bd55f652aa58b2ef85ab0f2690a279fece31147
-  data.tar.gz: 45d9bfb866b6c26ac0f5c4de566bde91e2fcbcd64db9a26510ee3c3955eae7ac594eec3756eefa8c179d207519f13b5460a0575c4c10f6043447897119b2a30d
+  metadata.gz: 5d8a84b2c7424559bf278ecd2390f6a8832c0e11fa1675a1d5ad143dec4d1accc010a0fa529d0a96bc9afeca08c6ba2d2860b635ca7b475e0536d40bfdadade8
+  data.tar.gz: 56768bb78f29969f4d0f677d998f7d86b0be29cd7d17c8e2d5d702a66297111c59d6b85032f3c3c9080a24bae2cfb4f2c328e93f62852eee46369b769139fdc9

data/lib/nixenvironment/scm.rb

@@ -34,11 +34,10 @@ module Nixenvironment
           end
         when SCM_GIT
           puts 'GIT working copy detected'
-          current_revision = %x[ git rev-parse HEAD ]
-          last_revision_in_repo = %x[ git rev-list --all -n 1 ]
 
-          date_format = ENV['USE_DATEFORMAT']
-          if date_format == nil
+          if (defined?(ENV['USE_DATEFORMAT'])).nil?
+            current_revision = %x[ git rev-parse HEAD ]
+            last_revision_in_repo = %x[ git rev-list --all -n 1 ]
             # number of pushes before current
             current_monotonic_revision = %x[ git rev-list --all --count ]
             if current_revision == last_revision_in_repo
@@ -48,8 +47,15 @@ module Nixenvironment
             # revision in datetime format
             git_commit_timestamp = %x[ git show -s --format=%ct #{last_revision_in_repo} ]
             git_result = Time.at(git_commit_timestamp.to_i)
-            current_monotonic_revision = "#{git_result.year.to_s[2,2].to_i}#{git_result.month}#{git_result.day}.#{git_result.hour}#{git_result.min}#{git_result.sec}"
-            #current_monotonic_revision = %x[ git log -1 --date=format:"%Y%m%d.%H%M%S" --format="%ad" ]
+            year = "%02d" % git_result.year.to_s[2,2].to_i
+            month = "%02d" % git_result.month
+            day =  "%02d" % git_result.day
+            hour =  "%02d" % git_result.hour
+            min =  "%02d" % git_result.min
+            sec =  "%02d" % git_result.sec
+            current_monotonic_revision = " #{year}#{month}#{day}.#{hour}#{min}#{sec} "
+            current_revision = " #{year}#{month}#{day}.#{hour}#{min}#{sec} "
+            #current_monotonic_revision = %x[ git log -1 --date=format:"%Y%m%d.%H%M%S" --format="%ad" ] #old one
           end
 
           status = %x[ git status --porcelain ]

data/lib/nixenvironment/version.rb

@@ -1,3 +1,3 @@
 module Nixenvironment
-  VERSION = '0.0.157'
+  VERSION = '0.0.158'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nixenvironment
 version: !ruby/object:Gem::Version
-  version: 0.0.157
+  version: 0.0.158
 platform: ruby
 authors:
 - Karen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-29 00:00:00.000000000 Z
+date: 2019-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -337,7 +337,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: NIX projects build and deploy utility