nixenvironment 0.0.154 → 0.0.155
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/nixenvironment/build_env_vars_loader.rb +7 -0
- data/lib/nixenvironment/scm.rb +3 -3
- data/lib/nixenvironment/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: b887aef7b7d8be7c8b2abd53e86e3b944caf3bc524082b0e0c7de7ef7531c441
|
4
|
+
data.tar.gz: 07bf1d90a24f619ddb79aef9c63e6ad10eb2bec19a246d590b7fa29daa113dac
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: ad861b76ce1d3344a5075e38d83c15bb9c4dab300d2c5744b7cd8801589e97d9b074577cce0019648e2f5c3a348b8e769d49dfef393fe5bf768a19e33e4ef546
|
7
|
+
data.tar.gz: 35171781ce8f2e87eb58592b989bff987fe15278eac71619dd92dcdb6346bbd8386f711f026fd38d17dcf75710d77d6ceb325af6c51b1ee5e1a157708455c7f2
|
@@ -78,6 +78,13 @@ WORKING_COPY_IS_CLEAN='#{working_copy_is_clean}'\" > #{AUTOGENERATED_LAST_REVISI
|
|
78
78
|
build_env_vars[CURRENT_APP_VERSION_KEY] = current_app_version
|
79
79
|
build_env_vars[CURRENT_BUILD_VERSION_KEY] = monotonic_revision
|
80
80
|
|
81
|
+
|
82
|
+
# TODO: not correct compare in this part of code, but current_app_version we getting only here
|
83
|
+
date_format = ENV['USE_DATEFORMAT']
|
84
|
+
unless date_format == nil
|
85
|
+
build_env_vars[CURRENT_APP_VERSION_KEY] = ""
|
86
|
+
end
|
87
|
+
|
81
88
|
puts
|
82
89
|
puts "#{EMBEDDED_PROFILE_NAME_KEY} = #{embedded_profile_name}" # TODO: find out why it's blank!!!
|
83
90
|
puts "#{CURRENT_APP_VERSION_KEY} = #{current_app_version}"
|
data/lib/nixenvironment/scm.rb
CHANGED
@@ -41,14 +41,14 @@ module Nixenvironment
|
|
41
41
|
if date_format == nil
|
42
42
|
# number of pushes before current
|
43
43
|
current_monotonic_revision = %x[ git rev-list --all --count ]
|
44
|
+
if current_revision == last_revision_in_repo
|
45
|
+
current_monotonic_revision = current_monotonic_revision.succ
|
46
|
+
end
|
44
47
|
else
|
45
48
|
# revision in datetime format
|
46
49
|
current_monotonic_revision = %x[ git log -1 --date=format:"%Y%m%d" --format="%ad" ]
|
47
50
|
end
|
48
51
|
|
49
|
-
if current_revision == last_revision_in_repo
|
50
|
-
current_monotonic_revision = current_monotonic_revision.succ
|
51
|
-
end
|
52
52
|
|
53
53
|
status = %x[ git status --porcelain ]
|
54
54
|
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: nixenvironment
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
4
|
+
version: 0.0.155
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Karen
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2019-10-
|
12
|
+
date: 2019-10-22 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: cocoapods
|