app-tools 1.1.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fe657959e9ea56d1406b80163d00dfd78f7b116
-  data.tar.gz: ff2f7a2e3878d85b6b815c59bd98883c81406526
+  metadata.gz: 19cf0d4936accba0a7a544a1055d7b8a96cc6b50
+  data.tar.gz: afff72b3bf1582c14ae26e0af24b2b997f028eb6
 SHA512:
-  metadata.gz: 7cfb0498810b3be5d6173d0c956d982c210cca09d152dab244fd611ceb5e0e49d5b647b0ddf5a036b0b414b130c267b6f2ca6d57aa31a74d5baff3298392cfe4
-  data.tar.gz: 5e30aca44fb2938e51deaebd1503716d5a65b85adc61542782c883d3d6df725b9e354048eb200a96230df051553b5a4d0510d9a011a01c0cebe21a7d9d88575d
+  metadata.gz: c10c537c7f4f06015ee8019e81cf133891a8dc6f762e94369a24117d5647880f590ccaf2b46c584bf3ca7469f8274049dab3375ca6efecf16126ba4921c7fd57
+  data.tar.gz: c0bae93ce72d9df694dc80d8e36779377c58a88b5b74a14ee538001d2686ba9a699f21caf9f98d0fb18f028c091f830da89e9bbd4cf28b799bc49b8187346329

data/bin/kcpass

@@ -16,42 +16,43 @@ module AppTools
       itunes_password = options[:p]
       itunes_user = options[:u]
       cli = HighLine.new
-      name = "app-tools-itunesconnect"
+      keychain_name = "app-tools/iTunesConnect - #{itunes_user}"
+
+      if itunes_user.nil?
+        exit_now! "Must supply an iTunesConnect user email"
+      end
 
       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')
+          # TODO: When these tools are actually executables remove the -A flag
+          pid = Process.spawn('security', 'add-generic-password', '-a', itunes_user, '-w', itunes_password, '-s', keychain_name, '-A')
           Process.wait(pid)
 
           if $?.exitstatus == 0
-            info "Successfully added generic password for '#{name}'"
+            info "Successfully added generic password for '#{keychain_name}'"
           else
-            error "Unable to add password for '#{name}'"
+            error "Unable to add password for '#{keychain_name}'"
           end
         when 'delete'
-          pid = Process.spawn('security', 'delete-generic-password', '-s', name)
+          pid = Process.spawn('security', 'delete-generic-password', '-s', keychain_name)
           Process.wait pid
 
           if $?.exitstatus == 0
-            info "Deleted generic password '#{name}'"
+            info "Deleted generic password '#{keychain_name}'"
           else
-            error "Could not find generic password '#{name}'"
+            error "Could not find generic password '#{keychain_name}'"
           end
         when 'find'
           r, w = IO.pipe
-          pid = Process.spawn('security', 'find-generic-password', '-s', name, '-w', :out => w)
+          pid = Process.spawn('security', 'find-generic-password', '-s', keychain_name, '-w', :out => w)
           w.close
           Process.wait(pid)
           if $?.exitstatus != 0
-            exit_now! "Could not find generic password '#{name}'"
+            exit_now! "Could not find generic password '#{keychain_name}'"
           end
           itunes_password = r.read
           r.close

data/bin/{set-hardware-keyboard.applescript → setsimkbd}

@@ -1,3 +1,7 @@
+#!/usr/bin/osascript
+
+# See https://github.com/paypal/Illuminator/blob/master/gem/resources/scripts/set_hardware_keyboard.applescript
+
 on run argv
 
 tell application "Simulator" to launch

data/bin/syncpp

@@ -17,10 +17,18 @@ module AppTools
     include Methadone::CLILogging
     include Methadone::ExitNow
 
+    def self.keep_trying
+      tries ||= 5
+      yield
+    rescue UnexpectedResponse
+      sleep 3
+      retry unless (tries -= 1).zero?
+    end
+
     main do |profile_name|
       itunes_user = options[:u]
       itunes_password = options[:p]
-      name = "app-tools-itunesconnect"
+      keychain_name = "app-tools/iTunesConnect - #{itunes_user}"
 
       if itunes_user.nil?
         exit_now! "Must supply a user name"
@@ -28,11 +36,11 @@ module AppTools
 
       if itunes_password.nil?
         r, w = IO.pipe
-        pid = Process.spawn('security', 'find-generic-password', '-s', name, '-w', :out => w)
+        pid = Process.spawn('security', 'find-generic-password', '-s', keychain_name, '-w', :out => w)
         w.close
         Process.wait(pid)
         if $?.exitstatus != 0
-          exit_now! "Could not find generic password '#{name}'"
+          exit_now! "Could not find generic password '#{keychain_name}'"
         end
         itunes_password = r.read.chomp
         r.close
@@ -44,9 +52,14 @@ module AppTools
 
       Spaceship.login(itunes_user, itunes_password)
 
-      profiles = Spaceship.provisioning_profile.app_store.all
-      profile = profiles.find do |profile|
-        profile.name == profile_name
+      profile = nil
+
+      # Sometimes the call to the Apple API can fail
+      keep_trying do
+        profiles = Spaceship.provisioning_profile.app_store.all
+        profile = profiles.find do |profile|
+          profile.name == profile_name
+        end
       end
 
       if profile.nil?
@@ -65,9 +78,13 @@ module AppTools
         cert.name == profile.type
       end
 
-      prod_certs = Spaceship.certificate.production.all
-      prod_cert = prod_certs.find do |cert|
-        cert.id == profile.certificates.first.id
+      prod_cert = nil
+
+      keep_trying do
+        prod_certs = Spaceship.certificate.production.all
+        prod_cert = prod_certs.find do |cert|
+          cert.id == profile.certificates.first.id
+        end
       end
 
       profile_path = "#{profile_name}.mobileprovision"

data/bin/upload2itunes

@@ -26,6 +26,16 @@ module AppTools
       # Create working variables
       ipa_basename = File.basename(ipa_path)
       itmsp_path = File.dirname(ipa_path) + '/' + ipa_basename[0...-4] + '.itmsp'
+      itunes_user = options[:u]
+      keychain_name = "app-tools/iTunesConnect - #{itunes_user}"
+      itunes_password = options[:p]
+
+      if itunes_password.nil?
+        IO.popen(['security', 'find-generic-password', '-s', keychain_name, '-w']) do |io|
+          itunes_password = io.read.chop
+        end
+      end
+
 
       FileUtils.rm_rf itmsp_path
       FileUtils.mkdir itmsp_path
@@ -68,16 +78,6 @@ module AppTools
       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?
@@ -94,7 +94,7 @@ module AppTools
 
     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.")
+    on("-p", "--itunes-password PASSWORD", "The iTunes user password, otherwise the password is retrieved from the keychain.")
 
     arg :ipa_path, "An IPA path", :require
 

data/lib/app_tools/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: app-tools
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.2
 platform: ruby
 authors:
 - John Lyon-Smith
@@ -128,11 +128,10 @@ description: |
 email:
 - john@jamoki.com
 executables:
-- add-password-to-keychain.sh
 - app-tools
 - kcpass
 - resignipa
-- set-hardware-keyboard.applescript
+- setsimkbd
 - syncpp
 - upload2itunes
 - xcarchive2ipa
@@ -140,11 +139,10 @@ 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/setsimkbd
 - bin/syncpp
 - bin/upload2itunes
 - bin/xcarchive2ipa

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

@@ -1,21 +0,0 @@
-#!/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