sigh 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 310f1a18571628069c1c4730cdce58d7ba17d2a2
-  data.tar.gz: e44e6ea604939d78861cc77179be6c9822ecdc3e
+  metadata.gz: d67d7db17e2b5544c4e47e98ac8da10e04b9dd90
+  data.tar.gz: dad2fb8369a13e45d6e60637298d94504325aeff
 SHA512:
-  metadata.gz: fb2d7905de6218ce67bf8b2d22cdb8869f6017c1d58b2e7c5679eaf36add7a0913ceade5f2fe750537da80c847bcec30ee59e54ac860737991040ce0bd9167de
-  data.tar.gz: 77141a2f7120b3e7f8058ad0efacd5c7e394cca0991b9639081d10236eb7b6146f327f65e1902fb37980710c11b4fea2c17a58e19b2a4d3e986621577ea77a80
+  metadata.gz: fbd9d816a8f25c821f2c8ccd33880ad0c85c277f40308d52bbb33a5f0b7438957d8116c6cea732937b96ec15473005b770796738b8b14fa21e4e2fd72e10e2da
+  data.tar.gz: a4581ea28bed0dd0a301c00a980869e686a098ed9aa55494f57213eb5248c789569fb87399bbde7ba08365eb3fdc23aff862a3fbdc835d2657aa455f4d410354

data/lib/assets/resign.sh

@@ -55,7 +55,9 @@
 # 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
+# 3. ensures the provisioning profile's bundle-identifier matches the app's bundle identifier
+# 4. extracts the entitlements from the provisioning profile
+# 5. copy the entitlements as archived-expanded-entitlements.xcent inside the app bundle (because Xcode does too)
 #
 
 
@@ -69,10 +71,8 @@ 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 "usage: $0 source identity -p provisioning [-e entitlements] [-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
 
@@ -83,7 +83,6 @@ BUNDLE_IDENTIFIER=""
 DISPLAY_NAME=""
 KEYCHAIN=""
 VERSION_NUMBER=""
-ADJUST_BETA_REPORTS_ACTIVE_FLAG="0"
 RAW_PROVISIONS=()
 PROVISIONS_BY_ID=()
 DEFAULT_PROVISION=""
@@ -91,7 +90,7 @@ TEMP_DIR="_floatsignTemp"
 
 # options start index
 OPTIND=3
-while getopts p:d:e:k:b:r:n: opt; do
+while getopts p:d:e:k:b:n: opt; do
     case $opt in
         p)
             RAW_PROVISIONS+=("$OPTARG")
@@ -121,10 +120,6 @@ while getopts p:d:e:k:b:r:n: opt; do
             VERSION_NUMBER="$OPTARG"
             echo "Specified version to use: '$VERSION_NUMBER'" >&2
             ;;
-        r)
-            ADJUST_BETA_REPORTS_ACTIVE_FLAG="1"
-            echo "Enabled adjustment of beta-reports-active entitlements" >&2
-            ;;
         \?)
             echo "Invalid option: -$OPTARG" >&2
             exit 1
@@ -457,93 +452,18 @@ then
 
     echo "Resigning application using certificate: '$CERTIFICATE'" >&2
     echo "and entitlements: $ENTITLEMENTS" >&2
+    cp -- "$ENTITLEMENTS" "$APP_PATH/archived-expanded-entitlements.xcent"
     /usr/bin/codesign -f -s "$CERTIFICATE" --entitlements="$ENTITLEMENTS" "$APP_PATH"
     checkStatus
 else
-    echo "Extracting existing entitlements for updating" >&2
-    /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'`
-        if [ -n "$ENTITLEMENTS_TEMP" ]; then
-            echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>$ENTITLEMENTS_TEMP" > "$TEMP_DIR/newEntitlements"
-            if [ -s "$TEMP_DIR/newEntitlements" ];
-            then
-                if [ "$TEAM_IDENTIFIER" != "" ];
-                then
-                    PlistBuddy -c "Set :com.apple.developer.team-identifier ${TEAM_IDENTIFIER}" "$TEMP_DIR/newEntitlements"
-                    checkStatus
-                fi
-                PlistBuddy -c "Set :application-identifier ${APP_IDENTIFER_PREFIX}.${BUNDLE_IDENTIFIER}" "$TEMP_DIR/newEntitlements"
-                checkStatus
-                PlistBuddy -c "Set :keychain-access-groups:0 ${APP_IDENTIFER_PREFIX}.${BUNDLE_IDENTIFIER}" "$TEMP_DIR/newEntitlements"
-#               checkStatus  -- if this fails it's likely because the keychain-access-groups key does not exist, so we have nothing to update
-                if [[ "$CERTIFICATE" == *Distribution* ]]; then
-                    IS_ENTERPRISE_PROFILE=`PlistBuddy -c "Print :ProvisionsAllDevices" "$TEMP_DIR/profile.plist" | tr -d '\n'`
-                    ADHOC_PROVISIONING_DEVICES=`PlistBuddy -c "Print :ProvisionedDevices" "$TEMP_DIR/profile.plist" | tr -d '\n'`
-
-                    echo "Assuming Distribution Identity"
-                    if [ "$ADJUST_BETA_REPORTS_ACTIVE_FLAG" == "1" ]; then
-                        if [ "$IS_ENTERPRISE_PROFILE" == "true" ]; then
-                            echo "Ensuring beta-reports-active is not included for Enterprise environment"
-                            PlistBuddy -c "Delete :beta-reports-active" "$TEMP_DIR/newEntitlements" || true
-#                           checkStatus -- this can fail is beta-reports-active isn't present, which is OK
-                        elif [ -n "$ADHOC_PROVISIONING_DEVICES" ]; then
-                            echo "Ensuring beta-reports-active is not included for Adhoc environment"
-                            PlistBuddy -c "Delete :beta-reports-active" "$TEMP_DIR/newEntitlements" || true
-#                           checkStatus -- this can fail is beta-reports-active isn't present, which is OK
-                        else
-                            echo "Ensuring beta-reports-active is present and enabled"
-                            # new beta key is only used for Distribution; might not exist yet, if we were building Development
-                            PlistBuddy -c "Add :beta-reports-active bool true" "$TEMP_DIR/newEntitlements"
-                            if [ $? -ne 0 ]; then
-                                PlistBuddy -c "Set :beta-reports-active YES" "$TEMP_DIR/newEntitlements"
-                            fi
-                            checkStatus
-                        fi
-                    fi
-                    echo "Setting get-task-allow entitlement to NO"
-                    PlistBuddy -c "Set :get-task-allow NO" "$TEMP_DIR/newEntitlements"
-                else
-                    echo "Assuming Development Identity"
-                    if [ "$ADJUST_BETA_REPORTS_ACTIVE_FLAG" == "1" ]; then
-                        # if we were building with Distribution profile, we have to delete the beta key
-                        echo "Ensuring beta-reports-active is not included"
-                        PlistBuddy -c "Delete :beta-reports-active" "$TEMP_DIR/newEntitlements"
-                        # do not check status here, just let it fail if entry does not exist
-                    fi
-                    echo "Setting get-task-allow entitlement to YES"
-                    PlistBuddy -c "Set :get-task-allow YES" "$TEMP_DIR/newEntitlements"
-                fi
-                checkStatus
-                plutil -lint "$TEMP_DIR/newEntitlements" > /dev/null
-                checkStatus
-                echo "Resigning application using certificate: '$CERTIFICATE'" >&2
-                echo "using existing entitlements updated with bundle identifier: '$APP_IDENTIFER_PREFIX.$BUNDLE_IDENTIFIER'" >&2
-                if [ "$TEAM_IDENTIFIER" != "" ];
-                then
-                    echo "and team identifier: '$TEAM_IDENTIFIER'" >&2
-                fi
-                /usr/bin/codesign -f -s "$CERTIFICATE" --entitlements="$TEMP_DIR/newEntitlements" "$APP_PATH"
-                checkStatus
-            else
-                echo "Failed to create required intermediate file" >&2
-                exit 1;
-            fi
-        else
-            echo "No entitlements found" >&2
-            echo "Resigning application using certificate: '$CERTIFICATE'" >&2
-            echo "without entitlements" >&2
-            /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" "$APP_PATH"
-        checkStatus
-    fi
+    echo "Extracting entitlements from provisioning profile" >&2
+    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
+    cp -- "$TEMP_DIR/newEntitlements" "$APP_PATH/archived-expanded-entitlements.xcent"
+    /usr/bin/codesign -f -s "$CERTIFICATE" --entitlements="$TEMP_DIR/newEntitlements" "$APP_PATH"
+    checkStatus
 fi
 
 # Remove the temporary files if they were created before generating ipa

data/lib/sigh/resign.rb

@@ -32,22 +32,14 @@ module Sigh
         resign_path.shellescape,
         ipa.shellescape,
         signing_identity.shellescape,
-        "-r yes",
         provisioning_options,
         ipa.shellescape
       ].join(' ')
 
       puts command.magenta
-      output = `#{command}`
-      puts output
+      puts `#{command}`
 
-      if signing_identity =~ /^iPhone Developer:*/
-        ptn = 'Assuming Development Identity'
-      else
-        ptn = 'Assuming Distribution Identity'
-      end
-
-      if output.include?(ptn) && $?.to_i == 0
+      if $?.to_i == 0
         Helper.log.info "Successfully signed #{ipa}!".green
         true
       else

data/lib/sigh/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sigh
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-23 00:00:00.000000000 Z
+date: 2015-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane_core