jenkinsutil 0.8.48 → 1.0.49

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea2f0dc0b8096fbb182a2f13b7c6dd2abc6812fa
-  data.tar.gz: c26ab0f5ffd881c1e15ddf7034988dd0d9fa0d12
+  metadata.gz: 3bf5fba8b81786a0b3bd9e1958ca1379bd2cad1b
+  data.tar.gz: 1079a35c6c4ec12d870ec00b867f349649303967
 SHA512:
-  metadata.gz: 5591e8d8d6d676f5e32b174b7102b820054d981df1e1b7a1699f0b0e907261a880934df77f4898b81f472ca6e801852153b3ff8ea075730bbfdfec566ee0e608
-  data.tar.gz: 3188089ea73b8dbbd76f0e6955905d159393cbd6117d1f508012f5121404c5ff8222daa9ab364c5cf4d238a77d6a0052779dcbfaba79d148510c063c33923ed7
+  metadata.gz: 240f5b2470541377da8956890baf81231cce15dc38df86e6a2072725b498d93c9ac6ca02393251559aa9a8a131c498e21bf0bc2830ca7ff676cfcc004fc27745
+  data.tar.gz: 59e4b402f885f98784c7b43ff26daf56687f8d09e7059395068ed8295049d9ed5a7885f2f34e8859275f37d541f6c40dcb7229e9e0637f7f40ba119855ea70b5

data/JenkinsUtil.gemspec

@@ -22,9 +22,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'open4', '~> 1.3'
   spec.add_dependency 'sys-proctable', '~> 1.0'
   spec.add_dependency 'dropbox-sdk', '~> 1.6'
-  spec.add_dependency 'xcodeproj', '~> 1.1'
+  spec.add_dependency 'xcodeproj', '~> 1.4'
   spec.add_dependency 'rubyzip', '~> 1.2'
   spec.add_dependency 'ffi', '~> 1.9'
+  spec.add_dependency 'plist', '~> 3.2'
 
   spec.add_development_dependency 'bundler', '~> 1.11'
   spec.add_development_dependency 'rake', '~> 11.1'

data/lib/JenkinsUtil/argument_handler.rb

@@ -12,14 +12,18 @@ class ArgumentHandler
               :dropbox_root,
               :kill_simulators,
               :xcode_project_path,
+              :xcode_export_plist,
+              :xcode_team_id,
               :xcode_target,
               :xcode_build_configuration,
               :xcode_bundle_identifier,
               :xcode_bundle_version,
+              :xcode_set_manual_provisioning_style,
               :zip_sources,
               :zip_archive,
               :zip_destination,
-              :verbose
+              :verbose,
+              :version
 
   # rubocop:disable Metrics/AbcSize
   # rubocop:disable Metrics/MethodLength
@@ -34,14 +38,18 @@ class ArgumentHandler
     @dropbox_root = Dir.pwd
     @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_set_manual_provisioning_style = nil
     @zip_sources = []
     @zip_archive = nil
     @zip_destination = nil
     @verbose = false
+    @version = false
 
     ARGV.push('-h') if ARGV.empty?
 
@@ -98,6 +106,14 @@ class ArgumentHandler
         @xcode_project_path = project_path
       end
 
+      opts.on('--xcode-export-plist 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
@@ -117,6 +133,10 @@ class ArgumentHandler
         @xcode_bundle_version = bundle_version
       end
 
+      opts.on('--xcode-set-manual-provisioning-style', 'Set project to automatically sign if true and Manual if false') do
+        @xcode_set_manual_provisioning_style = true
+      end
+
       # zip_util
       opts.on('--zip-compress s1,s2,s3', Array, 'Compress files into zip archive') do |sources|
         @zip_sources = sources
@@ -133,7 +153,7 @@ class ArgumentHandler
       end
 
       # logger_util
-      opts.on('-v', '--verbose', 'Output more information') do
+      opts.on('--verbose', 'Output more information') do
         @verbose = true
       end
 
@@ -141,6 +161,10 @@ class ArgumentHandler
         puts opts
         abort
       end
+
+      opts.on_tail('-v', '--version', 'Display Current version') do
+        @version = true
+      end
     end
 
     parser.parse!

data/lib/JenkinsUtil/version.rb

@@ -1,3 +1,3 @@
 module JenkinsUtil
-  VERSION = "0.8.#{ENV['BUILD_NUMBER'] || 'dev'}".freeze
+  VERSION = "1.0.#{ENV['BUILD_NUMBER'] || 'dev'}".freeze
 end

data/lib/JenkinsUtil/xcode_util.rb

@@ -2,6 +2,7 @@ require 'JenkinsUtil/process_util'
 require 'JenkinsUtil/command_line_script'
 require 'JenkinsUtil/logger_util'
 require 'xcodeproj'
+require 'plist'
 
 class XcodeUtil
   def initialize
@@ -14,7 +15,7 @@ class XcodeUtil
     @xcodebuild_version_flag = '-version'
 
     unless File.exist?(@default_xcodebuild_path)
-      LoggerUtil.log.fatal("xcodebuild not found: #{@default_xcodebuild_path}")
+      LoggerUtil.fatal("xcodebuild not found: #{@default_xcodebuild_path}")
       abort
     end
 
@@ -79,7 +80,50 @@ class XcodeUtil
   def self.set_project_bundle_identifier(project_path, target_name, build_configuration_name, bundle_identifier)
     self.with_project_build_configuration(project_path, target_name, build_configuration_name) do |project, build_configuration|
       build_configuration.build_settings['PRODUCT_BUNDLE_IDENTIFIER'] = bundle_identifier
-      project.save()
+      project.save
     end
   end
+
+  def self.get_project_provisioning_style(project_path)
+    project = Xcodeproj::Project.open(project_path)
+
+    project.root_object.attributes['TargetAttributes'].values.each do |target_value|
+      target_value.each do |attribute_key, attribute_value|
+        if attribute_key == 'ProvisioningStyle'
+          return attribute_value
+        end
+      end
+    end
+
+    LoggerUtil.fatal("'ProvisioningStyle' key not found, please check and uncheck automatic signing")
+  end
+
+  def self.set_project_provisioning_style(project_path, is_automatic)
+    project = Xcodeproj::Project.open(project_path)
+
+    project.root_object.attributes['TargetAttributes'].values.each do |target_value|
+      target_value.keys.each do |attribute_key|
+        if attribute_key == 'ProvisioningStyle'
+          if is_automatic == true
+            target_value[attribute_key] = 'Automatic'
+          else
+            target_value[attribute_key] = 'Manual'
+          end
+
+          project.save
+          return
+        end
+      end
+    end
+
+    LoggerUtil.fatal("'ProvisioningStyle' key not found, please check and uncheck automatic signing")
+  end
+
+  def self.team_id_from_plist(plist_file)
+    plist_path = File.expand_path(plist_file)
+    plist = Plist::parse_xml(plist_path)
+    LoggerUtil.fatal("teamID not found in #{plist_file}") if plist.nil? || !plist.key?('teamID')
+
+    return plist['teamID']
+  end
 end

data/lib/JenkinsUtil.rb

@@ -18,7 +18,7 @@ module JenkinsUtil
 
   # KeychainUtil
   unless args.keychain.nil? && args.keychain_password.nil?
-    KeychainUtil.unlock_keychain(args.keychain,args.keychain_password, args.code_signing_identities)
+    KeychainUtil.unlock_keychain(args.keychain, args.keychain_password, args.code_signing_identities)
   end
 
   # DropboxUtil
@@ -26,6 +26,7 @@ module JenkinsUtil
     DropboxUtil.upload(args.dropbox_sources, args.dropbox_destination, args.dropbox_flatten, args.dropbox_root)
   end
 
+  # XcodeUtil
   if args.kill_simulators
     SimulatorUtil.reset_all_simulators
   end
@@ -40,6 +41,11 @@ module JenkinsUtil
     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?
+
+  XcodeUtil.set_project_provisioning_style(args.xcode_project_path, !args.xcode_set_manual_provisioning_style) if !args.xcode_project_path.nil? && !args.xcode_set_manual_provisioning_style.nil?
+
   if (!args.zip_sources.empty? || !args.zip_archive.nil?) && !args.zip_destination.nil?
     if !args.zip_sources.empty?
       ZipUtil.compress(*args.zip_sources, args.zip_destination)
@@ -49,4 +55,7 @@ module JenkinsUtil
       ZipUtil.uncompress(args.zip_archive, args.zip_destination)
     end
   end
+
+  # Version
+  LoggerUtil.log.info(VERSION) if args.version
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jenkinsutil
 version: !ruby/object:Gem::Version
-  version: 0.8.48
+  version: 1.0.49
 platform: ruby
 authors:
 - Brett McGinnis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-25 00:00:00.000000000 Z
+date: 2016-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: open4
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.9'
+- !ruby/object:Gem::Dependency
+  name: plist
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement