sigh 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 028ba40fa0cd96cf905b14a98f2b190265089663
-  data.tar.gz: ae2dbbf1e4fc53d9fe27672e366e5fcf1ffdda6c
+  metadata.gz: 310f1a18571628069c1c4730cdce58d7ba17d2a2
+  data.tar.gz: e44e6ea604939d78861cc77179be6c9822ecdc3e
 SHA512:
-  metadata.gz: 6f222fd7d599f58e5909914cec7c737420d6f43781a8317e5290b74c7d26e8c8fa4a54756940efbd9954871c3af2ea433b077747b1eadb5a965180d16832fba9
-  data.tar.gz: ca5c10d1e4a583f8012f674cc0afe434ebc4ecaf2888a133fdedbdfeec9e5e7ddfb445ea93e6881ced3c40112942e5083af6ed79e89b4c86729956ec1c0b76f0
+  metadata.gz: fb2d7905de6218ce67bf8b2d22cdb8869f6017c1d58b2e7c5679eaf36add7a0913ceade5f2fe750537da80c847bcec30ee59e54ac860737991040ce0bd9167de
+  data.tar.gz: 77141a2f7120b3e7f8058ad0efacd5c7e394cca0991b9639081d10236eb7b6146f327f65e1902fb37980710c11b4fea2c17a58e19b2a4d3e986621577ea77a80

data/README.md

@@ -13,17 +13,16 @@
   <b>sigh</b> &bull; 
   <a href="https://github.com/KrauseFx/produce">produce</a> &bull;
   <a href="https://github.com/KrauseFx/cert">cert</a> &bull;
-  <a href="https://github.com/KrauseFx/codes">codes</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/boarding">boarding</a> &bull;
-  <a href="https://github.com/fastlane/gym">gym</a>
-
+  <a href="https://github.com/fastlane/gym">gym</a> &bull;
+  <a href="https://github.com/fastlane/scan">scan</a>
 </p>
 -------
 
 <p align="center">
-    <img src="assets/sigh.png">
+  <img src="assets/sigh.png" height="110">
 </p>
 
 sigh
