jenkinsutil 1.0.53 → 1.0.54

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa3971f1323e59451b7196e1b4cfae90af05473b
-  data.tar.gz: cd18f09cdd23bf4efb6cb3786aa5a26b0d76d01e
+  metadata.gz: 1055eff6ff9d3fc9ac3cf9bf6662e0662141b238
+  data.tar.gz: 0e2c55eca1d7e5925810e549830583556a6c8919
 SHA512:
-  metadata.gz: 528bb61c183e5699ac30ba439c6615f438dcc1f02cd0775f80ceaf5b98bfe2090dfa96571f63d6afeabd57d2948548f76d2c53943c3a01ce52fcef21b2ee55f2
-  data.tar.gz: d3946b4daf493d20c0a9dddc961a18892d35811fa3759ffc1649c98806268ace604476839d41015a2e084aca303aadf9def03d8e3bfadf44f926451da15b03ba
+  metadata.gz: 857f54504e9a62e07319014a7d72e7ef6df5878599eaf8a379b19b529bebebdfb0586e2e22fc5ac2237a9f5b2ba3255d031b1b04c6c8785de3a74a954db13df0
+  data.tar.gz: 2c6878d81dd15e46b3992a519d5eea712ebe1fab2acc91ba211de1c3813b39bcefc7d6391b3def599d38800c33c470611fe7427e49e0ccabe8367d5815c84cfd

data/lib/jenkins_util.rb

@@ -37,16 +37,16 @@ module JenkinsUtil
                                               args.xcode_bundle_identifier)
     end
 
-    unless args.xcode_bundle_version.nil?
+    unless args.xcode_build_number.nil?
       XcodeUtil.project_bundle_version(args.xcode_project_path,
                                            args.xcode_target,
                                            args.xcode_build_configuration,
-                                           args.xcode_bundle_version)
+                                           args.xcode_build_number)
     end
   end
 
   # Not using LoggerUtil so there is no time stamp
-  puts XcodeUtil.team_id_from_plist(args.xcode_export_plist) if !args.xcode_export_plist.nil? && !args.xcode_team_id.nil?
+  puts XcodeUtil.team_id_from_plist(args.xcode_export_plist) if !args.xcode_export_plist.nil?
 
   if !args.xcode_project_path.nil? && !args.xcode_set_manual_provisioning_style.nil?
     XcodeUtil.project_provisioning_style(args.xcode_project_path, !args.xcode_set_manual_provisioning_style)

data/lib/jenkins_util/argument_handler.rb

@@ -13,11 +13,10 @@ class ArgumentHandler
               :kill_simulators,
               :xcode_project_path,
               :xcode_export_plist,
-              :xcode_team_id,
               :xcode_target,
               :xcode_build_configuration,
               :xcode_bundle_identifier,
-              :xcode_bundle_version,
+              :xcode_build_number,
               :xcode_set_manual_provisioning_style,
               :zip_sources,
               :zip_archive,
@@ -39,11 +38,10 @@ class ArgumentHandler
     @kill_simulators = false
     @xcode_project_path = nil
     @xcode_export_plist = nil
-    @xcode_team_id = nil
     @xcode_target = nil
     @xcode_build_configuration = nil
     @xcode_bundle_identifier = nil
-    @xcode_bundle_version = nil
+    @xcode_build_number = nil
     @xcode_set_manual_provisioning_style = nil
     @zip_sources = []
     @zip_archive = nil
@@ -107,14 +105,10 @@ class ArgumentHandler
         @xcode_project_path = project_path
       end
 
-      opts.on('--xcode-export-plist plist', 'Path to an Xcode export plist') do |export_plist|
+      opts.on('--xcode-get-team-id plist', 'Path to an Xcode export plist') do |export_plist|
         @xcode_export_plist = export_plist
       end
 
-      opts.on('--xcode-get-team-id', 'Display Team ID from an export plist') do
-        @xcode_team_id = true
-      end
-
       opts.on('--xcode-target target', 'Target to update in the Xcode project specified with --xcode-project') do |target|
         @xcode_target = target
       end
@@ -129,9 +123,10 @@ class ArgumentHandler
         @xcode_bundle_identifier = bundle_identifier
       end
 
-      opts.on('--xcode-bundle-version version',
-              'Bundle version to set in the Xcode project specified with --xcode-project') do |bundle_version|
-        @xcode_bundle_version = bundle_version
+
+      opts.on('--xcode-append-bundle-version version',
+              'the version passed is appended to the build version Xcode project specified with --xcode-project') do |build_number|
+        @xcode_build_number = build_number
       end
 
       opts.on('--xcode-set-manual-provisioning-style', 'Set project to automatically sign if true and Manual if false') do

data/lib/jenkins_util/xcode_util.rb

@@ -45,15 +45,15 @@ class XcodeUtil
     end
   end
 
-  def self.project_bundle_version(project_path, target_name, build_configuration_name, bundle_version = nil)
+  def self.project_bundle_version(project_path, target_name, build_configuration_name, build_number = nil)
     with_project_build_configuration(project_path, target_name, build_configuration_name) do |project, build_configuration|
       infoplist_file = build_configuration.build_settings['INFOPLIST_FILE']
       infoplist_path = File.join(File.dirname(project.path), infoplist_file)
 
       infoplist = Xcodeproj::Plist.read_from_path(infoplist_path)
-      return infoplist['CFBundleVersion'] if bundle_version.nil?
+      return infoplist['CFBundleVersion'] if build_number.nil?
 
-      infoplist['CFBundleVersion'] = bundle_version
+      infoplist['CFBundleVersion'] = "#{infoplist['CFBundleVersion']}.#{build_number}"
       Xcodeproj::Plist.write_to_path(infoplist, infoplist_path)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jenkinsutil
 version: !ruby/object:Gem::Version
-  version: 1.0.53
+  version: 1.0.54
 platform: ruby
 authors:
 - Brett McGinnis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-07 00:00:00.000000000 Z
+date: 2016-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: open4