app-tools 1.10.1 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c53c7b1b883d626245fef32f059bb94ec818187a
-  data.tar.gz: 3b8f10a51ac1562a14ac77a0ff94ad663d3fc241
+  metadata.gz: b6eacf5d82043e7b7aed5b32b803a12ff284b661
+  data.tar.gz: 66d9989f247056f67a5f0a781b66babfe77cc853
 SHA512:
-  metadata.gz: 2903502ecedc7888e041307962b3671a401f862a5a400e09dea520374d323ac4cfad5a6be1df5accba27938d126f6851d91f67e024ebc02fcd2cf183c9ed11ba
-  data.tar.gz: 1f1a85540632644844936b2862dae799bca518979d5cb2c63df995d17f8918a046e971e496b8e1fd850a9ddbf259d124eba783d834e8f1d577fd1a9db398f8bd
+  metadata.gz: 678206ba7067d9fa8120aaff7b8dd080b91390975654ab5b6d1c9b8ba9799121ad23c20e58060d3668f986546237481e29f038686bff0b1ff84a2496a1a4c7ef
+  data.tar.gz: 04ed60ffbc58384af47c10f192f38b4f34deceedf490c71ecf152df7ddcf104a9b5e961d78ed299ae4c5c98737df39f596ffe8fc962063fcc69a3bfccf08d648

data/bin/resignipa

@@ -25,6 +25,7 @@ module AppTools
 
       ipa_basename = File.basename(ipa_path)
       profile_path = options[:p]
+      certificate_name = "iPhone Distribution: " + options[:c]
 
       unless File.exist?(profile_path)
         exit_now! "Must supply a valid provisioning profile"
@@ -53,7 +54,7 @@ module AppTools
       end
 
       ## Creating a temp dir to work in
-      temp_dir = File.join(File.dirname(ipa_path), ipa_basename + '.tmp')
+      temp_dir = File.join(File.dirname(ipa_path), ipa_basename[0...-4] + '.resignipa.tmp')
       contents_dir = File.join(temp_dir, "Contents")
 
       FileUtils.rm_rf temp_dir
@@ -65,7 +66,6 @@ module AppTools
       ## Get all dirs to be signed
       # See http://www.xgiovio.com/blog-photos-videos-other/blog/resign-your-ios-ipa-frameworks-and-plugins-included/
       payload_dir = File.join(contents_dir, "Payload")
-      sign_dirs = `find -d #{payload_dir} \\( -name \\*.app -o -name \\*.framework -o -name \\*.appex -name \\*.dylib \\)`.split("\n")
 
       ## Embed the new provisioning profile
       app_dir = `find -d #{payload_dir} -name \\*.app`.split("\n")
@@ -89,21 +89,24 @@ module AppTools
       File.write(entitlements_path,
           entitlements_data.to_plist(:plist_format => CFPropertyList::List::FORMAT_XML))
 
-      ## Finally, resign all the files
-      sign_dirs.each do |sign_dir|
-        if sign_dir.end_with?(".framework") or sign_dir.end_with?(".dylib")
-          # See https://github.com/fastlane/sigh/blob/master/lib/assets/resign.sh#L412
-          pid = Process.spawn("codesign", "-f", "-s", "iPhone Distribution: " + options[:c], sign_dir)
-        else
-          pid = Process.spawn("codesign", "-f", "-s", "iPhone Distribution: " + options[:c], "--entitlements", entitlements_path, sign_dir)
-        end
+      ## Resign all the frameworks and libraries first ...
+      # http://stackoverflow.com/questions/25297638/how-do-i-codesign-a-swift-app-via-the-commandline
+      `find -d #{payload_dir} \\( -name \\*.framework -o -name \\*.dylib \\)`.split("\n").each do |sign_dir|
+        # See https://github.com/fastlane/sigh/blob/master/lib/assets/resign.sh#L412
+        pid = Process.spawn("codesign", "-f", "-s", certificate_name, sign_dir)
         Process.wait(pid)
-
         unless $?.exitstatus == 0
-          exit_now! "Failed to sign files in #{sign_dir}"
+          exit_now! "Failed to sign #{sign_dir}"
         end
       end
 
+      ## ... then resign the app
+      pid = Process.spawn("codesign", "-f", "-s", certificate_name, "--entitlements", entitlements_path, app_path)
+      Process.wait(pid)
+      unless $?.exitstatus == 0
+        exit_now! "Failed to sign #{sign_dir}"
+      end
+
       ## Repack
       new_ipa_dir = File.join(File.dirname(ipa_path), ipa_basename + '.' + [*('a'..'z'),*('0'..'9')].shuffle[0,8].join)
       new_ipa_path = File.expand_path(File.join(new_ipa_dir, File.basename(ipa_path)))

data/bin/xcarchive2ipa

@@ -26,7 +26,7 @@ module AppTools
       xcarchive_path = File.expand_path(xcarchive_path)
       app_name = Dir.entries(xcarchive_path + '/Products/Applications')[2]
       app_base_name = app_name[0...-4]
-      tmp_path = File.dirname(xcarchive_path) + '/' + app_base_name + '.tmp'
+      tmp_path = File.dirname(xcarchive_path) + '/' + app_base_name + '.xcarchive2ipa.tmp'
 
       if Dir.exists?(tmp_path)
         FileUtils.rm_rf tmp_path
@@ -40,6 +40,10 @@ module AppTools
       # Copy the SwiftSupport tree
       FileUtils.cp_r xcarchive_path + '/SwiftSupport', tmp_path + '/SwiftSupport'
 
+      # HACK: Copy the Swift libraries into the Frameworks directory to make sure they match
+      # https://techblog.badoo.com/blog/2015/02/09/code-signing-and-distributing-swift/
+      FileUtils.cp_r xcarchive_path + '/SwiftSupport/iphoneos', tmp_path + '/Payload/' + app_name + '/Frameworks'
+
       # Fix up the symbols
       app_binary = xcarchive_path + '/Products/Applications/' + app_name + '/' + app_base_name
       FileUtils.mkdir tmp_path + '/Symbols'
@@ -54,7 +58,7 @@ module AppTools
       end
 
       `cd #{tmp_path}; zip -r #{ipa_rel_path} *`
-      FileUtils.rm_rf tmp_path
+      #FileUtils.rm_rf tmp_path
       puts ipa_path
     end
 

data/lib/app_tools/version.rb

@@ -1,3 +1,3 @@
 module AppTools
-  VERSION = "1.10.1"
+  VERSION = "1.11.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: app-tools
 version: !ruby/object:Gem::Version
-  version: 1.10.1
+  version: 1.11.0
 platform: ruby
 authors:
 - John Lyon-Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-07 00:00:00.000000000 Z
+date: 2016-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler