app-tools 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6326905b9573269c9ed0753e38a97b5048c0f010
-  data.tar.gz: 92d9e9e866278888dc960b7b52afb7a98b2b8b56
+  metadata.gz: 3fe657959e9ea56d1406b80163d00dfd78f7b116
+  data.tar.gz: ff2f7a2e3878d85b6b815c59bd98883c81406526
 SHA512:
-  metadata.gz: 7bc5ec29793733ecb8f02329a389f03618c45c1e28654748a2f1eef8ffa0146f78a0351001f0e3330c8712aeeea5bd41c1bd0a44323bc3db028b113a50b5de42
-  data.tar.gz: be7ecd38df31f223e65f554c697c30779fc2ade885d7108b8c48c5f56c67ba48365c48100cf3e7b7933627996771daa3d312c7d9a5e6e5b6903badd4d1a9f360
+  metadata.gz: 7cfb0498810b3be5d6173d0c956d982c210cca09d152dab244fd611ceb5e0e49d5b647b0ddf5a036b0b414b130c267b6f2ca6d57aa31a74d5baff3298392cfe4
+  data.tar.gz: 5e30aca44fb2938e51deaebd1503716d5a65b85adc61542782c883d3d6df725b9e354048eb200a96230df051553b5a4d0510d9a011a01c0cebe21a7d9d88575d

data/bin/add-password-to-keychain.sh

@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+# Passed in from build script
+if [[ -z "$USER_NAME" || -z "$USER_PASSWORD" ]]; then
+  echo Must set USER_NAME and USER_PASSWORD variables. Use single quotes around the USER_PASSWORD value to escape special bash characters.
+  exit 1
+fi
+
+ITMSTRANSPORTER=/Applications/Xcode.app/Contents/Applications/Application\ Loader.app/Contents/itms/bin/iTMSTransporter
+
+# See http://qntm.org/bash for explanation of why we escape everything in the password string
+
+security add-generic-password -a $USER_NAME -s "app-tools/iTunesConnect" -w $(echo $USER_PASSWORD | sed -E 's/([^a-zA-Z0-9])/\1/g') -T "$ITMSTRANSPORTER" -T $(which security)
+
+# This password can be deleted with:
+#
+# security delete-generic-password -a ${USER_NAME} -s "iTunesConnect - ${USER_NAME}"
+#
+# It can be retrieved with:
+#
+# security find-generic-password -a ${USER_NAME} -s "iTunesConnect - ${USER_NAME}" -w

data/bin/app-tools

@@ -1,2 +1,4 @@
 #!/usr/bin/env ruby
 puts "xcarchive2ipa - Generate IPA from XCArchive"
+puts "upload2itunes - Upload an IPA to iTunesConnect"
+puts "resignipa - Resign an IPA file"

data/bin/kcpass

@@ -0,0 +1,76 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'methadone'
+require 'app_tools/version'
+require 'fileutils'
+require 'highline'
+
+module AppTools
+  module KcPass
+    include Methadone::Main
+    include Methadone::CLILogging
+    include Methadone::ExitNow
+
+    main do |action|
+      itunes_password = options[:p]
+      itunes_user = options[:u]
+      cli = HighLine.new
+      name = "app-tools-itunesconnect"
+
+      case action
+        when 'add'
+          if itunes_user.nil?
+            exit_now! "Must supply an iTunesConnect user email"
+          end
+
+          if itunes_password.nil?
+            itunes_password = cli.ask("Password:") { |q| q.echo = 'x' }
+          end
+
+          pid = Process.spawn('security', 'add-generic-password', '-a', itunes_user, '-w', itunes_password, '-s', name, '-A')
+          Process.wait(pid)
+
+          if $?.exitstatus == 0
+            info "Successfully added generic password for '#{name}'"
+          else
+            error "Unable to add password for '#{name}'"
+          end
+        when 'delete'
+          pid = Process.spawn('security', 'delete-generic-password', '-s', name)
+          Process.wait pid
+
+          if $?.exitstatus == 0
+            info "Deleted generic password '#{name}'"
+          else
+            error "Could not find generic password '#{name}'"
+          end
+        when 'find'
+          r, w = IO.pipe
+          pid = Process.spawn('security', 'find-generic-password', '-s', name, '-w', :out => w)
+          w.close
+          Process.wait(pid)
+          if $?.exitstatus != 0
+            exit_now! "Could not find generic password '#{name}'"
+          end
+          itunes_password = r.read
+          r.close
+          puts itunes_password
+        else
+          exit_now! "Unknown command #{action}"
+      end
+    end
+
+    description 'kcpass - Adds, removes or finds generic keychain password for use by app-tools'
+    version AppTools::VERSION
+
+    on("-u", "--itunes-user USER", "iTunesConnect user")
+    on("-p", "--itunes-password PASSWORD", "iTunesConnect password")
+
+    arg :action, "An action either add, delete or password", :require
+
+    use_log_level_option :toggle_debug_on_signal => 'USR1'
+
+    go!
+  end
+end

data/bin/resignipa

@@ -0,0 +1,131 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'methadone'
+require 'app_tools/version'
+require 'fileutils'
+require 'cfpropertylist'
+require 'zip'
+
+#
+# This project is an extraction and rewrite in Ruby of
+# https://github.com/drewcrawford/CaveJohnson/blob/master/cavejohnson/__init__.py#L122
+#
+
+module AppTools
+  module ResignIpa
+    include Methadone::Main
+    include Methadone::CLILogging
+    include Methadone::ExitNow
+
+    main do |ipa_path|
+      unless File.exist?(ipa_path) and File.extname(ipa_path) == '.ipa'
+        exit_now! "Must supply an .ipa path to process"
+      end
+
+      ipa_basename = File.basename(ipa_path)
+      profile_path = options[:p]
+
+      unless File.exist?(profile_path)
+        exit_now! "Must supply a valid provisioning profile"
+      end
+
+      ## Extract the entitlements from the provisioning profile
+      cms_xml = `security cms -D -i "#{profile_path}"`
+      cms_data = CFPropertyList.native_types(CFPropertyList::List.new(:data => cms_xml).value)
+      entitlements_data = cms_data["Entitlements"]
+
+      ## Get the app PList
+      ipa_plist_data = nil
+
+      Zip::File.open(ipa_path) do |zip_file|
+        entry = zip_file.glob('Payload/*/Info.plist').first
+        plist = CFPropertyList::List.new(:data => entry.get_input_stream.read)
+        ipa_plist_data = CFPropertyList.native_types(plist.value)
+      end
+
+      ## Make sure app id and entitlements id match
+      entitlements_app_id = entitlements_data["application-identifier"]
+      ipa_app_id = ipa_plist_data["CFBundleIdentifier"]
+
+      unless entitlements_app_id.end_with?(ipa_app_id)
+          exit_now!("Entitlements app id #{entitlements_app_id} doesn't match Info.plist identifier #{ipa_app_id}")
+      end
+
+      ## Creating a temp dir to work in
+      temp_dir = File.join(File.dirname(ipa_path), ipa_basename + '.tmp')
+      contents_dir = File.join(temp_dir, "Contents")
+
+      FileUtils.rm_rf temp_dir
+      FileUtils.mkdir temp_dir
+
+      ## Unzip the existing IPA into the temp dir
+      `unzip #{ipa_path} -d #{contents_dir}`
+
+      ## 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")
+      FileUtils.cp profile_path, File.join(app_dir, "embedded.mobileprovision")
+
+      ## Get the app entitlements if any
+      app_path = `find -d #{payload_dir} -name \\*.app`.chomp
+      app_entitlements_xml = `codesign -d --entitlements :- #{app_path}`
+
+      unless app_entitlements_xml.empty?
+        app_entitlements_data = CFPropertyList.native_types(CFPropertyList::List.new(:data => app_entitlements_xml).value)
+
+        # TODO: What about other values?
+        if entitlements_data.has_key? "com.apple.developer.associated-domains"
+          entitlements_data["com.apple.developer.associated-domains"] = app_entitlements_data["com.apple.developer.associated-domains"]
+        end
+      end
+
+      ## Write the entitlements file
+      entitlements_path = File.join(temp_dir, "entitlements.plist")
+      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
+        Process.wait(pid)
+
+        unless $?.exitstatus == 0
+          exit_now! "Failed to sign files in #{sign_dir}"
+        end
+      end
+
+      ## Repack
+      new_ipa_dir = File.join(File.dirname(ipa_path), ipa_basename + ".resigned")
+      new_ipa_path = File.expand_path(File.join(new_ipa_dir, File.basename(ipa_path)))
+      FileUtils.rm_rf new_ipa_dir
+      FileUtils.mkdir new_ipa_dir
+
+      # NOTE: The zip tool
+      `cd #{contents_dir}; zip -r #{new_ipa_path} *`
+      #FileUtils.rm_rf temp_dir
+      puts new_ipa_path
+    end
+
+    description 'resignipa - Resign an IPA with a certificate and provisioning profile'
+    version AppTools::VERSION
+
+    on("-p", "--provisioning-profile PROFILE_PATH", "File name of the provisioning profile")
+    on("-c", "--certificate-name CERTIFICATE_NAME", "Name of the certificate to use for signing")
+
+    arg :ipa_path, "Original IPA file", :require
+
+    use_log_level_option :toggle_debug_on_signal => 'USR1'
+
+    go!
+  end
+end