@@ -202,12 +201,11 @@ If you're using [cert](https://github.com/KrauseFx/cert) in combination with [fa
 - [`PEM`](https://github.com/KrauseFx/pem): Automatically generate and renew your push notification profiles
 - [`produce`](https://github.com/KrauseFx/produce): Create new iOS apps on iTunes Connect and Dev Portal using the command line
 - [`cert`](https://github.com/KrauseFx/cert): Automatically create and maintain iOS code signing certificates
-- [`codes`](https://github.com/KrauseFx/codes): Create promo codes for iOS Apps using the command line
 - [`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
 
 ##### [Like this tool? Be the first to know about updates and new fastlane tools](https://tinyletter.com/krausefx)
 

data/bin/sigh

@@ -60,7 +60,10 @@ class SighApplication
       c.syntax = 'sigh resign'
       c.description = 'Resigns an existing ipa file with the given provisioning profile'
       c.option '-i', '--signing_identity STRING', String, 'The signing identity to use. Must match the one defined in the provisioning profile.'
-      c.option '-p', '--provisioning_profile STRING', String, 'The path to the provisioning profile which should be used'
+      c.option '-p', '--provisioning_profile PATH', String, '(or BUNDLE_ID=PATH) The path to the provisioning profile which should be used.'\
+               'Can be provided multiple times if the application contains nested applications and app extensions, which need their own provisioning profile.'\
+               'The path may be prefixed with a identifier in order to determine which provisioning profile should be used on which app.',
+               &multiple_values_option_proc(c, "provisioning_profile", &proc { |value| value.split('=', 2) })
 
       c.action do |args, options|
         Sigh::Resign.new.run(options, args)
@@ -85,6 +88,18 @@ class SighApplication
 
     run!
   end
+
+  def multiple_values_option_proc(command, name)
+    proc do |value|
+      value = yield(value) if block_given?
+      option = command.proxy_options.find { |opt| opt[0] == name } || []
+      values = option[1] || []
+      values << value
+
+      command.proxy_options.delete option
+      command.proxy_options << [name, values]
+    end
+  end
 end
 
 begin

data/lib/assets/resign.sh

@@ -1,4 +1,4 @@
-# !/bin/bash
+#!/bin/bash
 
 # Copyright (c) 2011 Float Mobile Learning
 # http://www.floatlearning.com/
@@ -12,6 +12,8 @@
 # Extended by John Turnipseed and Matthew Nespor, November 2014
 # http://nanonation.net/
 #
+# Extended by Nicolas Bachschmidt, October 2015
+#
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the "Software"),
 # to deal in the Software without restriction, including without limitation
@@ -31,7 +33,7 @@
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 # Please let us know about any improvements you make to this script!
-# ./floatsign source "iPhone Distribution: Name" -p "path/to/profile" [-d "display name"]  [-e entitlements] [-k keychain] -b "BundleIdentifier" outputIpa
+# ./floatsign source "iPhone Distribution: Name" -p "path/to/profile" [-d "display name"]  [-e entitlements] [-k keychain] [-b "BundleIdentifier"] outputIpa
 #
 #
 # Modifed 26th January 2012
@@ -50,6 +52,11 @@
 # 4. renamed 'temp' directory and made it a variable so it can be easily modified
 # 5. various code formatting and logging adjustments
 # 
+# new features October 2015
+# 1. now re-signs nested applications and app extensions, if present, prior to re-signing the application itself
+# 2. enables the -p option to be used more than once
+# 2. ensures the provisioning profile's bundle-identifier matches the app's bundle identifier
+#
 
 
 function checkStatus {
@@ -62,24 +69,24 @@ fi
 }
 
 if [ $# -lt 3 ]; then
-    echo "usage: $0 source identity -p provisioning [-e entitlements] [-r adjustBetaReports] [-d displayName] [-n version] -b bundleId outputIpa" >&2
-    echo "       -p and -b are optional, but their use is heavly recommended" >&2
-    echo "       -r flag requires a value '-r yes'"
+    echo "usage: $0 source identity -p provisioning [-e entitlements] [-r adjustBetaReports] [-d displayName] [-n version] [-b bundleId] outputIpa" >&2
+    echo "       -p option may be provided multiple times" >&2
+    echo "       -r flag requires a value '-r yes'" >&2
     echo "       -r flag is ignored if -e is also used" >&2
     exit 1
 fi
 
 ORIGINAL_FILE="$1"
 CERTIFICATE="$2"
-NEW_PROVISION=
 ENTITLEMENTS=
 BUNDLE_IDENTIFIER=""
 DISPLAY_NAME=""
-APP_IDENTIFER_PREFIX=""
-TEAM_IDENTIFIER=""
 KEYCHAIN=""
 VERSION_NUMBER=""
 ADJUST_BETA_REPORTS_ACTIVE_FLAG="0"
+RAW_PROVISIONS=()
+PROVISIONS_BY_ID=()
+DEFAULT_PROVISION=""
 TEMP_DIR="_floatsignTemp"
 
 # options start index
@@ -87,8 +94,12 @@ OPTIND=3
 while getopts p:d:e:k:b:r:n: opt; do
     case $opt in
         p)
-            NEW_PROVISION="$OPTARG"
-            echo "Specified provisioning profile: '$NEW_PROVISION'" >&2
+            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"
@@ -134,6 +145,10 @@ then
     exit 1
 fi
 
+if [[ "${#RAW_PROVISIONS[*]}" == "0" ]]; then
+    echo "-p 'xxxx.mobileprovision' argument is required" >&2
+    exit 1;
+fi
 
 # Check for and remove the temporary directory if it already exists
 if [ -d "$TEMP_DIR" ]; 
@@ -178,24 +193,140 @@ APP_NAME=$(ls "$TEMP_DIR/Payload/")
 # Make sure that PATH includes the location of the PlistBuddy helper tool as its location is not standard
 export PATH=$PATH:/usr/libexec
 
+# Test whether two bundle identifiers match
+# The first one may contain the wildcard character '*', in which case pattern matching will be used unless the third parameter is "STRICT"
+function does_bundle_id_match {
+
+if [[ "$1" == "$2" ]]; then
+    return 0
+elif [[ "$3" != STRICT && "$1" =~ \* ]]; then
+    local PATTERN0="${1//\./\\.}"       # com.example.*     -> com\.example\.*
+    local PATTERN1="${PATTERN0//\*/.*}" # com\.example\.*   -> com\.example\..*
+    if [[ "$2" =~ ^$PATTERN1$ ]]; then
+        return 0
+    fi
+fi
+
+return 1
+}
+
+# Find the provisioning profile for a given bundle identifier
+function provision_for_bundle_id {
+
+for ARG in "${PROVISIONS_BY_ID[@]}"; do
+    if does_bundle_id_match "${ARG%%=*}" "$1" "$2"; then
+        echo "${ARG#*=}"
+        break
+    fi
+done
+}
+
+# Find the bundle identifier contained inside a provisioning profile
+function bundle_id_for_provison {
+
+local FULL_BUNDLE_ID=`PlistBuddy -c 'Print :Entitlements:application-identifier' /dev/stdin <<< $(security cms -D -i "$1")`
+checkStatus
+echo "${FULL_BUNDLE_ID#*.}"
+}
+
+# Add given provisioning profile and bundle identifier to the search list
+function add_provision_for_bundle_id {
+
+local PROVISION="$1"
+local BUNDLE_ID="$2"
+
+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
+fi
+
+PROVISIONS_BY_ID+=("$BUNDLE_ID=$PROVISION")
+}
+
+# Add given provisioning profile to the search list
+function add_provision {
+
+local PROVISION="$1"
+
+if [[ "$1" =~ .+=.+ ]]; then
+    PROVISION="${1#*=}"
+    add_provision_for_bundle_id "$PROVISION" "${1%%=*}"
+elif [[ "$DEFAULT_PROVISION" == "" ]]; then
+    DEFAULT_PROVISION="$PROVISION"
+fi
+
+if [[ ! -e "$PROVISION" ]]; then
+    echo "Provisioning profile '$PROVISION' file does not exist" >&2
+    exit 1;
+fi
+
+local BUNDLE_ID=`bundle_id_for_provison "$PROVISION"`
+add_provision_for_bundle_id "$PROVISION" "$BUNDLE_ID"
+}
+
+# Load bundle identifiers from provisioning profiles
+for ARG in "${RAW_PROVISIONS[@]}"; do
+    add_provision "$ARG"
+done
+
+# Resign the given application
+function resign {
+
+local APP_PATH="$1"
+local NESTED="$2"
+local BUNDLE_IDENTIFIER="$BUNDLE_IDENTIFIER"
+local NEW_PROVISION="$NEW_PROVISION"
+local APP_IDENTIFER_PREFIX=""
+local TEAM_IDENTIFIER=""
+
+if [[ "$NESTED" == NESTED ]]; then
+    # Ignore bundle identifier for nested applications
+    BUNDLE_IDENTIFIER=""
+fi
+
 # Make sure that the Info.plist file is where we expect it
-if [ ! -e "$TEMP_DIR/Payload/$APP_NAME/Info.plist" ];
+if [ ! -e "$APP_PATH/Info.plist" ];
 then
-    echo "Expected file does not exist: '$TEMP_DIR/Payload/$APP_NAME/Info.plist'" >&2
+    echo "Expected file does not exist: '$APP_PATH/Info.plist'" >&2
     exit 1;
 fi
 
 # Read in current values from the app
-CURRENT_NAME=`PlistBuddy -c "Print :CFBundleDisplayName" "$TEMP_DIR/Payload/$APP_NAME/Info.plist"`
-CURRENT_BUNDLE_IDENTIFIER=`PlistBuddy -c "Print :CFBundleIdentifier" "$TEMP_DIR/Payload/$APP_NAME/Info.plist"`
-if [ "${BUNDLE_IDENTIFIER}" == "" ];
-then
-    BUNDLE_IDENTIFIER=`egrep -a -A 2 application-identifier "${NEW_PROVISION}" | grep string | sed -e 's/<string>//' -e 's/<\/string>//' -e 's/ //' | awk '{split($0,a,"."); i = length(a); for(ix=2; ix <= i;ix++){ s=s a[ix]; if(i!=ix){s=s "."};} print s;}'`
-    if [[ "${BUNDLE_IDENTIFIER}" == *\** ]]; then
+local CURRENT_NAME=`PlistBuddy -c "Print :CFBundleDisplayName" "$APP_PATH/Info.plist"`
+local CURRENT_BUNDLE_IDENTIFIER=`PlistBuddy -c "Print :CFBundleIdentifier" "$APP_PATH/Info.plist"`
+local NEW_PROVISION=`provision_for_bundle_id "${BUNDLE_IDENTIFIER:-$CURRENT_BUNDLE_IDENTIFIER}"`
+
+if [[ "$NEW_PROVISION" == "" && "$NESTED" != NESTED ]]; then
+    NEW_PROVISION="$DEFAULT_PROVISION"
+fi
+
+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
+    else
+        echo "No provisioning profile for application: '$APP_PATH' with bundle identifier '${BUNDLE_IDENTIFIER:-$CURRENT_BUNDLE_IDENTIFIER}'" >&2
+    fi
+    echo "Use the -p option (example: -p com.example.app=xxxx.mobileprovision)" >&2
+    exit 1;
+fi
+
+local PROVISION_BUNDLE_IDENTIFIER=`bundle_id_for_provison "$NEW_PROVISION"`
+
+# 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
-        BUNDLE_IDENTIFIER=$CURRENT_BUNDLE_IDENTIFIER;
+        BUNDLE_IDENTIFIER="$CURRENT_BUNDLE_IDENTIFIER"
+    else
+        BUNDLE_IDENTIFIER="$PROVISION_BUNDLE_IDENTIFIER"
     fi
-    checkStatus
+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
 fi
 
 echo "Current bundle identifier is: '$CURRENT_BUNDLE_IDENTIFIER'" >&2
@@ -207,81 +338,69 @@ then
     if [ "${DISPLAY_NAME}" != "${CURRENT_NAME}" ];
     then
         echo "Changing display name from '$CURRENT_NAME' to '$DISPLAY_NAME'" >&2
-        `PlistBuddy -c "Set :CFBundleDisplayName $DISPLAY_NAME" "$TEMP_DIR/Payload/$APP_NAME/Info.plist"`
+        `PlistBuddy -c "Set :CFBundleDisplayName $DISPLAY_NAME" "$APP_PATH/Info.plist"`
     fi
 fi
 
 # Replace the embedded mobile provisioning profile
-if [ "$NEW_PROVISION" != "" ];
+echo "Validating the new provisioning profile: $NEW_PROVISION" >&2
+security cms -D -i "$NEW_PROVISION" > "$TEMP_DIR/profile.plist"
+checkStatus
+
+APP_IDENTIFER_PREFIX=`PlistBuddy -c "Print :Entitlements:application-identifier" "$TEMP_DIR/profile.plist" | grep -E '^[A-Z0-9]*' -o | tr -d '\n'` 
+if [ "$APP_IDENTIFER_PREFIX" == "" ];
 then
-    if [[ -e "$NEW_PROVISION" ]];
+    APP_IDENTIFER_PREFIX=`PlistBuddy -c "Print :ApplicationIdentifierPrefix:0" "$TEMP_DIR/profile.plist"` 
+    if [ "$APP_IDENTIFER_PREFIX" == "" ];
     then
-        echo "Validating the new provisioning profile: $NEW_PROVISION" >&2
-        security cms -D -i "$NEW_PROVISION" > "$TEMP_DIR/profile.plist"
-        checkStatus
-
-        APP_IDENTIFER_PREFIX=`PlistBuddy -c "Print :Entitlements:application-identifier" "$TEMP_DIR/profile.plist" | grep -E '^[A-Z0-9]*' -o | tr -d '\n'` 
-        if [ "$APP_IDENTIFER_PREFIX" == "" ];
-        then
-            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;
-            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
-            fi
-        else
-            echo "Profile app identifier prefix is '$APP_IDENTIFER_PREFIX'" >&2
-        fi
-        
-        TEAM_IDENTIFIER=`PlistBuddy -c "Print :Entitlements:com.apple.developer.team-identifier" "$TEMP_DIR/profile.plist" | tr -d '\n'` 
-        if [ "$TEAM_IDENTIFIER" == "" ];
-        then
-            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
-            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
-            fi
-        else
-            echo "Profile team identifier is '$TEAM_IDENTIFIER'" >&2
-        fi
+        echo "Failed to extract any app identifier prefix from '$NEW_PROVISION'" >&2
+        exit 1;
+    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
+    fi
+else
+    echo "Profile app identifier prefix is '$APP_IDENTIFER_PREFIX'" >&2
+fi
 
-        cp "$NEW_PROVISION" "$TEMP_DIR/Payload/$APP_NAME/embedded.mobileprovision"
+TEAM_IDENTIFIER=`PlistBuddy -c "Print :Entitlements:com.apple.developer.team-identifier" "$TEMP_DIR/profile.plist" | tr -d '\n'` 
+if [ "$TEAM_IDENTIFIER" == "" ];
+then
+    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
     else
-        echo "Provisioning profile '$NEW_PROVISION' file does not exist" >&2
-        exit 1;
+        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
     fi
 else
-    echo "-p 'xxxx.mobileprovision' argument is required" >&2
-    exit 1;
+    echo "Profile team identifier is '$TEAM_IDENTIFIER'" >&2
 fi
 
+cp "$NEW_PROVISION" "$APP_PATH/embedded.mobileprovision"
+
 
 #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
-    `PlistBuddy -c "Set :CFBundleIdentifier $BUNDLE_IDENTIFIER" "$TEMP_DIR/Payload/$APP_NAME/Info.plist"`
+    `PlistBuddy -c "Set :CFBundleIdentifier $BUNDLE_IDENTIFIER" "$APP_PATH/Info.plist"`
     checkStatus
 fi
 
 # Update the version number properties in the Info.plist if a version number has been provided
 if [ "$VERSION_NUMBER" != "" ];
 then
-    CURRENT_VERSION_NUMBER=`PlistBuddy -c "Print :CFBundleVersion" "$TEMP_DIR/Payload/$APP_NAME/Info.plist"`
+    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
-        `PlistBuddy -c "Set :CFBundleVersion $VERSION_NUMBER" "$TEMP_DIR/Payload/$APP_NAME/Info.plist"`
-        `PlistBuddy -c "Set :CFBundleShortVersionString $VERSION_NUMBER" "$TEMP_DIR/Payload/$APP_NAME/Info.plist"`
+        `PlistBuddy -c "Set :CFBundleVersion $VERSION_NUMBER" "$APP_PATH/Info.plist"`
+        `PlistBuddy -c "Set :CFBundleShortVersionString $VERSION_NUMBER" "$APP_PATH/Info.plist"`
     fi
 fi
 
 # Check for and resign any embedded frameworks (new feature for iOS 8 and above apps)
-FRAMEWORKS_DIR="$TEMP_DIR/Payload/$APP_NAME/Frameworks"
+FRAMEWORKS_DIR="$APP_PATH/Frameworks"
 if [ -d "$FRAMEWORKS_DIR" ];
 then
     if [ "$TEAM_IDENTIFIER" == "" ];
@@ -304,7 +423,6 @@ then
 fi
 
 
-# Resign the application
 if [ "$ENTITLEMENTS" != "" ];
 then
     if [ -n "$APP_IDENTIFER_PREFIX" ];
@@ -339,11 +457,11 @@ then
 
     echo "Resigning application using certificate: '$CERTIFICATE'" >&2
     echo "and entitlements: $ENTITLEMENTS" >&2
-    /usr/bin/codesign -f -s "$CERTIFICATE" --entitlements="$ENTITLEMENTS" "$TEMP_DIR/Payload/$APP_NAME"
+    /usr/bin/codesign -f -s "$CERTIFICATE" --entitlements="$ENTITLEMENTS" "$APP_PATH"
     checkStatus
 else
     echo "Extracting existing entitlements for updating" >&2
-    /usr/bin/codesign -d --entitlements - "$TEMP_DIR/Payload/$APP_NAME" > "$TEMP_DIR/newEntitlements" 2> /dev/null
+    /usr/bin/codesign -d --entitlements - "$APP_PATH" > "$TEMP_DIR/newEntitlements" 2> /dev/null
     if [ $? -eq 0 ];
     then
         ENTITLEMENTS_TEMP=`cat "$TEMP_DIR/newEntitlements" | sed -E -e '1d'`
@@ -406,7 +524,7 @@ else
                 then
                     echo "and team identifier: '$TEAM_IDENTIFIER'" >&2
                 fi
-                /usr/bin/codesign -f -s "$CERTIFICATE" --entitlements="$TEMP_DIR/newEntitlements" "$TEMP_DIR/Payload/$APP_NAME"
+                /usr/bin/codesign -f -s "$CERTIFICATE" --entitlements="$TEMP_DIR/newEntitlements" "$APP_PATH"
                 checkStatus
             else
                 echo "Failed to create required intermediate file" >&2
@@ -416,14 +534,14 @@ else
             echo "No entitlements found" >&2
             echo "Resigning application using certificate: '$CERTIFICATE'" >&2
             echo "without entitlements" >&2
-            /usr/bin/codesign -f -s "$CERTIFICATE" "$TEMP_DIR/Payload/$APP_NAME"
+            /usr/bin/codesign -f -s "$CERTIFICATE" "$APP_PATH"
             checkStatus
         fi
     else
         echo "Failed to extract entitlements" >&2
         echo "Resigning application using certificate: '$CERTIFICATE'" >&2
         echo "without entitlements" >&2
-        /usr/bin/codesign -f -s "$CERTIFICATE" "$TEMP_DIR/Payload/$APP_NAME"
+        /usr/bin/codesign -f -s "$CERTIFICATE" "$APP_PATH"
         checkStatus
     fi
 fi
@@ -432,6 +550,18 @@ fi
 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
+    resign "$app" NESTED
+done < <(find "$TEMP_DIR/Payload/$APP_NAME" -d -mindepth 1 \( -name "*.app" -or -name "*.appex" \) -print0)
+
+# Resign the application
+resign "$TEMP_DIR/Payload/$APP_NAME"
+
 # Repackage quietly
 echo "Repackaging as $NEW_FILE" >&2
 

data/lib/sigh/resign.rb

@@ -5,28 +5,35 @@ module Sigh
   class Resign
     def run(options, args)
       # get the command line inputs and parse those into the vars we need...
-      ipa, signing_identity, provisioning_profile = get_inputs(options, args)
+      ipa, signing_identity, provisioning_profiles = get_inputs(options, args)
 
       # ... then invoke out programmatic interface with these vars
-      resign(ipa, signing_identity, provisioning_profile)
+      resign(ipa, signing_identity, provisioning_profiles)
     end
 
-    def self.resign(ipa, signing_identity, provisioning_profile)
-      self.new.resign(ipa, signing_identity, provisioning_profile)
+    def self.resign(ipa, signing_identity, provisioning_profiles)
+      self.new.resign(ipa, signing_identity, provisioning_profiles)
     end
 
-    def resign(ipa, signing_identity, provisioning_profile)
+    def resign(ipa, signing_identity, provisioning_profiles)
       resign_path = find_resign_path
       signing_identity = find_signing_identity(signing_identity)
 
+      unless provisioning_profiles.kind_of?(Enumerable)
+        provisioning_profiles = [provisioning_profiles]
+      end
+
       # validate that we have valid values for all these params, we don't need to check signing_identity because `find_signing_identity` will only ever return a valid value
-      validate_params(resign_path, ipa, provisioning_profile)
+      validate_params(resign_path, ipa, provisioning_profiles)
+
+      provisioning_options = provisioning_profiles.map { |fst, snd| "-p #{[fst, snd].compact.join('=')}" }.join(' ')
 
       command = [
         resign_path.shellescape,
         ipa.shellescape,
         signing_identity.shellescape,
-        "-r yes -p #{provisioning_profile.shellescape}",
+        "-r yes",
+        provisioning_options,
         ipa.shellescape
       ].join(' ')
 
@@ -40,7 +47,7 @@ module Sigh
         ptn = 'Assuming Distribution Identity'
       end
 
-      if output.include?(ptn)
+      if output.include?(ptn) && $?.to_i == 0
         Helper.log.info "Successfully signed #{ipa}!".green
         true
       else
@@ -52,9 +59,9 @@ module Sigh
     def get_inputs(options, args)
       ipa = args.first || find_ipa || ask('Path to ipa file: ')
       signing_identity = options.signing_identity || ask_for_signing_identity
-      provisioning_profile = options.provisioning_profile || find_provisioning_profile || ask('Path to provisioning file: ')
+      provisioning_profiles = options.provisioning_profile || find_provisioning_profile || ask('Path to provisioning file: ')
 
-      return ipa, signing_identity, provisioning_profile
+      return ipa, signing_identity, provisioning_profiles
     end
 
     def find_resign_path
@@ -78,10 +85,10 @@ module Sigh
       signing_identity
     end
 
-    def validate_params(resign_path, ipa, provisioning_profile)
+    def validate_params(resign_path, ipa, provisioning_profiles)
       validate_resign_path(resign_path)
       validate_ipa_file(ipa)
-      validate_provisioning_file(provisioning_profile)
+      provisioning_profiles.each { |fst, snd| validate_provisioning_file(snd || fst) }
     end
 
     def validate_resign_path(resign_path)

data/lib/sigh/runner.rb

@@ -28,7 +28,7 @@ module Sigh
             Helper.log.info "Updating the provisioning profile".yellow
           else
             Helper.log.info "Updating the profile to include all devices".yellow
-            profile.devices = Spaceship.device.all
+            profile.devices = Spaceship.device.all_for_profile_type(profile.type)
           end
 
           profile = profile.update! # assign it, as it's a new profile

data/lib/sigh/version.rb

@@ -1,3 +1,3 @@
 module Sigh
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sigh
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-15 00:00:00.000000000 Z
+date: 2015-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane_core
@@ -50,14 +50,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -226,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Because you would rather spend your time building stuff than fighting provisioning