jenkinsutil 1.0.53 → 1.0.54

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: fa3971f1323e59451b7196e1b4cfae90af05473b
4
- data.tar.gz: cd18f09cdd23bf4efb6cb3786aa5a26b0d76d01e
3
+ metadata.gz: 1055eff6ff9d3fc9ac3cf9bf6662e0662141b238
4
+ data.tar.gz: 0e2c55eca1d7e5925810e549830583556a6c8919
5
5
  SHA512:
6
- metadata.gz: 528bb61c183e5699ac30ba439c6615f438dcc1f02cd0775f80ceaf5b98bfe2090dfa96571f63d6afeabd57d2948548f76d2c53943c3a01ce52fcef21b2ee55f2
7
- data.tar.gz: d3946b4daf493d20c0a9dddc961a18892d35811fa3759ffc1649c98806268ace604476839d41015a2e084aca303aadf9def03d8e3bfadf44f926451da15b03ba
6
+ metadata.gz: 857f54504e9a62e07319014a7d72e7ef6df5878599eaf8a379b19b529bebebdfb0586e2e22fc5ac2237a9f5b2ba3255d031b1b04c6c8785de3a74a954db13df0
7
+ data.tar.gz: 2c6878d81dd15e46b3992a519d5eea712ebe1fab2acc91ba211de1c3813b39bcefc7d6391b3def599d38800c33c470611fe7427e49e0ccabe8367d5815c84cfd
data/lib/jenkins_util.rb CHANGED
@@ -37,16 +37,16 @@ module JenkinsUtil
37
37
  args.xcode_bundle_identifier)
38
38
  end
39
39
 
40
- unless args.xcode_bundle_version.nil?
40
+ unless args.xcode_build_number.nil?
41
41
  XcodeUtil.project_bundle_version(args.xcode_project_path,
42
42
  args.xcode_target,
43
43
  args.xcode_build_configuration,
44
- args.xcode_bundle_version)
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) if !args.xcode_export_plist.nil? && !args.xcode_team_id.nil?
49
+ puts XcodeUtil.team_id_from_plist(args.xcode_export_plist) if !args.xcode_export_plist.nil?
50
50
 
51
51
  if !args.xcode_project_path.nil? && !args.xcode_set_manual_provisioning_style.nil?
52
52
  XcodeUtil.project_provisioning_style(args.xcode_project_path, !args.xcode_set_manual_provisioning_style)
@@ -13,11 +13,10 @@ class ArgumentHandler
13
13
  :kill_simulators,
14
14
  :xcode_project_path,
15
15
  :xcode_export_plist,
16
- :xcode_team_id,
17
16
  :xcode_target,
18
17
  :xcode_build_configuration,
19
18
  :xcode_bundle_identifier,
20
- :xcode_bundle_version,
19
+ :xcode_build_number,
21
20
  :xcode_set_manual_provisioning_style,
22
21
  :zip_sources,
23
22
  :zip_archive,
@@ -39,11 +38,10 @@ class ArgumentHandler
39
38
  @kill_simulators = false
40
39
  @xcode_project_path = nil
41
40
  @xcode_export_plist = nil
42
- @xcode_team_id = nil
43
41
  @xcode_target = nil
44
42
  @xcode_build_configuration = nil
45
43
  @xcode_bundle_identifier = nil
46
- @xcode_bundle_version = nil
44
+ @xcode_build_number = nil
47
45
  @xcode_set_manual_provisioning_style = nil
48
46
  @zip_sources = []
49
47
  @zip_archive = nil
@@ -107,14 +105,10 @@ class ArgumentHandler
107
105
  @xcode_project_path = project_path
108
106
  end
109
107
 
110
- opts.on('--xcode-export-plist plist', 'Path to an Xcode export plist') do |export_plist|
108
+ opts.on('--xcode-get-team-id plist', 'Path to an Xcode export plist') do |export_plist|
111
109
  @xcode_export_plist = export_plist
112
110
  end
113
111
 
114
- opts.on('--xcode-get-team-id', 'Display Team ID from an export plist') do
115
- @xcode_team_id = true
116
- end
117
-
118
112
  opts.on('--xcode-target target', 'Target to update in the Xcode project specified with --xcode-project') do |target|
119
113
  @xcode_target = target
120
114
  end
@@ -129,9 +123,10 @@ class ArgumentHandler
129
123
  @xcode_bundle_identifier = bundle_identifier
130
124
  end
131
125
 
132
- opts.on('--xcode-bundle-version version',
133
- 'Bundle version to set in the Xcode project specified with --xcode-project') do |bundle_version|
134
- @xcode_bundle_version = bundle_version
126
+
127
+ opts.on('--xcode-append-bundle-version version',
128
+ 'the version passed is appended to the build version Xcode project specified with --xcode-project') do |build_number|
129
+ @xcode_build_number = build_number
135
130
  end
136
131
 
137
132
  opts.on('--xcode-set-manual-provisioning-style', 'Set project to automatically sign if true and Manual if false') do
@@ -45,15 +45,15 @@ class XcodeUtil
45
45
  end
46
46
  end
47
47
 
48
- def self.project_bundle_version(project_path, target_name, build_configuration_name, bundle_version = nil)
48
+ def self.project_bundle_version(project_path, target_name, build_configuration_name, build_number = nil)
49
49
  with_project_build_configuration(project_path, target_name, build_configuration_name) do |project, build_configuration|
50
50
  infoplist_file = build_configuration.build_settings['INFOPLIST_FILE']
51
51
  infoplist_path = File.join(File.dirname(project.path), infoplist_file)
52
52
 
53
53
  infoplist = Xcodeproj::Plist.read_from_path(infoplist_path)
54
- return infoplist['CFBundleVersion'] if bundle_version.nil?
54
+ return infoplist['CFBundleVersion'] if build_number.nil?
55
55
 
56
- infoplist['CFBundleVersion'] = bundle_version
56
+ infoplist['CFBundleVersion'] = "#{infoplist['CFBundleVersion']}.#{build_number}"
57
57
  Xcodeproj::Plist.write_to_path(infoplist, infoplist_path)
58
58
  end
59
59
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: jenkinsutil
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.53
4
+ version: 1.0.54
5
5
  platform: ruby
6
6
  authors:
7
7
  - Brett McGinnis
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2016-11-07 00:00:00.000000000 Z
11
+ date: 2016-11-10 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: open4