jenkinsutil 1.0.49 → 1.0.50

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3bf5fba8b81786a0b3bd9e1958ca1379bd2cad1b
-  data.tar.gz: 1079a35c6c4ec12d870ec00b867f349649303967
+  metadata.gz: cc0b38fe9c80af260a2a8e7f139e7d190d961788
+  data.tar.gz: 038252b911e73ea0dfc4be722ba66374298641f4
 SHA512:
-  metadata.gz: 240f5b2470541377da8956890baf81231cce15dc38df86e6a2072725b498d93c9ac6ca02393251559aa9a8a131c498e21bf0bc2830ca7ff676cfcc004fc27745
-  data.tar.gz: 59e4b402f885f98784c7b43ff26daf56687f8d09e7059395068ed8295049d9ed5a7885f2f34e8859275f37d541f6c40dcb7229e9e0637f7f40ba119855ea70b5
+  metadata.gz: d02b30780a0427c6fda5c34322864a17a6434ae3a9dd67d7656bfe5579efdde1b0f910a1079cf8694b2ebc723765d9f300c7842dd9b5f5d0ab8e4c9a1d4d2878
+  data.tar.gz: 9739239a0bbc7b9d05a94d95f75f6ed04988fcc0ef3c3122ff83bd21cf08b32292af5339f17842e4123724784da0503b7c1f2c10f78621ce24c602778868075a

data/.rubocop_todo.yml

@@ -11,11 +11,9 @@ Metrics/LineLength:
 
 AllCops:
   Exclude:
-    - '/**/JenkinsUtil.rb'
-    - '/**/xcode_util.rb'
-    - '/**/command_line_script.rb'
     - '**/bin/**/*'
     - '**/exe/**/*'
+    - 'JenkinsUtil.gemspec'
 
 Documentation:
     Enabled: false

data/JenkinsUtil.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'JenkinsUtil/version'
+require 'jenkins_util/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'jenkinsutil'
@@ -33,5 +33,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'ci_reporter_test_unit', '~> 1.0'
   spec.add_development_dependency 'simplecov', '~> 0.11'
   spec.add_development_dependency 'simplecov-cobertura', '~> 1.1'
-  spec.add_development_dependency 'rubocop', '~> 0.39'
+  spec.add_development_dependency 'rubocop', '~> 0.45'
 end

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "JenkinsUtil"
+require 'bundler/setup'
+require 'jenkins_util'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +10,5 @@ require "JenkinsUtil"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start

data/exe/jenkinsutil

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'JenkinsUtil'
+require 'jenkins_util'
 
 JenkinsUtil

data/lib/jenkins_util.rb

@@ -0,0 +1,62 @@
+require 'jenkins_util/version'
+require 'jenkins_util/command_line_script'
+require 'jenkins_util/keychain_util'
+require 'jenkins_util/simulator_util'
+require 'jenkins_util/xcode_util'
+require 'jenkins_util/argument_handler'
+require 'jenkins_util/logger_util'
+require 'jenkins_util/process_util'
+require 'jenkins_util/dropbox_util'
+require 'jenkins_util/zip_util'
+
+module JenkinsUtil
+  include LoggerUtil
+
+  args = ArgumentHandler.new
+
+  LoggerUtil.verbose?(args.verbose)
+
+  # KeychainUtil
+  unless args.keychain.nil? && args.keychain_password.nil?
+    KeychainUtil.unlock_keychain(args.keychain, args.keychain_password, args.code_signing_identities)
+  end
+
+  # DropboxUtil
+  unless args.dropbox_sources.nil? || args.dropbox_sources.empty? || args.dropbox_destination.nil?
+    DropboxUtil.upload(args.dropbox_sources, args.dropbox_destination, args.dropbox_flatten, args.dropbox_root)
+  end
+
+  # XcodeUtil
+  SimulatorUtil.reset_all_simulators if args.kill_simulators
+
+  if !args.xcode_project_path.nil? && !args.xcode_target.nil? && !args.xcode_build_configuration.nil?
+    unless args.xcode_bundle_identifier.nil?
+      XcodeUtil.set_project_bundle_identifier(args.xcode_project_path,
+                                              args.xcode_target,
+                                              args.xcode_build_configuration,
+                                              args.xcode_bundle_identifier)
+    end
+
+    unless args.xcode_bundle_version.nil?
+      XcodeUtil.set_project_bundle_version(args.xcode_project_path,
+                                           args.xcode_target,
+                                           args.xcode_build_configuration,
+                                           args.xcode_bundle_version)
+    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?
+
+  if !args.xcode_project_path.nil? && !args.xcode_set_manual_provisioning_style.nil?
+    XcodeUtil.set_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?
+  end
+
+  # Version
+  LoggerUtil.log.info(VERSION) if args.version
+end

data/lib/{JenkinsUtil → jenkins_util}/argument_handler.rb

@@ -53,8 +53,9 @@ class ArgumentHandler
 
     ARGV.push('-h') if ARGV.empty?
 
+    # rubocop:disable Metrics/BlockLength
     parser = OptionParser.new do |opts|
-      opts.banner = 'Usage: JenkinsUtil'
+      opts.banner = 'Usage: jenkins_util'
 
       # keychain_util
       opts.on('-k', '--keychain [KEYCHAIN_PATH]', 'Path to Keychain to be unlocked') do |keychain|

data/lib/{JenkinsUtil → jenkins_util}/command_line_script.rb

@@ -1,5 +1,5 @@
 require 'open4'
-require 'JenkinsUtil/logger_util'
+require 'jenkins_util/logger_util'
 
 class CommandLineScript
   include LoggerUtil
@@ -10,7 +10,7 @@ class CommandLineScript
     @command = command
 
     LoggerUtil.log.debug("Executing: \"#{@command}\"")
-    status = Open4::popen4(@command) do |pid, stdin, stdout, stderr|
+    status = Open4.popen4(@command) do |pid, stdin, stdout, stderr|
       @pid = pid
       @stdin = stdin
       @stdout = stdout.readlines

data/lib/{JenkinsUtil → jenkins_util}/dropbox_util.rb

@@ -1,6 +1,6 @@
 require 'dropbox_sdk'
-require 'JenkinsUtil/logger_util'
-require 'JenkinsUtil/version'
+require 'jenkins_util/logger_util'
+require 'jenkins_util/version'
 require 'pathname'
 
 module DropboxUtil

data/lib/{JenkinsUtil → jenkins_util}/keychain_util.rb

@@ -1,5 +1,5 @@
-require 'JenkinsUtil/command_line_script'
-require 'JenkinsUtil/logger_util'
+require 'jenkins_util/command_line_script'
+require 'jenkins_util/logger_util'
 
 module KeychainUtil
   include LoggerUtil

data/lib/{JenkinsUtil → jenkins_util}/process_util.rb

@@ -1,5 +1,5 @@
 require 'sys/proctable'
-require 'JenkinsUtil/logger_util'
+require 'jenkins_util/logger_util'
 
 module ProcessUtil
   include Sys

data/lib/{JenkinsUtil → jenkins_util}/simulator_util.rb

@@ -1,9 +1,9 @@
-require 'JenkinsUtil/process_util'
-require 'JenkinsUtil/command_line_script'
-require 'JenkinsUtil/logger_util'
+require 'jenkins_util/process_util'
+require 'jenkins_util/command_line_script'
+require 'jenkins_util/logger_util'
 require 'json'
 
-class SimulatorError < Exception
+class SimulatorError
   attr_reader :code, :message, :udid
 
   def initialize(code, message, udid)
@@ -62,25 +62,23 @@ class SimulatorUtil
   def self.boot_device(udid)
     process = CommandLineScript.new("xcrun simctl boot #{udid}")
 
-    if process.exit_status != 0 && process.exit_status != DEVICE_STATE_INVALID
-      raise SimulatorError.new(process.exit_status, 'Could not boot up device', udid)
-    end
+    LoggerUtil.fatal("Could not boot up device: #{udid}") if process.exit_status.nonzero? &&
+                                                             process.exit_status != DEVICE_STATE_INVALID
   end
 
   def self.shutdown_device(udid)
     process = CommandLineScript.new("xcrun simctl shutdown #{udid}")
 
-    if process.exit_status != 0 && process.exit_status != DEVICE_STATE_INVALID && process.exit_status != DEVICE_ALREADY_SHUTDOWN
-      raise SimulatorError.new(process.exit_status, 'Could not shutdown device', udid)
-    end
+    LoggerUtil.fatal("Could not shutdown device: #{udid}") if process.exit_status.nonzero? &&
+                                                              process.exit_status != DEVICE_STATE_INVALID &&
+                                                              process.exit_status != DEVICE_ALREADY_SHUTDOWN
   end
 
   def self.reset_device(udid)
     process = CommandLineScript.new("xcrun simctl erase #{udid}")
 
-    if process.exit_status != 0 && process.exit_status != DEVICE_STATE_INVALID
-      raise SimulatorError.new(process.exit_status, 'Could not reset device', udid)
-    end
+    LoggerUtil.fatal("Could not reset device: #{udid}") if process.exit_status.nonzero? &&
+                                                           process.exit_status != DEVICE_STATE_INVALID
   end
 
   def self.reset_all_simulators

data/lib/jenkins_util/xcode_util.rb

@@ -0,0 +1,99 @@
+require 'jenkins_util/process_util'
+require 'jenkins_util/command_line_script'
+require 'jenkins_util/logger_util'
+require 'xcodeproj'
+require 'plist'
+
+class XcodeUtil
+  def initialize
+    @xcodebuild_version_major = nil
+
+    @default_xcodebuild_path = '/usr/bin/xcodebuild'
+    @ios_simulator_process_name = 'Simulator'
+
+    # xcodebuild flags
+    @xcodebuild_version_flag = '-version'
+
+    unless File.exist?(@default_xcodebuild_path)
+      LoggerUtil.fatal("xcodebuild not found: #{@default_xcodebuild_path}")
+      abort
+    end
+
+    version
+  end
+
+  def kill_ios_simulator
+    ProcessUtil.kill_all_processes(@ios_simulator_process_name)
+  end
+
+  def version
+    xcode_process = CommandLineScript.new("#{@default_xcodebuild_path} #{@xcodebuild_version_flag}")
+    puts xcode_process.get_output
+  end
+
+  def self.with_project_build_configuration(project_path, target_name, build_configuration_name)
+    project = Xcodeproj::Project.open(project_path)
+    targets = project.native_targets
+    targets.each do |target|
+      next if target.name != target_name
+
+      target.build_configuration_list.build_configurations.each do |build_configuration|
+        next if build_configuration.name != build_configuration_name
+
+        yield project, build_configuration
+      end
+    end
+  end
+
+  def self.project_bundle_version(project_path, target_name, build_configuration_name, bundle_version = 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?
+
+      infoplist['CFBundleVersion'] = bundle_version
+      Xcodeproj::Plist.write_to_path(infoplist, infoplist_path)
+    end
+  end
+
+  def self.project_bundle_identifier(project_path, target_name, build_configuration_name, bundle_identifier = nil)
+    with_project_build_configuration(project_path, target_name, build_configuration_name) do |project, build_configuration|
+      return build_configuration.build_settings['PRODUCT_BUNDLE_IDENTIFIER'] if bundle_identifier.nil?
+
+      build_configuration.build_settings['PRODUCT_BUNDLE_IDENTIFIER'] = bundle_identifier
+      project.save
+    end
+  end
+
+  def self.project_provisioning_style(project_path, is_automatic = nil)
+    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 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
+          return project.save
+        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')
+
+    plist['teamID']
+  end
+end

data/lib/{JenkinsUtil → jenkins_util}/zip_util.rb

@@ -1,8 +1,8 @@
-require 'JenkinsUtil/command_line_script'
-require 'JenkinsUtil/logger_util'
+require 'jenkins_util/command_line_script'
+require 'jenkins_util/logger_util'
 require 'zip'
 
-class ZipError < Exception
+class ZipError < RuntimeError
   attr_reader :code, :message
 
   def initialize(code, message)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jenkinsutil
 version: !ruby/object:Gem::Version
-  version: 1.0.49
+  version: 1.0.50
 platform: ruby
 authors:
 - Brett McGinnis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-03 00:00:00.000000000 Z
+date: 2016-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: open4
@@ -198,14 +198,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.39'
+        version: '0.45'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.39'
+        version: '0.45'
 description: 
 email:
 - Brett@L4Digital.com
@@ -228,17 +228,17 @@ files:
 - bin/console
 - bin/setup
 - exe/jenkinsutil
-- lib/JenkinsUtil.rb
-- lib/JenkinsUtil/argument_handler.rb
-- lib/JenkinsUtil/command_line_script.rb
-- lib/JenkinsUtil/dropbox_util.rb
-- lib/JenkinsUtil/keychain_util.rb
-- lib/JenkinsUtil/logger_util.rb
-- lib/JenkinsUtil/process_util.rb
-- lib/JenkinsUtil/simulator_util.rb
-- lib/JenkinsUtil/version.rb
-- lib/JenkinsUtil/xcode_util.rb
-- lib/JenkinsUtil/zip_util.rb
+- lib/jenkins_util.rb
+- lib/jenkins_util/argument_handler.rb
+- lib/jenkins_util/command_line_script.rb
+- lib/jenkins_util/dropbox_util.rb
+- lib/jenkins_util/keychain_util.rb
+- lib/jenkins_util/logger_util.rb
+- lib/jenkins_util/process_util.rb
+- lib/jenkins_util/simulator_util.rb
+- lib/jenkins_util/version.rb
+- lib/jenkins_util/xcode_util.rb
+- lib/jenkins_util/zip_util.rb
 homepage: http://www.l4digital.com/
 licenses:
 - MIT

data/lib/JenkinsUtil.rb

@@ -1,61 +0,0 @@
-require 'JenkinsUtil/version'
-require 'JenkinsUtil/command_line_script'
-require 'JenkinsUtil/keychain_util'
-require 'JenkinsUtil/simulator_util'
-require 'JenkinsUtil/xcode_util'
-require 'JenkinsUtil/argument_handler'
-require 'JenkinsUtil/logger_util'
-require 'JenkinsUtil/process_util'
-require 'JenkinsUtil/dropbox_util'
-require 'JenkinsUtil/zip_util'
-
-module JenkinsUtil
-  include LoggerUtil
-
-  args = ArgumentHandler.new
-
-  LoggerUtil.verbose?(args.verbose)
-
-  # KeychainUtil
-  unless args.keychain.nil? && args.keychain_password.nil?
-    KeychainUtil.unlock_keychain(args.keychain, args.keychain_password, args.code_signing_identities)
-  end
-
-  # DropboxUtil
-  unless args.dropbox_sources.nil? || args.dropbox_sources.empty? || args.dropbox_destination.nil?
-    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
-
-  if !args.xcode_project_path.nil? && !args.xcode_target.nil? && !args.xcode_build_configuration.nil?
-    if !args.xcode_bundle_identifier.nil?
-      XcodeUtil.set_project_bundle_identifier(args.xcode_project_path, args.xcode_target, args.xcode_build_configuration, args.xcode_bundle_identifier)
-    end
-
-    if !args.xcode_bundle_version.nil?
-      XcodeUtil.set_project_bundle_version(args.xcode_project_path, args.xcode_target, args.xcode_build_configuration, args.xcode_bundle_version)
-    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)
-    end
-
-    if !args.zip_archive.nil?
-      ZipUtil.uncompress(args.zip_archive, args.zip_destination)
-    end
-  end
-
-  # Version
-  LoggerUtil.log.info(VERSION) if args.version
-end

data/lib/JenkinsUtil/xcode_util.rb

@@ -1,129 +0,0 @@
-require 'JenkinsUtil/process_util'
-require 'JenkinsUtil/command_line_script'
-require 'JenkinsUtil/logger_util'
-require 'xcodeproj'
-require 'plist'
-
-class XcodeUtil
-  def initialize
-    @xcodebuild_version_major = nil
-
-    @default_xcodebuild_path = '/usr/bin/xcodebuild'
-    @ios_simulator_process_name = 'Simulator'
-
-    #xcodebuild flags
-    @xcodebuild_version_flag = '-version'
-
-    unless File.exist?(@default_xcodebuild_path)
-      LoggerUtil.fatal("xcodebuild not found: #{@default_xcodebuild_path}")
-      abort
-    end
-
-    get_version
-  end
-
-  def kill_ios_simulator
-    ProcessUtil.kill_all_processes(@ios_simulator_process_name)
-  end
-
-  def get_version
-    xcode_process = CommandLineScript.new("#{@default_xcodebuild_path} #{@xcodebuild_version_flag}")
-    @xcodebuild_version_major
-    puts xcode_process.get_output
-  end
-
-  def self.with_project_build_configuration(project_path, target_name, build_configuration_name)
-    project = Xcodeproj::Project.open(project_path)
-    targets = project.native_targets
-    targets.each do |target|
-      if target.name != target_name
-        next
-      end
-
-      target.build_configuration_list.build_configurations.each do |build_configuration|
-        if build_configuration.name != build_configuration_name
-          next
-        end
-
-        yield project, build_configuration
-      end
-    end
-  end
-
-  def self.get_project_bundle_version(project_path, target_name, build_configuration_name)
-    self.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']
-    end
-  end
-
-  def self.set_project_bundle_version(project_path, target_name, build_configuration_name, bundle_version)
-    self.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)
-      infoplist['CFBundleVersion'] = bundle_version
-      Xcodeproj::Plist.write_to_path(infoplist, infoplist_path)
-    end
-  end
-
-  def self.get_project_bundle_identifier(project_path, target_name, build_configuration_name)
-    self.with_project_build_configuration(project_path, target_name, build_configuration_name) do |project, build_configuration|
-      return build_configuration.build_settings['PRODUCT_BUNDLE_IDENTIFIER']
-    end
-  end
-
-  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
-    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