data/bin/set-hardware-keyboard.applescript

@@ -0,0 +1,47 @@
+on run argv
+
+tell application "Simulator" to launch
+
+set inTime to current date
+repeat
+    tell application "System Events"
+        if "Simulator" is in (get name of processes) then exit repeat
+    end tell
+    if (current date) - inTime is greater than 10 then exit repeat
+    delay 0.2
+end repeat
+
+tell application "Simulator" to activate
+
+set inTime to current date
+repeat
+    tell application "System Events"
+        if visible of process "Simulator" is true then exit repeat
+    end tell
+    if (current date) - inTime is greater than 10 then exit repeat
+    delay 0.2
+end repeat
+
+set wantChecked to ("0" is not (item 1 of argv))
+
+tell application "System Events"
+    tell process "Simulator"
+        tell menu bar 1
+            tell menu bar item "Hardware"
+                tell menu 1
+                    tell menu item "Keyboard"
+                        tell menu 1
+                            set isChecked to ("✓" is (value of attribute "AXMenuItemMarkChar" of menu item "Connect Hardware Keyboard") as string)
+                            -- display dialog "checking: "  & wantChecked & " vs " & isChecked
+							if wantChecked is not isChecked then
+								click menu item "Connect Hardware Keyboard"
+							end if
+						end tell
+					end tell
+				end tell
+			end tell
+		end tell
+	end tell
+end tell
+
+end run

data/bin/syncpp

@@ -0,0 +1,92 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'methadone'
+require 'app_tools/version'
+require 'fileutils'
+require 'spaceship'
+
+#
+# This project is an extraction and rewrite in Ruby of
+# https://github.com/drewcrawford/CaveJohnson/blob/master/cavejohnson/__init__.py#L122
+#
+
+module AppTools
+  module SyncPp
+    include Methadone::Main
+    include Methadone::CLILogging
+    include Methadone::ExitNow
+
+    main do |profile_name|
+      itunes_user = options[:u]
+      itunes_password = options[:p]
+      name = "app-tools-itunesconnect"
+
+      if itunes_user.nil?
+        exit_now! "Must supply a user name"
+      end
+
+      if itunes_password.nil?
+        r, w = IO.pipe
+        pid = Process.spawn('security', 'find-generic-password', '-s', name, '-w', :out => w)
+        w.close
+        Process.wait(pid)
+        if $?.exitstatus != 0
+          exit_now! "Could not find generic password '#{name}'"
+        end
+        itunes_password = r.read.chomp
+        r.close
+      end
+
+      if itunes_password.nil?
+        exit_now! "No password given and non found in keychain"
+      end
+
+      Spaceship.login(itunes_user, itunes_password)
+
+      profiles = Spaceship.provisioning_profile.app_store.all
+      profile = profiles.find do |profile|
+        profile.name == profile_name
+      end
+
+      if profile.nil?
+        exit_now! "Provisioning profile #{profile_name} not found"
+      end
+
+      if profile.type != 'iOS Distribution'
+        exit_now! "The profile must use an iOS distribution certificate"
+      end
+
+      unless profile.valid?
+        profile.repair!
+      end
+
+      profile_prod_cert = profile.certificates.find do |cert|
+        cert.name == profile.type
+      end
+
+      prod_certs = Spaceship.certificate.production.all
+      prod_cert = prod_certs.find do |cert|
+        cert.id == profile.certificates.first.id
+      end
+
+      profile_path = "#{profile_name}.mobileprovision"
+
+      File.write(profile_path, profile.download)
+
+      puts prod_cert.name
+    end
+
+    description 'syncpp - Synchronize a certificate and provisioning profile'
+    version AppTools::VERSION
+
+    on("-u", "--itunes-user USER", "iTunesConnect user")
+    on("-p", "--itunes-password PASSWORD", "iTunesConnect password")
+
+    arg :profile_name, "Profile name", :required
+
+    use_log_level_option :toggle_debug_on_signal => 'USR1'
+
+    go!
+  end
+end

data/bin/upload2itunes

@@ -0,0 +1,105 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'methadone'
+require 'app_tools/version'
+require 'fileutils'
+require 'cfpropertylist'
+require 'zip'
+
+#
+# This project is an extraction and rewrite in Ruby of
+# https://github.com/drewcrawford/CaveJohnson/blob/master/cavejohnson/__init__.py#L122
+#
+
+module AppTools
+  module Upload2Itunes
+    include Methadone::Main
+    include Methadone::CLILogging
+    include Methadone::ExitNow
+
+    main do |ipa_path|
+      if !File.exist?(ipa_path) or !File.extname(ipa_path) == '.ipa'
+        exit_now! "Must supply a .ipa path to process"
+      end
+
+      # Create working variables
+      ipa_basename = File.basename(ipa_path)
+      itmsp_path = File.dirname(ipa_path) + '/' + ipa_basename[0...-4] + '.itmsp'
+
+      FileUtils.rm_rf itmsp_path
+      FileUtils.mkdir itmsp_path
+
+      plist_data = nil
+
+      Zip::File.open(ipa_path) do |zip_file|
+        entry = zip_file.glob('Payload/*/Info.plist').first
+        plist = CFPropertyList::List.new(:data => entry.get_input_stream.read)
+        plist_data = CFPropertyList.native_types(plist.value)
+      end
+
+      itunes_app_id = options[:i]
+      short_bundle_version = plist_data['CFBundleShortVersionString']
+      bundle_version = plist_data['CFBundleVersion']
+      bundle_identifier = plist_data['CFBundleIdentifier']
+      new_ipa_path = File.join(itmsp_path, ipa_basename)
+
+      FileUtils.cp ipa_path, new_ipa_path
+
+      md5 = `md5 -q #{new_ipa_path}`.chop
+      file_size = `stat -f "%z" #{new_ipa_path}`.chop
+
+      metadata_xml = %Q(<?xml version="1.0" encoding="UTF-8"?>
+<package version="software5.2" xmlns="http://apple.com/itunes/importer">
+    <software_assets apple_id="#{itunes_app_id}"
+        bundle_short_version_string="#{short_bundle_version}"
+        bundle_version="#{bundle_version}"
+        bundle_identifier="#{bundle_identifier}">
+        <asset type="bundle">
+            <data_file>
+                <file_name>#{ipa_basename}</file_name>
+                <checksum type="md5">#{md5}</checksum>
+                <size>#{file_size}</size>
+            </data_file>
+        </asset>
+    </software_assets>
+</package>)
+
+      File.open(itmsp_path + '/metadata.xml', 'w') { |file| file.write(metadata_xml) }
+
+      itmstransporter = "/Applications/Xcode.app/Contents/Applications/Application Loader.app/Contents/itms/bin/iTMSTransporter"
+
+      itunes_user = options[:u]
+      itunes_password = options[:p]
+
+      if itunes_password.nil?
+        IO.popen(['security', 'find-generic-password', '-s', "app-tools-itunesconnect", '-w']) do |io|
+          itunes_password = io.read.chop
+        end
+      end
+
+      safe_password = itunes_password.gsub!('&', '\\\&')
+      IO.popen([itmstransporter, '-m', 'upload', '-u', itunes_user, '-p', safe_password, '-f', itmsp_path]) do |io|
+        while not io.eof?
+          puts io.readline()
+        end
+      end
+      exitstatus = $?.exitstatus
+      FileUtils.rm_rf itmsp_path
+      exitstatus
+    end
+
+    description 'upload2itunes - Upload an IPA file to iTunesConnect'
+    version AppTools::VERSION
+
+    on("-u", "--itunes-user USER", "The iTunesConnect user name")
+    on("-i", "--itunes-app-id APP_ID", "The iTunesConnect app ID")
+    on("-p", "--itunes-password PASSWORD", "The iTunes user password. If not supplied keychain entry with the name 'app-tools-itunesconnect' is used.")
+
+    arg :ipa_path, "An IPA path", :require
+
+    use_log_level_option :toggle_debug_on_signal => 'USR1'
+
+    go!
+  end
+end

