lhj-tools 0.1.56 → 0.1.57
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/lhj/helper/app_version_info.rb +21 -5
- data/lib/lhj/helper/pgyer_config.rb +6 -0
- data/lib/lhj/tools/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: bf0d16f649032902e604fa473c87bb216331af98a1b2ac6bc5789f4d071d2e06
|
4
|
+
data.tar.gz: 29092ea4c0149f8444745c4d739bf4ed14b2109252c575a2b297ed26e5af66dc
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: a7a1b7631c050c2c06f250476db7126dbac04da145b8463f1790e1f94d08ead4128f238979c39fba0376467da02346c7dcd5f1488bd90e12514d5957f5d2322c
|
7
|
+
data.tar.gz: 46dbc87040a631fb6b2a031ded28bcb3a4826159f07162637ba1408a538465a20b127b000eae42592438df2d85a0e309fab7890c35e68b29aa14965a77cf141d
|
@@ -10,6 +10,9 @@ module Lhj
|
|
10
10
|
@env = env
|
11
11
|
@build_number = build_number
|
12
12
|
@work_path = work_path
|
13
|
+
|
14
|
+
version_var_name = 'MARKETING_VERSION'
|
15
|
+
@version_regex = /^(?<begin>[^#]*#{version_var_name}\s*=\s*)(?<value>(?<major>[0-9]+)(\.(?<minor>[0-9]+))?(\.(?<patch>[0-9]+))?(?<appendix>(\.[0-9]+)*)?(-(?<prerelease>(.+)))?)(?<end>)/i
|
13
16
|
setup_config
|
14
17
|
end
|
15
18
|
|
@@ -31,13 +34,26 @@ module Lhj
|
|
31
34
|
vers = []
|
32
35
|
Dir.glob("#{@work_path}/*.xcodeproj/*.pbxproj").each do |file|
|
33
36
|
File.readlines(file).each do |l|
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
37
|
+
next unless /MARKETING_VERSION/ =~ l
|
38
|
+
|
39
|
+
version_match = @version_regex.match(l)
|
40
|
+
major = version_match[:major].to_i
|
41
|
+
minor = version_match[:minor].to_i || 0
|
42
|
+
patch = version_match[:patch].to_i || 0
|
43
|
+
vers << { value: version_match[:value], major: major, minor: minor, patch: patch }
|
38
44
|
end
|
39
45
|
end
|
40
|
-
vers
|
46
|
+
list = max_version(vers)
|
47
|
+
list.last[:value]
|
48
|
+
end
|
49
|
+
|
50
|
+
def max_version(list)
|
51
|
+
list.sort do |a, b|
|
52
|
+
ma = a[:major] <=> b[:major]
|
53
|
+
ma = a[:minor] <=> b[:minor] if ma.zero?
|
54
|
+
ma = a[:patch] <=> b[:patch] if ma.zero?
|
55
|
+
ma
|
56
|
+
end
|
41
57
|
end
|
42
58
|
|
43
59
|
def build_app_version_no
|
@@ -24,6 +24,8 @@ module Lhj
|
|
24
24
|
config['gray_api_key']
|
25
25
|
when :uat
|
26
26
|
config['uat_api_key']
|
27
|
+
when :test
|
28
|
+
config['uat_api_key']
|
27
29
|
else
|
28
30
|
config['api_key']
|
29
31
|
end
|
@@ -37,6 +39,8 @@ module Lhj
|
|
37
39
|
config['gray_user_key']
|
38
40
|
when :uat
|
39
41
|
config['uat_user_key']
|
42
|
+
when :test
|
43
|
+
config['uat_user_key']
|
40
44
|
else
|
41
45
|
config['user_key']
|
42
46
|
end
|
@@ -50,6 +54,8 @@ module Lhj
|
|
50
54
|
config['gray_shortcut_url']
|
51
55
|
when :uat
|
52
56
|
config['uat_shortcut_url']
|
57
|
+
when :test
|
58
|
+
config['uat_shortcut_url']
|
53
59
|
else
|
54
60
|
config['shortcut_url']
|
55
61
|
end
|
data/lib/lhj/tools/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: lhj-tools
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.
|
4
|
+
version: 0.1.57
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- lihaijian
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2022-07-
|
11
|
+
date: 2022-07-22 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: claide
|