jenkinsutil 1.0.63 → 1.0.64
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.rubocop_todo.yml +1 -1
- data/Dockerfile +4 -2
- data/lib/jenkins_util/argument_handler.rb +0 -1
- data/lib/jenkins_util/xcode_util.rb +5 -12
- data/lib/jenkins_util.rb +8 -10
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: ce6c3fb9e6235bf530091bae047651591f18fb12
|
4
|
+
data.tar.gz: 9e75608b1ac8923e69fddf56a4f3066c0916517c
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 457dcf17eaad11a35d1f7867e357528cbf16ce453101e517b155531915ac40b74aaf0d7af2a6b0a48f91f95814153c9b199f4340a75f5b13d70836e2d1af5bdb
|
7
|
+
data.tar.gz: 6296f385da2e8d6b320369fd42c72712c80119cc3f46bd1164c1be77e3f4c53ffea0947d09ec3356dc3ac7a4aa8c126121ad24481b605c9bccb95cc519132ee6
|
data/.rubocop_todo.yml
CHANGED
data/Dockerfile
CHANGED
@@ -8,7 +8,8 @@ WORKDIR $BUILD_DIR
|
|
8
8
|
|
9
9
|
RUN apt-get update
|
10
10
|
|
11
|
-
RUN gem install bundler
|
11
|
+
RUN gem install bundler \
|
12
|
+
rubocop
|
12
13
|
|
13
14
|
ADD . ${BUILD_DIR}
|
14
15
|
|
@@ -23,7 +24,8 @@ ENV ARTIFACTS_DIR=${ARTIFACTS_DIR}
|
|
23
24
|
ENV DROPBOX_ACCESS_TOKEN="PLEASE SET"
|
24
25
|
ENV BUILD_NUMBER="dev"
|
25
26
|
|
26
|
-
CMD
|
27
|
+
CMD rubocop && \
|
28
|
+
rake ci:setup:testunit test:default build && \
|
27
29
|
mv test/reports ${ARTIFACTS_DIR}/ && \
|
28
30
|
mv pkg/* ${ARTIFACTS_DIR}/ && \
|
29
31
|
mv coverage ${ARTIFACTS_DIR}/coverage/
|
@@ -125,7 +125,6 @@ class ArgumentHandler
|
|
125
125
|
@xcode_bundle_identifier = bundle_identifier
|
126
126
|
end
|
127
127
|
|
128
|
-
|
129
128
|
opts.on('--xcode-append-bundle-version version',
|
130
129
|
'the version passed is appended to the build version Xcode project specified with --xcode-project') do |build_number|
|
131
130
|
@xcode_build_number = build_number
|
@@ -71,7 +71,7 @@ class XcodeUtil
|
|
71
71
|
plist_path = File.expand_path(archive_plist)
|
72
72
|
plist = Plist.parse_xml(plist_path)
|
73
73
|
LoggerUtil.fatal("name not found, make sure to pass in the archive plist #{archive_plist}") if plist.nil? || !plist.key?('Name')
|
74
|
-
|
74
|
+
"#{plist['Name']}_v_#{plist['ApplicationProperties']['CFBundleShortVersionString']}_b_#{plist['ApplicationProperties']['CFBundleVersion']}"
|
75
75
|
end
|
76
76
|
|
77
77
|
def self.project_provisioning_style(project_path, is_automatic = nil)
|
@@ -79,19 +79,12 @@ class XcodeUtil
|
|
79
79
|
|
80
80
|
project.root_object.attributes['TargetAttributes'].values.each do |target_value|
|
81
81
|
target_value.each do |attribute_key, attribute_value|
|
82
|
-
if is_automatic.nil?
|
83
|
-
|
84
|
-
|
85
|
-
|
86
|
-
target_value[attribute_key] = if is_automatic == true
|
87
|
-
'Automatic'
|
88
|
-
else
|
89
|
-
'Manual'
|
90
|
-
end
|
91
|
-
end
|
82
|
+
return attribute_value if attribute_key == 'ProvisioningStyle' && is_automatic.nil?
|
83
|
+
|
84
|
+
next unless attribute_key == 'ProvisioningStyle'
|
85
|
+
target_value[attribute_key] = is_automatic ? 'Automatic' : 'Manual'
|
92
86
|
end
|
93
87
|
end
|
94
|
-
|
95
88
|
return project.save unless is_automatic.nil?
|
96
89
|
|
97
90
|
LoggerUtil.fatal("'ProvisioningStyle' key not found, please check and uncheck automatic signing")
|
data/lib/jenkins_util.rb
CHANGED
@@ -32,29 +32,27 @@ module JenkinsUtil
|
|
32
32
|
if !args.xcode_project_path.nil? && !args.xcode_target.nil? && !args.xcode_build_configuration.nil?
|
33
33
|
unless args.xcode_bundle_identifier.nil?
|
34
34
|
XcodeUtil.project_bundle_identifier(args.xcode_project_path,
|
35
|
-
|
36
|
-
|
37
|
-
|
35
|
+
args.xcode_target,
|
36
|
+
args.xcode_build_configuration,
|
37
|
+
args.xcode_bundle_identifier)
|
38
38
|
end
|
39
39
|
|
40
40
|
unless args.xcode_build_number.nil?
|
41
41
|
XcodeUtil.project_bundle_version(args.xcode_project_path,
|
42
|
-
|
43
|
-
|
44
|
-
|
42
|
+
args.xcode_target,
|
43
|
+
args.xcode_build_configuration,
|
44
|
+
args.xcode_build_number)
|
45
45
|
end
|
46
46
|
end
|
47
47
|
|
48
48
|
# Not using LoggerUtil so there is no time stamp
|
49
|
-
puts XcodeUtil.team_id_from_plist(args.xcode_export_plist)
|
50
|
-
puts XcodeUtil.build_name(args.xcode_archive_plist)
|
49
|
+
puts XcodeUtil.team_id_from_plist(args.xcode_export_plist) unless args.xcode_export_plist.nil?
|
50
|
+
puts XcodeUtil.build_name(args.xcode_archive_plist) unless args.xcode_archive_plist.nil?
|
51
51
|
|
52
52
|
if !args.xcode_project_path.nil? && !args.xcode_set_manual_provisioning_style.nil?
|
53
53
|
XcodeUtil.project_provisioning_style(args.xcode_project_path, !args.xcode_set_manual_provisioning_style)
|
54
54
|
end
|
55
55
|
|
56
|
-
|
57
|
-
|
58
56
|
if (!args.zip_sources.empty? || !args.zip_archive.nil?) && !args.zip_destination.nil?
|
59
57
|
ZipUtil.compress(*args.zip_sources, args.zip_destination) unless args.zip_sources.empty?
|
60
58
|
ZipUtil.uncompress(args.zip_archive, args.zip_destination) unless args.zip_archive.nil?
|