data/bin/xcarchive2ipa

@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
 
 require 'rubygems'
-require 'bundler/setup'
 require 'methadone'
 require 'app_tools/version'
 require 'fileutils'
+require 'zip'
 
 #
 # This project is an extraction and rewrite in Ruby of
@@ -12,13 +12,13 @@ require 'fileutils'
 #
 
 module AppTools
-  module Xcarchive2ipa
+  module Xcarchive2Ipa
     include Methadone::Main
     include Methadone::CLILogging
     include Methadone::ExitNow
 
     main do |xcarchive_path|
-      if xcarchive_path.nil? or !File.exist?(xcarchive_path)
+      if !Dir.exist?(xcarchive_path) or !File.extname(xcarchive_path) == '.xcarchive'
         exit_now! "Must supply a .xcarchive path to process"
       end
 
@@ -58,7 +58,7 @@ module AppTools
       puts ipa_path
     end
 
-    description 'xcharchive2ipa - Create an iTunesConnect uploadable .ipa files from your .xcarchive'
+    description 'xcarchive2ipa - Create an iTunesConnect uploadable .ipa files from your .xcarchive'
     version AppTools::VERSION
 
     arg :xcarchive_path, "An XCArchive path", :require

data/lib/app_tools/version.rb

@@ -1,3 +1,3 @@
 module AppTools
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: app-tools
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - John Lyon-Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-23 00:00:00.000000000 Z
+date: 2016-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,42 +44,109 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: methadone
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.2
+        version: '1.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.2
+        version: '1.9'
+- !ruby/object:Gem::Dependency
+  name: CFPropertyList
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: spaceship
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.19'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.19'
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
 description: |
   Generate IPA files with correct Swift and symbol files for uploading to iTunesConnect.
   Resign IPA files with correct certificate and provisioning profiles for distribution.  Upload IPA files to iTunesConnect.
-  These tools are based the CaveJohnson toolset.
 email:
 - john@jamoki.com
 executables:
+- add-password-to-keychain.sh
 - app-tools
+- kcpass
+- resignipa
+- set-hardware-keyboard.applescript
+- syncpp
+- upload2itunes
 - xcarchive2ipa
 extensions: []
 extra_rdoc_files: []
 files:
 - lib/app_tools/version.rb
+- bin/add-password-to-keychain.sh
 - bin/app-tools
+- bin/kcpass
+- bin/resignipa
+- bin/set-hardware-keyboard.applescript
+- bin/syncpp
+- bin/upload2itunes
 - bin/xcarchive2ipa
 homepage: http://github.com/jlyonsmith/app-tools
 licenses: