sigh 1.6.1 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8c29db84c759030a3ce9a075a16a53848e486ca
-  data.tar.gz: e6e89f2225f2cc026e7cf45a45660b6ee221fdc7
+  metadata.gz: c0a6111203a414e101d5ea0c626733f804556932
+  data.tar.gz: 5dacfa3e6b32ddf8db0a53a3a48d1958ca447068
 SHA512:
-  metadata.gz: 10553c5768b7de1f9ff1b752fc1dfb109ef4e8a383d4685209c6b12f9cad6053ae2425fbd3106162c7ef793327bbcab72ad3c964d90e9a9e0337ebf5fa1ff8e2
-  data.tar.gz: 603d7f4cd26f1f935aa825f720b69ef3d70b276a1b1249d73b63dfc4b7c14fd020ddf3e6becc2488bf7c4cb7c82022d52785b172904e27d17488600e5c97fbd9
+  metadata.gz: a21ee4e42712a199ac02da1d3f19e67d93023cbf97ec391fdbb9561b82afd9040fbc700d685fdc2c90460ebd7a15e87355837c96f71e36cee7398fa6e06e6bd9
+  data.tar.gz: 9de2cb74088c34847745880b53a8a1938e7c62c90875a1f81641015e8cdadb871ef49e40123aba25af5b3c44ff9f7800c47e4785c27cc4923d34691f5fa2ad55

data/bin/sigh

@@ -61,12 +61,17 @@ 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 '-x', '--version_number STRING', String, 'Version number to force binary to use'
-      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.'\
+      c.option '-x', '--version_number STRING', String, 'Version number to force binary and all nested binaries to use. Changes both CFBundleShortVersionString and CFBundleIdentifier.'
+      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.option '-d', '--display_name STRING', String, 'Display name to use'
+      c.option '-e', '--entitlements PATH', String, 'The path to the entitlements file to use.'
+      c.option '--short-version STRING', String, 'Short version string to force binary to use (CFBundleShortVersionString). '\
+               '\nCannot be used together with -x|--version_number option.'
+      c.option '--bundle-version STRING', String, 'Bundle version to force binary and all nested binaries to use (CFBundleIdentifier). '\
+               'Cannot be used together with -x|--version_number option.'
 
       c.action do |args, options|
         Sigh::Resign.new.run(options, args)

data/lib/assets/resign.sh

@@ -85,10 +85,52 @@ function checkStatus {
     fi
 }
 
+usage() {
+    echo -e "Usage: $(basename $0) source identity -p|--provisioning provisioning" >&2
+    echo -e "\t\t[-e|--entitlements entitlements]" >&2
+    echo -e "\t\t[-k|--keychain keychain]" >&2
+    echo -e "\t\t[-d|--display-name displayName]" >&2
+    echo -e "\t\t[-n|--version-number version]" >&2
+    echo -e "\t\t[--short-version shortVersion]" >&2
+    echo -e "\t\t[--bundle-version bundleVersion]" >&2
+    echo -e "\t\t[-b|--bundle-id bundleId]" >&2
+    echo -e "\t\toutputIpa" >&2
+    echo "Usage: $(basename $0) -h|--help" >&2
+    echo "Options:" >&2
+    echo -e "\t-p, --provisioning provisioning\t\tProvisioning profile option, may be provided multiple times." >&2
+    echo -e "\t\t\t\t\t\tYou can specify provisioning profile file name." >&2
+    echo -e "\t\t\t\t\t\t\t-p xxx.mobileprovision" >&2
+    echo "" >&2
+    echo -e "\t\t\t\t\t\tAlternatively you may provide multiple provisioning profiles if the application contains" >&2
+    echo -e "\t\t\t\t\t\tnested applications or app extensions, which need their own provisioning" >&2
+    echo -e "\t\t\t\t\t\tprofile. You can do so by providing -p option multiple times specifying" >&2
+    echo -e "\t\t\t\t\t\told bundle identifier and new provisioning profile for that bundle id joined with '='." >&2
+    echo -e "\t\t\t\t\t\t\t-p com.main-app=main-app.mobileprovision" >&2
+    echo -e "\t\t\t\t\t\t\t-p com.nested-app=nested-app.mobileprovision" >&2
+    echo -e "\t\t\t\t\t\t\t-p com.nested-extension=nested-extension.mobileprovision" >&2
+    echo "" >&2
+    echo -e "\t-e, --entitlements entitlements\t\tSpecify entitlements file path for code signing." >&2
+    echo -e "\t-k, --keychain keychain\t\t\tSpecify keychain for code signing." >&2
+    echo -e "\t-d, --display-name displayName\t\tSpecify new display name." >&2
+    echo -e "\t\t\t\t\t\t\tWarning: will apply for all nested apps and extensions." >&2
+    echo -e "\t-n, --version-number version\t\tSpecify new version number." >&2
+    echo -e "\t\t\t\t\t\t\tWill set CFBundleShortVersionString and CFBundleVersion values in Info.plist." >&2
+    echo -e "\t\t\t\t\t\t\tWill apply for all nested apps and extensions." >&2
+    echo -e "\t    --short-version shortVersion\tSpecify new short version string (CFBundleShortVersionString)." >&2
+    echo -e "\t\t\t\t\t\t\tWill apply for all nested apps and extensions." >&2
+    echo -e "\t\t\t\t\t\t\tCan't use together with '-n, --version-number' option." >&2
+    echo -e "\t    --bundle-version bundleVersion\tSpecify new bundle version (CFBundleVersion) number." >&2
+    echo -e "\t\t\t\t\t\t\tWill apply for all nested apps and extensions." >&2
+    echo -e "\t\t\t\t\t\t\tCan't use together with '-n, --version-number' option." >&2
+    echo -e "\t-b, --bundle-id bundleId\t\tSpecify new bundle identifier (CFBundleIdentifier)." >&2
+    echo -e "\t\t\t\t\t\t\tWarning: will NOT apply for nested apps and extensions." >&2
+    echo -e "\t-v, --verbose\t\t\t\tVerbose output." >&2
+    echo -e "\t-h, --help\t\t\t\tDisplay help message." >&2
+    exit 2
+}
+
 if [ $# -lt 3 ]; then
-    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
-    exit 1
+    usage
 fi
 
 ORIGINAL_FILE="$1"
@@ -98,6 +140,8 @@ BUNDLE_IDENTIFIER=""
 DISPLAY_NAME=""
 KEYCHAIN=""
 VERSION_NUMBER=""
+SHORT_VERSION=
+BUNDLE_VERSION=
 RAW_PROVISIONS=()
 PROVISIONS_BY_ID=()
 DEFAULT_PROVISION=""
@@ -106,37 +150,57 @@ TEMP_DIR="_floatsignTemp"
 NESTED_APP_REFERENCE_KEYS=(":WKCompanionAppBundleIdentifier" ":NSExtension:NSExtensionAttributes:WKAppBundleIdentifier")
 
 # options start index
-OPTIND=3
-while getopts p:d:e:k:b:n:v opt; do
-    case $opt in
-        p)
-            RAW_PROVISIONS+=("$OPTARG")
+shift 2
+
+# Parse args
+while [ "$1" != "" ]; do
+    case $1 in
+        -p | --provisioning )
+            shift
+            RAW_PROVISIONS+=("$1")
+            ;;
+        -e | --entitlements )
+            shift
+            ENTITLEMENTS="$1"
             ;;
-        d)
-            DISPLAY_NAME="$OPTARG"
+        -d | --display-name )
+            shift
+            DISPLAY_NAME="$1"
             ;;
-        e)
-            ENTITLEMENTS="$OPTARG"
+        -b | --bundle-id )
+            shift
+            BUNDLE_IDENTIFIER="$1"
             ;;
-        b)
-            BUNDLE_IDENTIFIER="$OPTARG"
+        -k | --keychain )
+            shift
+            KEYCHAIN="$1"
             ;;
-        k)
-            KEYCHAIN="$OPTARG"
+        -n | --version-number )
+            shift
+            VERSION_NUMBER="$1"
             ;;
-        n)
-            VERSION_NUMBER="$OPTARG"
+        --short-version )
+            shift
+            SHORT_VERSION="$1"
             ;;
-        v)
+        --bundle-version )
+            shift
+            BUNDLE_VERSION="$1"
+            ;;
+        -v | --verbose )
             VERBOSE="--verbose"
             ;;
-        \?)
-            error "Invalid option: -$OPTARG"
+        -h | --help )
+            usage
             ;;
-        :)
-            error "Option -$OPTARG requires an argument."
+        * )
+            [[ -n "$NEW_FILE" ]] && error "Multiple output file names specified!"
+            [[ -z "$NEW_FILE" ]] && NEW_FILE="$1"
             ;;
     esac
+
+    # Next arg
+    shift
 done
 
 # Log the options
@@ -147,15 +211,22 @@ for provision in ${RAW_PROVISIONS[@]}; do
         log "Specified provisioning profile: '$provision'"
     fi
 done
+
+log "Original file: '$ORIGINAL_FILE'"
+log "Certificate: '$CERTIFICATE'"
 [[ -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'"
+[[ -n "${KEYCHAIN}" ]] && log "Specified keychain to use: '$KEYCHAIN'"
+[[ -n "${VERSION_NUMBER}" ]] && log "Specified version number to use: '$VERSION_NUMBER'"
+[[ -n "${SHORT_VERSION}" ]] && log "Specified short version to use: '$SHORT_VERSION'"
+[[ -n "${BUNDLE_VERSION}" ]] && log "Specified bundle version to use: '$BUNDLE_VERSION'"
+[[ -n "${NEW_FILE}" ]] && log "Output file name: '$NEW_FILE'"
 
-shift $((OPTIND-1))
+# Check that version number option is not clashing with short or bundle version options
+[[ -n "$VERSION_NUMBER" && (-n "$SHORT_VERSION" || -n "$BUNDLE_VERSION") ]] && error "versionNumber option cannot be used in combination with shortVersion or bundleVersion options"
 
-NEW_FILE="$1"
+# Check output file name
 if [ -z "$NEW_FILE" ];
 then
     error "Output file name required"
@@ -291,7 +362,7 @@ function resign {
     local NESTED="$2"
     local BUNDLE_IDENTIFIER="$BUNDLE_IDENTIFIER"
     local NEW_PROVISION="$NEW_PROVISION"
-    local APP_IDENTIFER_PREFIX=""
+    local APP_IDENTIFIER_PREFIX=""
     local TEAM_IDENTIFIER=""
 
     if [[ "$NESTED" == NESTED ]]; then
@@ -357,20 +428,23 @@ function resign {
     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" == "" ];
+    APP_IDENTIFIER_PREFIX=`PlistBuddy -c "Print :Entitlements:application-identifier" "$TEMP_DIR/profile.plist" | grep -E '^[A-Z0-9]*' -o | tr -d '\n'`
+    if [ "$APP_IDENTIFIER_PREFIX" == "" ];
     then
-        APP_IDENTIFER_PREFIX=`PlistBuddy -c "Print :ApplicationIdentifierPrefix:0" "$TEMP_DIR/profile.plist"`
-        if [ "$APP_IDENTIFER_PREFIX" == "" ];
+        APP_IDENTIFIER_PREFIX=`PlistBuddy -c "Print :ApplicationIdentifierPrefix:0" "$TEMP_DIR/profile.plist"`
+        if [ "$APP_IDENTIFIER_PREFIX" == "" ];
         then
             error "Failed to extract any app identifier prefix from '$NEW_PROVISION'"
         else
-            warning "WARNING: extracted an app identifier prefix '$APP_IDENTIFER_PREFIX' from '$NEW_PROVISION', but it was not found in the profile's entitlements"
+            warning "WARNING: extracted an app identifier prefix '$APP_IDENTIFIER_PREFIX' from '$NEW_PROVISION', but it was not found in the profile's entitlements"
         fi
     else
-        log "Profile app identifier prefix is '$APP_IDENTIFER_PREFIX'"
+        log "Profile app identifier prefix is '$APP_IDENTIFIER_PREFIX'"
     fi
 
+    # Set new app identifer prefix if such entry exists in plist file
+    PlistBuddy -c "Set :AppIdentifierPrefix $APP_IDENTIFIER_PREFIX." "$APP_PATH/Info.plist" 2>/dev/null
+
     TEAM_IDENTIFIER=`PlistBuddy -c "Print :Entitlements:com.apple.developer.team-identifier" "$TEMP_DIR/profile.plist" | tr -d '\n'`
     if [ "$TEAM_IDENTIFIER" == "" ];
     then
@@ -408,6 +482,24 @@ function resign {
         fi
     fi
 
+    # Update short version string in the Info.plist if provided
+    if [[ -n "$SHORT_VERSION" ]];
+    then
+        CURRENT_VALUE="$(PlistBuddy -c "Print :CFBundleShortVersionString" "$APP_PATH/Info.plist")"
+        # Even if the old value is same - just update, less code, less debugging
+        log "Updating the short version string (CFBundleShortVersionString) from '$CURRENT_VALUE' to '$SHORT_VERSION'"
+        PlistBuddy -c "Set :CFBundleShortVersionString $SHORT_VERSION" "$APP_PATH/Info.plist"
+    fi
+
+    # Update bundle version in the Info.plist if provided
+    if [[ -n "$BUNDLE_VERSION" ]];
+    then
+        CURRENT_VALUE="$(PlistBuddy -c "Print :CFBundleVersion" "$APP_PATH/Info.plist")"
+        # Even if the old value is same - just update, less code, less debugging
+        log "Updating the bundle version (CFBundleVersion) from '$CURRENT_VALUE' to '$BUNDLE_VERSION'"
+        PlistBuddy -c "Set :CFBundleVersion $BUNDLE_VERSION" "$APP_PATH/Info.plist"
+    fi
+
     # Check for and resign any embedded frameworks (new feature for iOS 8 and above apps)
     FRAMEWORKS_DIR="$APP_PATH/Frameworks"
     if [ -d "$FRAMEWORKS_DIR" ];
@@ -452,16 +544,16 @@ function resign {
 
     if [ "$ENTITLEMENTS" != "" ];
     then
-        if [ -n "$APP_IDENTIFER_PREFIX" ];
+        if [ -n "$APP_IDENTIFIER_PREFIX" ];
         then
             # sanity check the 'application-identifier' is present in the provided entitlements and matches the provisioning profile value
             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
                 error "Provided entitlements file is missing a value for the required 'application-identifier' key"
-            elif [ "$ENTITLEMENTS_APP_ID_PREFIX" != "$APP_IDENTIFER_PREFIX" ];
+            elif [ "$ENTITLEMENTS_APP_ID_PREFIX" != "$APP_IDENTIFIER_PREFIX" ];
             then
-                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'"
+                error "Provided entitlements file's app identifier prefix value '$ENTITLEMENTS_APP_ID_PREFIX' does not match the provided provisioning profile's value '$APP_IDENTIFIER_PREFIX'"
             fi
         fi
 
@@ -481,7 +573,7 @@ function resign {
         log "Resigning application using certificate: '$CERTIFICATE'"
         log "and entitlements: $ENTITLEMENTS"
         cp -- "$ENTITLEMENTS" "$APP_PATH/archived-expanded-entitlements.xcent"
-        /usr/bin/codesign ${VERBOSE} -f -s "$CERTIFICATE" --entitlements="$ENTITLEMENTS" "$APP_PATH"
+        /usr/bin/codesign ${VERBOSE} -f -s "$CERTIFICATE" --entitlements "$ENTITLEMENTS" "$APP_PATH"
         checkStatus
     else
         log "Extracting entitlements from provisioning profile"
@@ -490,7 +582,7 @@ function resign {
         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 ${VERBOSE} -f -s "$CERTIFICATE" --entitlements="$TEMP_DIR/newEntitlements" "$APP_PATH"
+        /usr/bin/codesign ${VERBOSE} -f -s "$CERTIFICATE" --entitlements "$TEMP_DIR/newEntitlements" "$APP_PATH"
         checkStatus
     fi
 

data/lib/sigh/resign.rb

@@ -6,16 +6,16 @@ module Sigh
     def run(options, args)
       # get the command line inputs and parse those into the vars we need...
 
-      ipa, signing_identity, provisioning_profiles, entitlements, version, display_name = get_inputs(options, args)
+      ipa, signing_identity, provisioning_profiles, entitlements, version, display_name, short_version, bundle_version = get_inputs(options, args)
       # ... then invoke our programmatic interface with these vars
-      resign(ipa, signing_identity, provisioning_profiles, entitlements, version, display_name)
+      resign(ipa, signing_identity, provisioning_profiles, entitlements, version, display_name, short_version, bundle_version)
     end
 
-    def self.resign(ipa, signing_identity, provisioning_profiles, entitlements, version, display_name)
-      self.new.resign(ipa, signing_identity, provisioning_profiles, entitlements, version, display_name)
+    def self.resign(ipa, signing_identity, provisioning_profiles, entitlements, version, display_name, short_version, bundle_version)
+      self.new.resign(ipa, signing_identity, provisioning_profiles, entitlements, version, display_name, short_version, bundle_version)
     end
 
-    def resign(ipa, signing_identity, provisioning_profiles, entitlements, version, display_name)
+    def resign(ipa, signing_identity, provisioning_profiles, entitlements, version, display_name, short_version, bundle_version)
       resign_path = find_resign_path
       signing_identity = find_signing_identity(signing_identity)
 
@@ -29,6 +29,8 @@ module Sigh
       provisioning_options = provisioning_profiles.map { |fst, snd| "-p #{[fst, snd].compact.map(&:shellescape).join('=')}" }.join(' ')
       version = "-n #{version}" if version
       display_name = "-d #{display_name.shellescape}" if display_name
+      short_version = "--short-version #{short_version}" if short_version
+      bundle_version = "--bundle-version #{bundle_version}" if bundle_version
       verbose = "-v" if $verbose
 
       command = [
@@ -39,6 +41,8 @@ module Sigh
         entitlements,
         version,
         display_name,
+        short_version,
+        bundle_version,
         verbose,
         ipa.shellescape
       ].join(' ')
@@ -59,11 +63,17 @@ module Sigh
       ipa = args.first || find_ipa || ask('Path to ipa file: ')
       signing_identity = options.signing_identity || ask_for_signing_identity
       provisioning_profiles = options.provisioning_profile || find_provisioning_profile || ask('Path to provisioning file: ')
-      entitlements = options.entitlements || find_entitlements
+      entitlements = options.entitlements || nil
       version = options.version_number || nil
       display_name = options.display_name || nil
+      short_version = options.short_version || nil
+      bundle_version = options.bundle_version || nil
 
-      return ipa, signing_identity, provisioning_profiles, entitlements, version, display_name
+      if options.provisioning_name
+        UI.important "The provisioning_name (-n) option is not applicable to resign. You should use provisioning_profile (-p) instead"
+      end
+
+      return ipa, signing_identity, provisioning_profiles, entitlements, version, display_name, short_version, bundle_version
     end
 
     def find_resign_path
@@ -78,10 +88,6 @@ module Sigh
       Dir[File.join(Dir.pwd, '*.mobileprovision')].sort { |a, b| File.mtime(a) <=> File.mtime(b) }.first
     end
 
-    def find_entitlements
-      Dir[File.join(Dir.pwd, '*.entitlements')].sort { |a, b| File.mtime(a) <=> File.mtime(b) }.first
-    end
-
     def find_signing_identity(signing_identity)
       until installed_identies.include?(signing_identity)
         UI.error "Couldn't find signing identity '#{signing_identity}'."

data/lib/sigh/version.rb

@@ -1,3 +1,3 @@
 module Sigh
-  VERSION = "1.6.1"
+  VERSION = "1.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sigh
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.7.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-04 00:00:00.000000000 Z
+date: 2016-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane_core