jenkinsutil 1.0.63 → 1.0.64

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 664a1b4d47f37654107fce6e55fbae5f5c313032
-  data.tar.gz: b77da66042e83089f6f452c36dd479f5fd1eef13
+  metadata.gz: ce6c3fb9e6235bf530091bae047651591f18fb12
+  data.tar.gz: 9e75608b1ac8923e69fddf56a4f3066c0916517c
 SHA512:
-  metadata.gz: 72136a88352a4c7b337c4602c3f4487f22aa34174cae205dbab682c8954503084b14130465c4e984b47c850726d4b93da3fbddcdfc17222721777fb17b1711fb
-  data.tar.gz: 97b7e56f7e123ab7cb963d238e9bd67ebd72f32849883134105e5d09618c5f1cb1a7d028a45fa43d065adeeb0b40f600786e57839894d5bfff0487e712567de2
+  metadata.gz: 457dcf17eaad11a35d1f7867e357528cbf16ce453101e517b155531915ac40b74aaf0d7af2a6b0a48f91f95814153c9b199f4340a75f5b13d70836e2d1af5bdb
+  data.tar.gz: 6296f385da2e8d6b320369fd42c72712c80119cc3f46bd1164c1be77e3f4c53ffea0947d09ec3356dc3ac7a4aa8c126121ad24481b605c9bccb95cc519132ee6

data/.rubocop_todo.yml

@@ -7,7 +7,7 @@
 # versions of RuboCop, may require this file to be generated again.
 
 Metrics/LineLength:
-  Max: 140
+  Max: 145
 
 AllCops:
   Exclude:

data/Dockerfile

@@ -8,7 +8,8 @@ WORKDIR $BUILD_DIR
 
 RUN apt-get update
 
-RUN gem install bundler
+RUN gem install bundler \
+    rubocop
 
 ADD . ${BUILD_DIR}
 
@@ -23,7 +24,8 @@ ENV ARTIFACTS_DIR=${ARTIFACTS_DIR}
 ENV DROPBOX_ACCESS_TOKEN="PLEASE SET"
 ENV BUILD_NUMBER="dev"
 
-CMD rake ci:setup:testunit test:default build && \
+CMD rubocop && \
+    rake ci:setup:testunit test:default build && \
     mv test/reports ${ARTIFACTS_DIR}/ && \
     mv pkg/* ${ARTIFACTS_DIR}/ && \
     mv coverage ${ARTIFACTS_DIR}/coverage/

data/lib/jenkins_util/argument_handler.rb

@@ -125,7 +125,6 @@ class ArgumentHandler
         @xcode_bundle_identifier = bundle_identifier
       end
 
-
       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

data/lib/jenkins_util/xcode_util.rb

@@ -71,7 +71,7 @@ class XcodeUtil
     plist_path = File.expand_path(archive_plist)
     plist = Plist.parse_xml(plist_path)
     LoggerUtil.fatal("name not found, make sure to pass in the archive plist #{archive_plist}") if plist.nil? || !plist.key?('Name')
-    return "#{plist['Name']}_v_#{plist['ApplicationProperties']['CFBundleShortVersionString']}_b_#{plist['ApplicationProperties']['CFBundleVersion']}"
+    "#{plist['Name']}_v_#{plist['ApplicationProperties']['CFBundleShortVersionString']}_b_#{plist['ApplicationProperties']['CFBundleVersion']}"
   end
 
   def self.project_provisioning_style(project_path, is_automatic = nil)
@@ -79,19 +79,12 @@ class XcodeUtil
 
     project.root_object.attributes['TargetAttributes'].values.each do |target_value|
       target_value.each do |attribute_key, attribute_value|
-        if is_automatic.nil?
-          return attribute_value if attribute_key == 'ProvisioningStyle'
-        else
-          next unless attribute_key == 'ProvisioningStyle'
-          target_value[attribute_key] = if is_automatic == true
-                                          'Automatic'
-                                        else
-                                          'Manual'
-                                        end
-        end
+        return attribute_value if attribute_key == 'ProvisioningStyle' && is_automatic.nil?
+
+        next unless attribute_key == 'ProvisioningStyle'
+        target_value[attribute_key] = is_automatic ? 'Automatic' : 'Manual'
       end
     end
-
     return project.save unless is_automatic.nil?
 
     LoggerUtil.fatal("'ProvisioningStyle' key not found, please check and uncheck automatic signing")

data/lib/jenkins_util.rb

@@ -32,29 +32,27 @@ module JenkinsUtil
   if !args.xcode_project_path.nil? && !args.xcode_target.nil? && !args.xcode_build_configuration.nil?
     unless args.xcode_bundle_identifier.nil?
       XcodeUtil.project_bundle_identifier(args.xcode_project_path,
-                                              args.xcode_target,
-                                              args.xcode_build_configuration,
-                                              args.xcode_bundle_identifier)
+                                          args.xcode_target,
+                                          args.xcode_build_configuration,
+                                          args.xcode_bundle_identifier)
     end
 
     unless args.xcode_build_number.nil?
       XcodeUtil.project_bundle_version(args.xcode_project_path,
-                                           args.xcode_target,
-                                           args.xcode_build_configuration,
-                                           args.xcode_build_number)
+                                       args.xcode_target,
+                                       args.xcode_build_configuration,
+                                       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?
-  puts XcodeUtil.build_name(args.xcode_archive_plist) if !args.xcode_archive_plist.nil?
+  puts XcodeUtil.team_id_from_plist(args.xcode_export_plist) unless args.xcode_export_plist.nil?
+  puts XcodeUtil.build_name(args.xcode_archive_plist) unless args.xcode_archive_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)
   end
 
-
-
   if (!args.zip_sources.empty? || !args.zip_archive.nil?) && !args.zip_destination.nil?
     ZipUtil.compress(*args.zip_sources, args.zip_destination) unless args.zip_sources.empty?
     ZipUtil.uncompress(args.zip_archive, args.zip_destination) unless args.zip_archive.nil?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jenkinsutil
 version: !ruby/object:Gem::Version
-  version: 1.0.63
+  version: 1.0.64
 platform: ruby
 authors:
 - Brett McGinnis