sigh 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e49ced620631a80f353f66ce2aaec2eb7623fe89
-  data.tar.gz: 44753e2b434bf48330d3222265371d999b527535
+  metadata.gz: 63a5bb24c8badd1785e7c1c9ad7a7b1ec75b8afb
+  data.tar.gz: 5483452777078315cf20bca6204bf82f65db39a5
 SHA512:
-  metadata.gz: ce2f1fecf07da5caa9b196081bd5a9363b87d6b69c3bd614dd9a8526584b38dfa8b518f6e5ecaf7b33eef2526ebd04ae6a6e07334b348aa702e7d420779b1248
-  data.tar.gz: b9a69234e758c2128ca442cc117f5259c6a7cd544bc3d937da5f73ef2ffc134b6f52a4f2e2425e925a2c9fdd5a768579de7127e02a5c52f5f14549173e2c42ec
+  metadata.gz: 1a73a95c3a208e70bd5df6bc032a650a79b9587b6287dc9de07ee896be51a35bf7da301fa8f5e69fdae516e932e2b27e7aba69a1a9772b0703584082f0b6c43f
+  data.tar.gz: 32e970b5abb7eeaf379d2e3b67d8ada1e4985613f3845c34b4e4d66e0f497745824758edbc685b081b19c327ac7960b9025076d452d2822cb3467c0468b9c1c9

data/README.md

@@ -1,24 +1,24 @@
 <h3 align="center">
-  <a href="https://github.com/fastlane/fastlane">
-    <img src="assets/fastlane.png" width="150" />
+  <a href="https://github.com/fastlane/fastlane/tree/master/fastlane">
+    <img src="../fastlane/assets/fastlane.png" width="150" />
     <br />
     fastlane
   </a>
 </h3>
 <p align="center">
-  <a href="https://github.com/fastlane/deliver">deliver</a> &bull; 
-  <a href="https://github.com/fastlane/snapshot">snapshot</a> &bull; 
-  <a href="https://github.com/fastlane/frameit">frameit</a> &bull; 
-  <a href="https://github.com/fastlane/pem">pem</a> &bull; 
-  <b>sigh</b> &bull; 
-  <a href="https://github.com/fastlane/produce">produce</a> &bull;
-  <a href="https://github.com/fastlane/cert">cert</a> &bull;
-  <a href="https://github.com/fastlane/spaceship">spaceship</a> &bull;
-  <a href="https://github.com/fastlane/pilot">pilot</a> &bull;
+  <a href="https://github.com/fastlane/fastlane/tree/master/deliver">deliver</a> &bull;
+  <a href="https://github.com/fastlane/fastlane/tree/master/snapshot">snapshot</a> &bull;
+  <a href="https://github.com/fastlane/fastlane/tree/master/frameit">frameit</a> &bull;
+  <a href="https://github.com/fastlane/fastlane/tree/master/pem">pem</a> &bull;
+  <b>sigh</b> &bull;
+  <a href="https://github.com/fastlane/fastlane/tree/master/produce">produce</a> &bull;
+  <a href="https://github.com/fastlane/fastlane/tree/master/cert">cert</a> &bull;
+  <a href="https://github.com/fastlane/fastlane/tree/master/spaceship">spaceship</a> &bull;
+  <a href="https://github.com/fastlane/fastlane/tree/master/pilot">pilot</a> &bull;
   <a href="https://github.com/fastlane/boarding">boarding</a> &bull;
-  <a href="https://github.com/fastlane/gym">gym</a> &bull;
-  <a href="https://github.com/fastlane/scan">scan</a> &bull;
-  <a href="https://github.com/fastlane/match">match</a>
+  <a href="https://github.com/fastlane/fastlane/tree/master/gym">gym</a> &bull;
+  <a href="https://github.com/fastlane/fastlane/tree/master/scan">scan</a> &bull;
+  <a href="https://github.com/fastlane/fastlane/tree/master/match">match</a>
 </p>
 -------
 
@@ -30,9 +30,9 @@ sigh
 ============
 
 [![Twitter: @FastlaneTools](https://img.shields.io/badge/contact-@FastlaneTools-blue.svg?style=flat)](https://twitter.com/FastlaneTools)
-[![License](https://img.shields.io/badge/license-MIT-green.svg?style=flat)](https://github.com/fastlane/sigh/blob/master/LICENSE)
+[![License](https://img.shields.io/badge/license-MIT-green.svg?style=flat)](https://github.com/fastlane/fastlane/blob/master/sigh/LICENSE)
 [![Gem](https://img.shields.io/gem/v/sigh.svg?style=flat)](http://rubygems.org/gems/sigh)
-[![Build Status](https://img.shields.io/travis/fastlane/sigh/master.svg?style=flat)](https://travis-ci.org/fastlane/sigh)
+[![Build Status](https://img.shields.io/circleci/project/fastlane/fastlane/master.svg?style=flat)](https://circleci.com/gh/fastlane/fastlane)
 
 ###### Because you would rather spend your time building stuff than fighting provisioning
 
@@ -42,12 +42,12 @@ Get in contact with the developer on Twitter: [@FastlaneTools](https://twitter.c
 
 -------
 <p align="center">
-    <a href="#features">Features</a> &bull; 
-    <a href="#installation">Installation</a> &bull; 
-    <a href="#usage">Usage</a> &bull; 
-    <a href="#resign">Resign</a> &bull; 
-    <a href="#how-does-it-work">How does it work?</a> &bull; 
-    <a href="#tips">Tips</a> &bull; 
+    <a href="#features">Features</a> &bull;
+    <a href="#installation">Installation</a> &bull;
+    <a href="#usage">Usage</a> &bull;
+    <a href="#resign">Resign</a> &bull;
+    <a href="#how-does-it-work">How does it work?</a> &bull;
+    <a href="#tips">Tips</a> &bull;
     <a href="#need-help">Need help?</a>
 </p>
 
@@ -66,7 +66,7 @@ Get in contact with the developer on Twitter: [@FastlaneTools](https://twitter.c
 - Support for **multiple Teams**
 - Support for **Enterprise Profiles**
 
-To automate iOS Push profiles you can use [PEM](https://github.com/fastlane/PEM).
+To automate iOS Push profiles you can use [pem](https://github.com/fastlane/fastlane/tree/master/pem).
 
 ##### [Like this tool? Be the first to know about updates and new fastlane tools](https://tinyletter.com/krausefx)
 
@@ -83,7 +83,7 @@ See ```sigh``` in action:
 
 # Installation
 
-**Note**: It is recommended to use [match](https://github.com/fastlane/match) according to the [codesigning.guide](https://codesigning.guide) for generating and maintaining your provisioning profiles. Use `sigh` directly only if you want full control over what's going on and know more about codesigning.
+**Note**: It is recommended to use [match](https://github.com/fastlane/fastlane/tree/master/match) according to the [codesigning.guide](https://codesigning.guide) for generating and maintaining your provisioning profiles. Use `sigh` directly only if you want full control over what's going on and know more about codesigning.
 
     sudo gem install sigh
 
@@ -96,7 +96,7 @@ Make sure, you have the latest version of the Xcode command line tools installed
     sigh
 Yes, that's the whole command!
 
-```sigh``` will create, repair and download profiles for the App Store by default. 
+```sigh``` will create, repair and download profiles for the App Store by default.
 
 You can pass your bundle identifier and username like this:
 
@@ -105,12 +105,12 @@ You can pass your bundle identifier and username like this:
 If you want to generate an **Ad Hoc** profile instead of an App Store profile:
 
     sigh --adhoc
-    
+
 If you want to generate a **Development** profile:
 
     sigh --development
 
-To generate the profile in a specific directory: 
+To generate the profile in a specific directory:
 
     sigh -o "~/Certificates/"
 
@@ -121,13 +121,13 @@ To download all your provisioning profiles use
 For a list of available parameters and commands run
 
     sigh --help
-    
+
 ### Advanced
 
 By default, ```sigh``` will install the downloaded profile on your machine. If you just want to generate the profile and skip the installation, use the following flag:
 
     sigh --skip_install
-    
+
 To save the provisioning profile under a specific name, use the -q option:
 
     sigh -a com.krausefx.app -u username -q "myProfile.mobileprovision"
@@ -149,9 +149,9 @@ For a list of available parameters and commands run
     sigh --help
 
 
-### Use with [`fastlane`](https://github.com/fastlane/fastlane)
+### Use with [`fastlane`](https://github.com/fastlane/fastlane/tree/master/fastlane)
 
-`sigh` becomes really interesting when used in [`fastlane`](https://github.com/fastlane/fastlane) in combination with [`cert`](https://github.com/fastlane/cert).
+`sigh` becomes really interesting when used in [`fastlane`](https://github.com/fastlane/fastlane/tree/master/fastlane) in combination with [`cert`](https://github.com/fastlane/fastlane/tree/master/cert).
 
 Update your `Fastfile` to contain the following code:
 
@@ -204,7 +204,7 @@ Or delete all `iOS Team Provisioning Profile` by using a regular expression
 
 Run `sigh --help` to get a list of all available environment variables.
 
-If you're using [cert](https://github.com/fastlane/cert) in combination with [fastlane](https://github.com/fastlane/fastlane) the signing certificate will automatically be selected for you. (make sure to run `cert` before `sigh`)
+If you're using [cert](https://github.com/fastlane/fastlane/tree/master/cert) in combination with [fastlane](https://github.com/fastlane/fastlane/tree/master/fastlane) the signing certificate will automatically be selected for you. (make sure to run `cert` before `sigh`)
 
 # How does it work?
 
@@ -212,36 +212,36 @@ If you're using [cert](https://github.com/fastlane/cert) in combination with [fa
 
 
 ## How is my password stored?
-`sigh` uses the [CredentialsManager](https://github.com/fastlane/credentials_manager) from `fastlane`.
+`sigh` uses the [CredentialsManager](https://github.com/fastlane/fastlane/tree/master/credentials_manager) from `fastlane`.
 
 # Tips
 ## [`fastlane`](https://fastlane.tools) Toolchain
 
 - [`fastlane`](https://fastlane.tools): Connect all deployment tools into one streamlined workflow
-- [`deliver`](https://github.com/fastlane/deliver): Upload screenshots, metadata and your app to the App Store
-- [`snapshot`](https://github.com/fastlane/snapshot): Automate taking localized screenshots of your iOS app on every device
-- [`frameit`](https://github.com/fastlane/frameit): Quickly put your screenshots into the right device frames
-- [`pem`](https://github.com/fastlane/pem): Automatically generate and renew your push notification profiles
-- [`produce`](https://github.com/fastlane/produce): Create new iOS apps on iTunes Connect and Dev Portal using the command line
-- [`cert`](https://github.com/fastlane/cert): Automatically create and maintain iOS code signing certificates
-- [`spaceship`](https://github.com/fastlane/spaceship): Ruby library to access the Apple Dev Center and iTunes Connect
-- [`pilot`](https://github.com/fastlane/pilot): The best way to manage your TestFlight testers and builds from your terminal
-- [`boarding`](https://github.com/fastlane/boarding): The easiest way to invite your TestFlight beta testers 
-- [`gym`](https://github.com/fastlane/gym): Building your iOS apps has never been easier
-- [`scan`](https://github.com/fastlane/scan): The easiest way to run tests of your iOS and Mac app
-- [`match`](https://github.com/fastlane/match): Easily sync your certificates and profiles across your team using git
+- [`deliver`](https://github.com/fastlane/fastlane/tree/master/deliver): Upload screenshots, metadata and your app to the App Store
+- [`snapshot`](https://github.com/fastlane/fastlane/tree/master/snapshot): Automate taking localized screenshots of your iOS app on every device
+- [`frameit`](https://github.com/fastlane/fastlane/tree/master/frameit): Quickly put your screenshots into the right device frames
+- [`pem`](https://github.com/fastlane/fastlane/tree/master/pem): Automatically generate and renew your push notification profiles
+- [`produce`](https://github.com/fastlane/fastlane/tree/master/produce): Create new iOS apps on iTunes Connect and Dev Portal using the command line
+- [`cert`](https://github.com/fastlane/fastlane/tree/master/cert): Automatically create and maintain iOS code signing certificates
+- [`spaceship`](https://github.com/fastlane/fastlane/tree/master/spaceship): Ruby library to access the Apple Dev Center and iTunes Connect
+- [`pilot`](https://github.com/fastlane/fastlane/tree/master/pilot): The best way to manage your TestFlight testers and builds from your terminal
+- [`boarding`](https://github.com/fastlane/boarding): The easiest way to invite your TestFlight beta testers
+- [`gym`](https://github.com/fastlane/fastlane/tree/master/gym): Building your iOS apps has never been easier
+- [`scan`](https://github.com/fastlane/fastlane/tree/master/scan): The easiest way to run tests of your iOS and Mac app
+- [`match`](https://github.com/fastlane/fastlane/tree/master/match): Easily sync your certificates and profiles across your team using git
 
 ##### [Like this tool? Be the first to know about updates and new fastlane tools](https://tinyletter.com/krausefx)
 
 ## Use the 'Provisioning Quicklook plugin'
 Download and install the [Provisioning Plugin](https://github.com/chockenberry/Provisioning).
 
-It will show you the `mobileprovision` files like this: 
+It will show you the `mobileprovision` files like this:
 ![assets/QuickLookScreenshot.png](assets/QuickLookScreenshot.png)
 
 ## App Identifier couldn't be found
 
-If you also want to create a new App Identifier on the Apple Developer Portal, check out [produce](https://github.com/fastlane/produce), which does exactly that.
+If you also want to create a new App Identifier on the Apple Developer Portal, check out [produce](https://github.com/fastlane/fastlane/tree/master/produce), which does exactly that.
 
 ## What happens to my Xcode managed profiles?
 
@@ -251,7 +251,7 @@ If you also want to create a new App Identifier on the Apple Developer Portal, c
 Please submit an issue on GitHub and provide information about your setup
 
 # Code of Conduct
-Help us keep `sigh` open and inclusive. Please read and follow our [Code of Conduct](https://github.com/fastlane/code-of-conduct).
+Help us keep `sigh` open and inclusive. Please read and follow our [Code of Conduct](https://github.com/fastlane/fastlane/blob/master/CODE_OF_CONDUCT.md).
 
 # License
 This project is licensed under the terms of the MIT license. See the LICENSE file.

data/bin/sigh

@@ -76,6 +76,7 @@ class SighApplication
       c.syntax = 'sigh manage'
       c.description = 'Manage installed provisioning profiles on your system.'
 
+      c.option '-f', '--force', 'Force remove all expired provisioning profiles. Required on CI.'
       c.option '-e', '--clean_expired', 'Remove all expired provisioning profiles.'
 
       c.option '-p', '--clean_pattern STRING', String, 'Remove any provisioning profiles that matches the regular expression.'

data/lib/assets/resign.sh

@@ -60,13 +60,28 @@
 # 5. copy the entitlements as archived-expanded-entitlements.xcent inside the app bundle (because Xcode does too)
 #
 
+# Logging functions
+
+log() {
+    # Make sure it returns 0 code even when verose mode is off (test 1)
+    # To use like [[ condition ]] && log "x" && something
+    [[ -n "$VERBOSE" ]] && echo -e "$@" || test 1
+}
+
+error() {
+    echo "$@" >&2
+    exit 1
+}
+
+warning() {
+    echo "$@" >&2
+}
 
 function checkStatus {
 
     if [ $? -ne 0 ];
     then
-        echo "Encountered an error, aborting!" >&2
-        exit 1
+        error "Encountered an error, aborting!"
     fi
 }
 
@@ -92,65 +107,68 @@ NESTED_APP_REFERENCE_KEYS=(":WKCompanionAppBundleIdentifier" ":NSExtension:NSExt
 
 # options start index
 OPTIND=3
-while getopts p:d:e:k:b:n: opt; do
+while getopts p:d:e:k:b:n:v opt; do
     case $opt in
         p)
             RAW_PROVISIONS+=("$OPTARG")
-            if [[ "$OPTARG" =~ .+=.+ ]]; then
-                echo "Specified provisioning profile: '${OPTARG#*=}' for bundle identifier: '${OPTARG%%=*}'" >&2
-            else
-                echo "Specified provisioning profile: '$OPTARG'" >&2
-            fi
             ;;
         d)
             DISPLAY_NAME="$OPTARG"
-            echo "Specified display name: '$DISPLAY_NAME'" >&2
             ;;
         e)
             ENTITLEMENTS="$OPTARG"
-            echo "Specified signing entitlements: '$ENTITLEMENTS'" >&2
             ;;
         b)
             BUNDLE_IDENTIFIER="$OPTARG"
-            echo "Specified bundle identifier: '$BUNDLE_IDENTIFIER'" >&2
             ;;
         k)
             KEYCHAIN="$OPTARG"
-            echo "Specified Keychain to use: '$KEYCHAIN'" >&2
             ;;
         n)
             VERSION_NUMBER="$OPTARG"
-            echo "Specified version to use: '$VERSION_NUMBER'" >&2
+            ;;
+        v)
+            VERBOSE="--verbose"
             ;;
         \?)
-            echo "Invalid option: -$OPTARG" >&2
-            exit 1
+            error "Invalid option: -$OPTARG"
             ;;
         :)
-            echo "Option -$OPTARG requires an argument." >&2
-            exit 1
+            error "Option -$OPTARG requires an argument."
             ;;
     esac
 done
 
+# Log the options
+for provision in ${RAW_PROVISIONS[@]}; do
+    if [[ "$provision" =~ .+=.+ ]]; then
+        log "Specified provisioning profile: '${provision#*=}' for bundle identifier: '${provision%%=*}'"
+    else
+        log "Specified provisioning profile: '$provision'"
+    fi
+done
+[[ -n "${DISPLAY_NAME}" ]] && log "Specified display name: '$DISPLAY_NAME'"
+[[ -n "${ENTITLEMENTS}" ]] && log "Specified signing entitlements: '$ENTITLEMENTS'"
+[[ -n "${BUNDLE_IDENTIFIER}" ]] && log "Specified bundle identifier: '$BUNDLE_IDENTIFIER'"
+[[ -n "${KEYCHAIN}" ]] && log "Specified Keychain to use: '$KEYCHAIN'"
+[[ -n "${VERSION_NUMBER}" ]] && log "Specified version to use: '$VERSION_NUMBER'"
+
 shift $((OPTIND-1))
 
 NEW_FILE="$1"
 if [ -z "$NEW_FILE" ];
 then
-    echo "Output file name required" >&2
-    exit 1
+    error "Output file name required"
 fi
 
 if [[ "${#RAW_PROVISIONS[*]}" == "0" ]]; then
-    echo "-p 'xxxx.mobileprovision' argument is required" >&2
-    exit 1;
+    error "-p 'xxxx.mobileprovision' argument is required"
 fi
 
 # Check for and remove the temporary directory if it already exists
 if [ -d "$TEMP_DIR" ];
 then
-    echo "Removing previous temporary directory: '$TEMP_DIR'" >&2
+    log "Removing previous temporary directory: '$TEMP_DIR'"
     rm -Rf "$TEMP_DIR"
 fi
 
@@ -171,8 +189,7 @@ then
     cp -Rf "${ORIGINAL_FILE}" "$TEMP_DIR/Payload/${filename}.app"
     checkStatus
 else
-    echo "Error: Only can resign .app files and .ipa files." >&2
-    exit
+    error "Error: Only can resign .app files and .ipa files."
 fi
 
 # check the keychain
@@ -235,8 +252,7 @@ function add_provision_for_bundle_id {
     local CURRENT_PROVISION=`provision_for_bundle_id "$BUNDLE_ID" STRICT`
 
     if [[ "$CURRENT_PROVISION" != "" && "$CURRENT_PROVISION" != "$PROVISION" ]]; then
-        echo "Conflicting provisioning profiles '$PROVISION' and '$CURRENT_PROVISION' for bundle identifier '$BUNDLE_ID'." >&2
-        exit 1
+        error "Conflicting provisioning profiles '$PROVISION' and '$CURRENT_PROVISION' for bundle identifier '$BUNDLE_ID'."
     fi
 
     PROVISIONS_BY_ID+=("$BUNDLE_ID=$PROVISION")
@@ -255,8 +271,7 @@ function add_provision {
     fi
 
     if [[ ! -e "$PROVISION" ]]; then
-        echo "Provisioning profile '$PROVISION' file does not exist" >&2
-        exit 1;
+        error "Provisioning profile '$PROVISION' file does not exist"
     fi
 
     local BUNDLE_ID=`bundle_id_for_provison "$PROVISION"`
@@ -286,8 +301,7 @@ function resign {
     # Make sure that the Info.plist file is where we expect it
     if [ ! -e "$APP_PATH/Info.plist" ];
     then
-        echo "Expected file does not exist: '$APP_PATH/Info.plist'" >&2
-        exit 1;
+        error "Expected file does not exist: '$APP_PATH/Info.plist'"
     fi
 
     # Read in current values from the app
@@ -301,12 +315,11 @@ function resign {
 
     if [[ "$NEW_PROVISION" == "" ]]; then
         if [[ "$NESTED" == NESTED ]]; then
-            echo "No provisioning profile for nested application: '$APP_PATH' with bundle identifier '${BUNDLE_IDENTIFIER:-$CURRENT_BUNDLE_IDENTIFIER}'" >&2
+            warning "No provisioning profile for nested application: '$APP_PATH' with bundle identifier '${BUNDLE_IDENTIFIER:-$CURRENT_BUNDLE_IDENTIFIER}'"
         else
-            echo "No provisioning profile for application: '$APP_PATH' with bundle identifier '${BUNDLE_IDENTIFIER:-$CURRENT_BUNDLE_IDENTIFIER}'" >&2
+            warning "No provisioning profile for application: '$APP_PATH' with bundle identifier '${BUNDLE_IDENTIFIER:-$CURRENT_BUNDLE_IDENTIFIER}'"
         fi
-        echo "Use the -p option (example: -p com.example.app=xxxx.mobileprovision)" >&2
-        exit 1;
+        error "Use the -p option (example: -p com.example.app=xxxx.mobileprovision)"
     fi
 
     local PROVISION_BUNDLE_IDENTIFIER=`bundle_id_for_provison "$NEW_PROVISION"`
@@ -314,7 +327,7 @@ function resign {
     # Use provisioning profile's bundle identifier
     if [ "$BUNDLE_IDENTIFIER" == "" ]; then
         if [[ "$PROVISION_BUNDLE_IDENTIFIER" =~ \* ]]; then
-            echo "Bundle Identifier contains a *, using the current bundle identifier" >&2
+            log "Bundle Identifier contains a *, using the current bundle identifier"
             BUNDLE_IDENTIFIER="$CURRENT_BUNDLE_IDENTIFIER"
         else
             BUNDLE_IDENTIFIER="$PROVISION_BUNDLE_IDENTIFIER"
@@ -322,25 +335,24 @@ function resign {
     fi
 
     if ! does_bundle_id_match "$PROVISION_BUNDLE_IDENTIFIER" "$BUNDLE_IDENTIFIER"; then
-        echo "Bundle Identifier '$PROVISION_BUNDLE_IDENTIFIER' in provisioning profile '$NEW_PROVISION' does not match the Bundle Identifier '$BUNDLE_IDENTIFIER' for application '$APP_PATH'." >&2
-        exit 1
+        error "Bundle Identifier '$PROVISION_BUNDLE_IDENTIFIER' in provisioning profile '$NEW_PROVISION' does not match the Bundle Identifier '$BUNDLE_IDENTIFIER' for application '$APP_PATH'."
     fi
 
-    echo "Current bundle identifier is: '$CURRENT_BUNDLE_IDENTIFIER'" >&2
-    echo "New bundle identifier will be: '$BUNDLE_IDENTIFIER'" >&2
+    log "Current bundle identifier is: '$CURRENT_BUNDLE_IDENTIFIER'"
+    log "New bundle identifier will be: '$BUNDLE_IDENTIFIER'"
 
     # Update the CFBundleDisplayName property in the Info.plist if a new name has been provided
     if [ "${DISPLAY_NAME}" != "" ];
     then
         if [ "${DISPLAY_NAME}" != "${CURRENT_NAME}" ];
         then
-            echo "Changing display name from '$CURRENT_NAME' to '$DISPLAY_NAME'" >&2
+            log "Changing display name from '$CURRENT_NAME' to '$DISPLAY_NAME'"
             `PlistBuddy -c "Set :CFBundleDisplayName $DISPLAY_NAME" "$APP_PATH/Info.plist"`
         fi
     fi
 
     # Replace the embedded mobile provisioning profile
-    echo "Validating the new provisioning profile: $NEW_PROVISION" >&2
+    log "Validating the new provisioning profile: $NEW_PROVISION"
     security cms -D -i "$NEW_PROVISION" > "$TEMP_DIR/profile.plist"
     checkStatus
 
@@ -350,13 +362,12 @@ function resign {
         APP_IDENTIFER_PREFIX=`PlistBuddy -c "Print :ApplicationIdentifierPrefix:0" "$TEMP_DIR/profile.plist"`
         if [ "$APP_IDENTIFER_PREFIX" == "" ];
         then
-            echo "Failed to extract any app identifier prefix from '$NEW_PROVISION'" >&2
-            exit 1;
+            error "Failed to extract any app identifier prefix from '$NEW_PROVISION'"
         else
-            echo "WARNING: extracted an app identifier prefix '$APP_IDENTIFER_PREFIX' from '$NEW_PROVISION', but it was not found in the profile's entitlements" >&2
+            warning "WARNING: extracted an app identifier prefix '$APP_IDENTIFER_PREFIX' from '$NEW_PROVISION', but it was not found in the profile's entitlements"
         fi
     else
-        echo "Profile app identifier prefix is '$APP_IDENTIFER_PREFIX'" >&2
+        log "Profile app identifier prefix is '$APP_IDENTIFER_PREFIX'"
     fi
 
     TEAM_IDENTIFIER=`PlistBuddy -c "Print :Entitlements:com.apple.developer.team-identifier" "$TEMP_DIR/profile.plist" | tr -d '\n'`
@@ -365,12 +376,12 @@ function resign {
         TEAM_IDENTIFIER=`PlistBuddy -c "Print :TeamIdentifier:0" "$TEMP_DIR/profile.plist"`
         if [ "$TEAM_IDENTIFIER" == "" ];
         then
-            echo "Failed to extract team identifier from '$NEW_PROVISION', resigned ipa may fail on iOS 8 and higher" >&2
+            warning "Failed to extract team identifier from '$NEW_PROVISION', resigned ipa may fail on iOS 8 and higher"
         else
-            echo "WARNING: extracted a team identifier '$TEAM_IDENTIFIER' from '$NEW_PROVISION', but it was not found in the profile's entitlements, resigned ipa may fail on iOS 8 and higher" >&2
+            warning "WARNING: extracted a team identifier '$TEAM_IDENTIFIER' from '$NEW_PROVISION', but it was not found in the profile's entitlements, resigned ipa may fail on iOS 8 and higher"
         fi
     else
-        echo "Profile team identifier is '$TEAM_IDENTIFIER'" >&2
+        log "Profile team identifier is '$TEAM_IDENTIFIER'"
     fi
 
     cp "$NEW_PROVISION" "$APP_PATH/embedded.mobileprovision"
@@ -379,7 +390,7 @@ function resign {
     #if the current bundle identifier is different from the new one in the provisioning profile, then change it.
     if [ "$CURRENT_BUNDLE_IDENTIFIER" != "$BUNDLE_IDENTIFIER" ];
     then
-        echo "Updating the bundle identifier from '$CURRENT_BUNDLE_IDENTIFIER' to '$BUNDLE_IDENTIFIER'" >&2
+        log "Updating the bundle identifier from '$CURRENT_BUNDLE_IDENTIFIER' to '$BUNDLE_IDENTIFIER'"
         `PlistBuddy -c "Set :CFBundleIdentifier $BUNDLE_IDENTIFIER" "$APP_PATH/Info.plist"`
         checkStatus
     fi
@@ -390,7 +401,7 @@ function resign {
         CURRENT_VERSION_NUMBER=`PlistBuddy -c "Print :CFBundleVersion" "$APP_PATH/Info.plist"`
         if [ "$VERSION_NUMBER" != "$CURRENT_VERSION_NUMBER" ];
         then
-            echo "Updating the version from '$CURRENT_VERSION_NUMBER' to '$VERSION_NUMBER'" >&2
+            log "Updating the version from '$CURRENT_VERSION_NUMBER' to '$VERSION_NUMBER'"
             `PlistBuddy -c "Set :CFBundleVersion $VERSION_NUMBER" "$APP_PATH/Info.plist"`
             `PlistBuddy -c "Set :CFBundleShortVersionString $VERSION_NUMBER" "$APP_PATH/Info.plist"`
         fi
@@ -402,25 +413,24 @@ function resign {
     then
         if [ "$TEAM_IDENTIFIER" == "" ];
         then
-            echo "ERROR: embedded frameworks detected, re-signing iOS 8 (or higher) applications wihout a team identifier in the certificate/profile does not work" >&2
-            exit 1;
+            error "ERROR: embedded frameworks detected, re-signing iOS 8 (or higher) applications wihout a team identifier in the certificate/profile does not work"
         fi
 
-        echo "Resigning embedded frameworks using certificate: '$CERTIFICATE'" >&2
+        log "Resigning embedded frameworks using certificate: '$CERTIFICATE'"
         for framework in "$FRAMEWORKS_DIR"/*
         do
             if [[ "$framework" == *.framework || "$framework" == *.dylib ]]
             then
-                /usr/bin/codesign -f -s "$CERTIFICATE" "$framework"
+                /usr/bin/codesign ${VERBOSE} -f -s "$CERTIFICATE" "$framework"
                 checkStatus
             else
-                echo "Ignoring non-framework: $framework" >&2
+                log "Ignoring non-framework: $framework"
             fi
         done
     fi
 
     # Check for and update bundle identifiers for extensions and associated nested apps
-    echo "Fixing nested app and extension references"
+    log "Fixing nested app and extension references"
     for key in ${NESTED_APP_REFERENCE_KEYS[@]}; do
         # Check if Info.plist has a reference to another app or extension
         REF_BUNDLE_ID=`PlistBuddy -c "Print ${key}" "$APP_PATH/Info.plist" 2>/dev/null`
@@ -433,7 +443,7 @@ function resign {
             # Change if not the same
             if [ "$REF_BUNDLE_ID" != "$NEW_REF_BUNDLE_ID" ];
             then
-                echo "Updating nested app or extension reference for ${key} key from ${REF_BUNDLE_ID} to ${NEW_REF_BUNDLE_ID}" >&2
+                log "Updating nested app or extension reference for ${key} key from ${REF_BUNDLE_ID} to ${NEW_REF_BUNDLE_ID}"
                 `PlistBuddy -c "Set ${key} $NEW_REF_BUNDLE_ID" "$APP_PATH/Info.plist"`
             fi
         fi
@@ -447,12 +457,10 @@ function resign {
             ENTITLEMENTS_APP_ID_PREFIX=`PlistBuddy -c "Print :application-identifier" "$ENTITLEMENTS" | grep -E '^[A-Z0-9]*' -o | tr -d '\n'`
             if [ "$ENTITLEMENTS_APP_ID_PREFIX" == "" ];
             then
-                echo "Provided entitlements file is missing a value for the required 'application-identifier' key" >&2
-                exit 1;
+                error "Provided entitlements file is missing a value for the required 'application-identifier' key"
             elif [ "$ENTITLEMENTS_APP_ID_PREFIX" != "$APP_IDENTIFER_PREFIX" ];
             then
-                echo "Provided entitlements file's app identifier prefix value '$ENTITLEMENTS_APP_ID_PREFIX' does not match the provided provisioning profile's value '$APP_IDENTIFER_PREFIX'" >&2
-                exit 1;
+                error "Provided entitlements file's app identifier prefix value '$ENTITLEMENTS_APP_ID_PREFIX' does not match the provided provisioning profile's value '$APP_IDENTIFER_PREFIX'"
             fi
         fi
 
@@ -462,41 +470,38 @@ function resign {
             ENTITLEMENTS_TEAM_IDENTIFIER=`PlistBuddy -c "Print :com.apple.developer.team-identifier" "$ENTITLEMENTS" | tr -d '\n'`
             if [ "$ENTITLEMENTS_TEAM_IDENTIFIER" == "" ];
             then
-                echo "Provided entitlements file is missing a value for the required 'com.apple.developer.team-identifier' key" >&2
-                exit 1;
+                error "Provided entitlements file is missing a value for the required 'com.apple.developer.team-identifier' key"
             elif [ "$ENTITLEMENTS_TEAM_IDENTIFIER" != "$TEAM_IDENTIFIER" ];
             then
-                echo "Provided entitlements file's 'com.apple.developer.team-identifier' '$ENTITLEMENTS_TEAM_IDENTIFIER' does not match the provided provisioning profile's value '$TEAM_IDENTIFIER'" >&2
-                exit 1;
+                error "Provided entitlements file's 'com.apple.developer.team-identifier' '$ENTITLEMENTS_TEAM_IDENTIFIER' does not match the provided provisioning profile's value '$TEAM_IDENTIFIER'"
             fi
         fi
 
-        echo "Resigning application using certificate: '$CERTIFICATE'" >&2
-        echo "and entitlements: $ENTITLEMENTS" >&2
+        log "Resigning application using certificate: '$CERTIFICATE'"
+        log "and entitlements: $ENTITLEMENTS"
         cp -- "$ENTITLEMENTS" "$APP_PATH/archived-expanded-entitlements.xcent"
-        /usr/bin/codesign -f -s "$CERTIFICATE" --entitlements="$ENTITLEMENTS" "$APP_PATH"
+        /usr/bin/codesign ${VERBOSE} -f -s "$CERTIFICATE" --entitlements="$ENTITLEMENTS" "$APP_PATH"
         checkStatus
     else
-        echo "Extracting entitlements from provisioning profile" >&2
+        log "Extracting entitlements from provisioning profile"
         PlistBuddy -x -c "Print Entitlements" "$TEMP_DIR/profile.plist" > "$TEMP_DIR/newEntitlements"
         checkStatus
-        echo "Resigning application using certificate: '$CERTIFICATE'" >&2
-        echo "and entitlements from provisioning profile: $NEW_PROVISION" >&2
+        log "Resigning application using certificate: '$CERTIFICATE'"
+        log "and entitlements from provisioning profile: $NEW_PROVISION"
         cp -- "$TEMP_DIR/newEntitlements" "$APP_PATH/archived-expanded-entitlements.xcent"
-        /usr/bin/codesign -f -s "$CERTIFICATE" --entitlements="$TEMP_DIR/newEntitlements" "$APP_PATH"
+        /usr/bin/codesign ${VERBOSE} -f -s "$CERTIFICATE" --entitlements="$TEMP_DIR/newEntitlements" "$APP_PATH"
         checkStatus
     fi
 
     # Remove the temporary files if they were created before generating ipa
     rm -f "$TEMP_DIR/newEntitlements"
     rm -f "$TEMP_DIR/profile.plist"
-
 }
 
 # Sign nested applications and app extensions
 while IFS= read -d '' -r app;
 do
-    echo "Resigning nested application: '$app'" >&2
+    log "Resigning nested application: '$app'"
     resign "$app" NESTED
 done < <(find "$TEMP_DIR/Payload/$APP_NAME" -d -mindepth 1 \( -name "*.app" -or -name "*.appex" \) -print0)
 
@@ -504,7 +509,7 @@ done < <(find "$TEMP_DIR/Payload/$APP_NAME" -d -mindepth 1 \( -name "*.app" -or
 resign "$TEMP_DIR/Payload/$APP_NAME"
 
 # Repackage quietly
-echo "Repackaging as $NEW_FILE" >&2
+log "Repackaging as $NEW_FILE"
 
 # Zip up the contents of the "$TEMP_DIR" folder
 # Navigate to the temporary directory (sending the output to null)
@@ -520,4 +525,4 @@ mv "$TEMP_DIR.ipa" "$NEW_FILE"
 # Remove the temp directory
 rm -rf "$TEMP_DIR"
 
-echo "Process complete" >&2
+log "Process complete"

data/lib/sigh/local_manage.rb

@@ -4,11 +4,11 @@ module Sigh
     CLEANUP = "cleanup"
 
     def self.start(options, args)
-      command, clean_expired, clean_pattern = get_inputs(options, args)
+      command, clean_expired, clean_pattern, force = get_inputs(options, args)
       if command == LIST
         list_profiles
       elsif command == CLEANUP
-        cleanup_profiles(clean_expired, clean_pattern)
+        cleanup_profiles(clean_expired, clean_pattern, force)
       end
     end
 
@@ -36,8 +36,9 @@ module Sigh
     def self.get_inputs(options, _args)
       clean_expired = options.clean_expired
       clean_pattern = /#{options.clean_pattern}/ if options.clean_pattern
+      force = options.force
       command = (!clean_expired.nil? || !clean_pattern.nil?) ? CLEANUP : LIST
-      return command, clean_expired, clean_pattern
+      return command, clean_expired, clean_pattern, force
     end
 
     def self.list_profiles
@@ -51,16 +52,16 @@ module Sigh
         UI.message "Provisioning profiles installed"
         UI.message "Valid:"
         profiles_valid.each do |profile|
-          UI.message profile["Name"].green
+          UI.message profile_info(profile).green
         end
       end
 
       profiles_soon = profiles.select { |profile| profile["ExpirationDate"] > now && profile["ExpirationDate"] < soon }
       if profiles_soon.count > 0
         UI.message ""
-        UI.message "Expiring within 30 day:"
+        UI.message "Expiring within 30 days:"
         profiles_soon.each do |profile|
-          UI.message profile["Name"].yellow
+          UI.message profile_info(profile).yellow
         end
       end
 
@@ -69,7 +70,7 @@ module Sigh
         UI.message ""
         UI.message "Expired:"
         profiles_expired.each do |profile|
-          UI.message profile["Name"].red
+          UI.message profile_info(profile).red
         end
       end
 
@@ -83,7 +84,15 @@ module Sigh
       UI.message "You can remove all expired profiles using `sigh manage -e`" if profiles_expired.count > 0
     end
 
-    def self.cleanup_profiles(expired = false, pattern = nil)
+    def self.profile_info(profile)
+      if $verbose
+        "#{profile['Name']} - #{File.basename profile['Path']}"
+      else
+        profile['Name']
+      end
+    end
+
+    def self.cleanup_profiles(expired = false, pattern = nil, force = nil)
       now = DateTime.now
 
       profiles = load_profiles.select { |profile| (expired && profile["ExpirationDate"] < now) || (!pattern.nil? && profile["Name"] =~ pattern) }
@@ -93,7 +102,16 @@ module Sigh
         UI.message profile["Name"].red
       end
 
-      if agree("Delete these provisioning profiles #{profiles.length}? (y/n)  ", true)
+      delete = force
+      unless delete
+        if Helper.ci?
+          UI.user_error! "On a CI server, cleanup cannot be used without the --force option"
+        else
+          delete = agree("Delete these provisioning profiles #{profiles.length}? (y/n)  ", true)
+        end
+      end
+
+      if delete
         profiles.each do |profile|
           File.delete profile["Path"]
         end

data/lib/sigh/runner.rb

@@ -150,7 +150,7 @@ module Sigh
         filters << "Owner Name: '#{Sigh.config[:cert_owner_name]}' " if Sigh.config[:cert_owner_name]
         filters << "Certificate ID: '#{Sigh.config[:cert_id]}' " if Sigh.config[:cert_id]
         UI.important "No certificates for filter: #{filters}" if filters.length > 0
-        UI.user_error!("Could not find a matching code signing identity for #{profile_type}. You can use cert to generate one (https://github.com/fastlane/cert)")
+        UI.user_error!("Could not find a matching code signing identity for #{profile_type}. You can use cert to generate one (https://github.com/fastlane/fastlane/tree/master/cert)")
       end
 
       return certificates if Sigh.config[:development] # development profiles support multiple certificates

data/lib/sigh/version.rb

@@ -1,3 +1,3 @@
 module Sigh
-  VERSION = "1.4.0"
+  VERSION = "1.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sigh
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-03 00:00:00.000000000 Z
+date: 2016-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane_core
@@ -232,7 +232,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Because you would rather spend your time building stuff than fighting provisioning