shenzhen 0.7.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 597cbd4b75518f01a6a5990f47e4541ce50fbd1f
-  data.tar.gz: 09737e8143cf28a07e9e1fdc8341a63a227c7bad
+  metadata.gz: 41fbea6a348b6faa6ec8516a81c1d37328e0c62b
+  data.tar.gz: b56480983fb412b9b5e32bdae83aa69c0a986e07
 SHA512:
-  metadata.gz: 603cc218c04e3aa7bc1ac47f7868d27d96e45828f6a3fa4f5e8846ba0c947566af1807046459328384b97a047d082dc8cdb0bea6c3253fc8ccfb2141a059052d
-  data.tar.gz: bca0ef76a75ca08b7a1da37e36ee80fab91442a19f989b18e5f7c93d0c361bb78ed00c5f18bfbdcc352072f0704462616c447c5d05887f174af4c38993d2749b
+  metadata.gz: 118b437781c43dc2076c71eb0802048b72e1cf2772e7f2719353a99a3b0192f61c75ab8c4d6c2737742e1571033da86e079041d222a239fd570d2985dd909216
+  data.tar.gz: 793f40936c249c90c0d020fb4b04ab1a783f5fc572791127f626ddd0fef42bbd00bc35fe672ac56a3de1c70f0907bf4434b33b04abdcaeaf0c0c21affa63816a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shenzhen (0.7.1)
+    shenzhen (0.8.2)
       aws-sdk (~> 1.0)
       commander (~> 4.1)
       dotenv (~> 0.7)
@@ -11,12 +11,13 @@ PATH
       net-sftp (~> 2.1.2)
       plist (~> 3.1.0)
       rubyzip (~> 1.1)
+      security (~> 0.1.3)
       terminal-table (~> 1.4.5)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    aws-sdk (1.40.2)
+    aws-sdk (1.50.0)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
     commander (4.2.0)
@@ -36,7 +37,7 @@ GEM
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
     net-ssh (2.9.1)
-    nokogiri (1.6.2.1)
+    nokogiri (1.6.3.1)
       mini_portile (= 0.6.0)
     plist (3.1.0)
     rake (10.3.1)
@@ -48,7 +49,8 @@ GEM
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.6)
-    rubyzip (1.1.3)
+    rubyzip (1.1.6)
+    security (0.1.3)
     terminal-table (1.4.5)
 
 PLATFORMS

data/README.md

@@ -1,6 +1,6 @@
 ![Shenzhen](https://raw.github.com/mattt/nomad-cli.com/assets/shenzhen-banner.png)
 
-Create `.ipa` files and then distribute them with [TestFlight](https://testflightapp.com/) or [HockeyApp](http://www.hockeyapp.net) or [DeployGate](https://deploygate.com), all from the command line!
+Create `.ipa` files and then distribute them with [TestFlight](https://testflightapp.com/), [HockeyApp](http://www.hockeyapp.net), [DeployGate](https://deploygate.com), or even through [iTunes Connect](https://itunesconnect.apple.com)—all from the command line!
 
 Less cumbersome than clicking around in Xcode, and less hassle than rolling your own build script--Shenzhen radically improves the process of getting new builds out to testers and enterprises.
 
@@ -9,7 +9,9 @@ Less cumbersome than clicking around in Xcode, and less hassle than rolling your
 
 ## Installation
 
-    $ gem install shenzhen
+```
+$ gem install shenzhen
+```
 
 ### JSON Build Error
 
@@ -19,92 +21,123 @@ Users running Mac OS X Mavericks with Xcode 5.1 may encounter an error when atte
 
 To work around this, install the `json` gem first with the following command:
 
-    $ ARCHFLAGS=-Wno-error=unused-command-line-argument-hard-error-in-future gem install json
-
+```
+$ ARCHFLAGS=-Wno-error=unused-command-line-argument-hard-error-in-future gem install json
+```
 
 ## Usage
 
+> For best results, set your environment localization to UTF-8, with `$ export LC_ALL="en_US.UTF-8"`. Otherwise, Shenzhen may return unexpectedly with the error "invalid byte sequence in US-ASCII".
+
 Shenzhen adds the `ipa` command to your PATH:
 
-    $ ipa
+```
+$ ipa
 
-      Build and distribute iOS apps (.ipa files)
+  Build and distribute iOS apps (.ipa files)
 
-      Commands:
-        build                 Create a new .ipa file for your app
-        distribute:testflight Distribute an .ipa file over TestFlight
-        distribute:hockeyapp  Distribute an .ipa file over HockeyApp
-        distribute:deploygate Distribute an .ipa file over deploygate
-        distribute:ftp        Distribute an .ipa file over FTP
-        distribute:S3         Distribute an .ipa file over Amazon S3
-        info                  Show mobile provisioning information about an .ipa file
-        help                  Display global or [command] help documentation.
+  Commands:
+    build                       Create a new .ipa file for your app
+    distribute:testflight       Distribute an .ipa file over TestFlight
+    distribute:hockeyapp        Distribute an .ipa file over HockeyApp
+    distribute:deploygate       Distribute an .ipa file over deploygate
+    distribute:itunesconnect    Upload an .ipa file to iTunes Connect for review
+    distribute:ftp              Distribute an .ipa file over FTP
+    distribute:S3               Distribute an .ipa file over Amazon S3
+    info                        Show mobile provisioning information about an .ipa file
+    help                        Display global or [command] help documentation.
 
-      Aliases:
-        distribute           distribute:testflight
+  Aliases:
+    distribute           distribute:testflight
 
-      Global Options:
-        -h, --help           Display help documentation
-        -v, --version        Display version information
-        -t, --trace          Display backtrace when an error occurs
+  Global Options:
+    -h, --help           Display help documentation
+    -v, --version        Display version information
+    -t, --trace          Display backtrace when an error occurs
+```
 
 ### Building & Distribution
 
-    $ cd /path/to/iOS Project/
-    $ ipa build
-    $ ipa distribute
+```
+$ cd /path/to/iOS Project/
+$ ipa build
+$ ipa distribute
+```
 
 #### TestFlight Distribution
 
-    $ ipa distribute:testflight -a API_TOKEN -T TEAM_TOKEN
+```
+$ ipa distribute:testflight -a API_TOKEN -T TEAM_TOKEN
+```
 
 > Shenzhen will load credentials from the environment variables `TESTFLIGHT_API_TOKEN` and `TESTFLIGHT_TEAM_TOKEN` unless otherwise specified.
 
 #### HockeyApp Distribution
 
-    $ ipa distribute:hockeyapp --token API_TOKEN
+```
+$ ipa distribute:hockeyapp --token API_TOKEN
+```
 
 > Shenzhen will load credentials from the environment variable `HOCKEYAPP_API_TOKEN` unless otherwise specified.
 
 #### DeployGate Distribution
 
-    $ ipa distribute:deploygate -a API_TOKEN -u USER_NAME
+```
+$ ipa distribute:deploygate -a API_TOKEN -u USER_NAME
+```
 
 > Shenzhen will load credentials from the environment variable `DEPLOYGATE_API_TOKEN` and `DEPLOYGATE_USER_NAME` unless otherwise specified.
 
-
 #### FTP Distribution
 
-    $ ipa distribute:ftp --host HOST -u USER -p PASSWORD -P FTP_PATH
+```
+$ ipa distribute:ftp --host HOST -u USER -p PASSWORD -P FTP_PATH
+```
 
 #### SFTP Distribution
 
-    $ ipa distribute:sftp --host HOST -u USER -p PASSWORD -P FTP_PATH
+```
+$ ipa distribute:sftp --host HOST -u USER -p PASSWORD -P FTP_PATH
+```
 
 #### Amazon S3 Distribution
 
-    $ ipa distribute:s3 -a ACCESS_KEY_ID -s SECRET_ACCESS_KEY -b BUCKET
+```
+$ ipa distribute:s3 -a ACCESS_KEY_ID -s SECRET_ACCESS_KEY -b BUCKET
+```
+
+> Shenzhen will load credentials from the environment variables `AWS_ACCESS_KEY_ID`, `AWS_SECRET_ACCESS_KEY` and `AWS_REGION` unless otherwise specified.
+
+#### iTunes Connect Distribution
+
+    $ ipa distribute:itunesconnect -a me@email.com -p myitunesconnectpassword --upload
 
-> Shenzhen will load credentials from the environment variable `AWS_ACCESS_KEY_ID`, `AWS_SECRET_ACCESS_KEY` and `AWS_REGION` unless otherwise specified.
+> Shenzhen will load credentials from the environment variables `ITUNES_CONNECT_ACCOUNT` and `ITUNES_CONNECT_PASSWORD` unless otherwise specified. If only an account is provided, the keychain will be searched for a matching entry.
+>
+> If the `--upload` flag is omitted, Shenzen will validate the given credentials and check that the app is in the 'Waiting for Upload' state on iTunes Connect but will not upload the .ipa
+>
+> For a fully hands-free upload, in a CI environment for example, ensure your iTunes Connect credentials are stored in your keychain, and that the keychain item has the Validation app in it's 'Always allow access' list.  Running Shenzhen once with the `--save-keychain` flag, and clicking `Always Allow` on the prompt will set this up for you.
 
 ### Displaying Embedded .mobileprovision Information
 
-    $ ipa info /path/to/app.ipa
-
-    +-----------------------------+----------------------------------------------------------+
-    | ApplicationIdentifierPrefix | DJ73OPSO53                                               |
-    | CreationDate                | 2014-03-26T02:53:00+00:00                                |
-    | Entitlements                | application-identifier: DJ73OPSO53.com.nomad.shenzhen    |
-    |                             | aps-environment: production                              |
-    |                             | get-task-allow: false                                    |
-    |                             | keychain-access-groups: ["DJ73OPSO53.*"]                 |
-    | CreationDate                | 2017-03-26T02:53:00+00:00                                |
-    | Name                        | Shenzhen                                                 |
-    | TeamIdentifier              | S6ZYP4L6TY                                               |
-    | TimeToLive                  | 172                                                      |
-    | UUID                        | P7602NR3-4D34-441N-B6C9-R79395PN1OO3                     |
-    | Version                     | 1                                                        |
-    +-----------------------------+----------------------------------------------------------+
+```
+$ ipa info /path/to/app.ipa
+
++-----------------------------+----------------------------------------------------------+
+| ApplicationIdentifierPrefix | DJ73OPSO53                                               |
+| CreationDate                | 2014-03-26T02:53:00+00:00                                |
+| Entitlements                | application-identifier: DJ73OPSO53.com.nomad.shenzhen    |
+|                             | aps-environment: production                              |
+|                             | get-task-allow: false                                    |
+|                             | keychain-access-groups: ["DJ73OPSO53.*"]                 |
+| CreationDate                | 2017-03-26T02:53:00+00:00                                |
+| Name                        | Shenzhen                                                 |
+| TeamIdentifier              | S6ZYP4L6TY                                               |
+| TimeToLive                  | 172                                                      |
+| UUID                        | P7602NR3-4D34-441N-B6C9-R79395PN1OO3                     |
+| Version                     | 1                                                        |
++-----------------------------+----------------------------------------------------------+
+```
 
 ## Contact
 

data/lib/shenzhen/commands.rb

@@ -2,9 +2,10 @@ $:.push File.expand_path('../', __FILE__)
 
 require 'plugins/testflight'
 require 'plugins/hockeyapp'
+require 'plugins/deploygate'
+require 'plugins/itunesconnect'
 require 'plugins/ftp'
 require 'plugins/s3'
-require 'plugins/deploygate'
 
 require 'commands/build'
 require 'commands/distribute'

data/lib/shenzhen/plugins/hockeyapp.rb

@@ -100,7 +100,6 @@ command :'distribute:hockeyapp' do |c|
     case response.status
     when 200...300
       say_ok "Build successfully uploaded to HockeyApp"
-      return response.body
     else
       say_error "Error uploading to HockeyApp: #{response.body}"
     end

data/lib/shenzhen/plugins/itunesconnect.rb

@@ -0,0 +1,109 @@
+require 'security'
+
+module Shenzhen::Plugins
+  module ITunesConnect
+    ITUNES_CONNECT_SERVER = 'Xcode:itunesconnect.apple.com'
+
+    class Client
+      attr_reader :ipa, :sdk, :params
+
+      def initialize(ipa, sdk, params = [])
+        @ipa = ipa
+        @sdk = sdk
+        @params = params
+      end
+
+      def ensure_itunesconnect!
+        case xcrun(:Validation, [:online])
+        when /(error)|(fail)/i
+          say_error "An error occurred checking the status of the app in iTunes Connect.\nRun with --verbose for more info." and abort
+        when /validation was skipped/i
+          say_error "Validation was skipped. Double check your credentials and ensure the app in the 'Waiting for Upload' state." and abort
+        end
+      end
+
+      def upload_build!
+        case xcrun(:Validation, [:online, :upload])
+        when /(error)|(fail)/i
+          say_error "An error occurred when trying to upload the build to iTunesConnect.\nRun with --verbose for more info." and abort
+        end
+      end
+
+      private
+
+      def xcrun(tool, options = [])
+        args = ["xcrun", "-sdk #{sdk}", tool] + (options + @params).collect{|o| "-#{o}"} + [ipa, '2>&1']
+        command = args.join(' ')
+
+        say "#{command}" if verbose?
+
+        output = `#{command}`
+        say output.chomp if verbose?
+
+        return output
+      end
+
+      def verbose?
+        @params.collect(&:to_sym).include?(:verbose)
+      end
+    end
+  end
+end
+
+command :'distribute:itunesconnect' do |c|
+  c.syntax = "ipa distribute:itunesconnect [options]"
+  c.summary = "Upload an .ipa file to iTunes Connect"
+  c.description = "Upload an .ipa file directly to iTunes Connect for review. Requires that the app is in the 'Waiting for upload' state and the --upload flag to be set."
+  c.option '-f', '--file FILE', ".ipa file for the build"
+  c.option '-a', '--account ACCOUNT', "Apple ID used to log into https://itunesconnect.apple.com"
+  c.option '-p', '--password PASSWORD', "Password for the account unless already stored in the keychain"
+  c.option '-u', '--upload', "Actually attempt to upload the build to iTunes Connect"
+  c.option '-w', '--warnings', "Check for warnings when validating the ipa"
+  c.option '-e', '--errors', "Check for errors when validating the ipa"
+  c.option '--verbose', "Run commands verbosely"
+  c.option '--sdk SDK', "SDK to use when validating the ipa. Defaults to 'iphoneos'"
+  c.option '--save-keychain', "Save the provided account in the keychain for future use"
+
+  c.action do |args, options|
+    options.default :upload => false, :sdk => 'iphoneos', :save_keychain => true
+
+    determine_file! unless @file = options.file
+    say_error "Missing or unspecified .ipa file" and abort unless @file and File.exist?(@file)
+
+    determine_itunes_connect_account! unless @account = options.account || ENV['ITUNES_CONNECT_ACCOUNT']
+    say_error "Missing iTunes Connect account" and abort unless @account
+
+    @password = options.password || ENV['ITUNES_CONNECT_PASSWORD']
+    if @password ||= Security::GenericPassword.find(:s => Shenzhen::Plugins::ITunesConnect::ITUNES_CONNECT_SERVER, :a => @account)
+      say_ok "Found password in keychain for account: #{@account}" if options.verbose
+    else
+      determine_itunes_connect_password! unless @password
+      say_error "Missing iTunes Connect password" and abort unless @password
+
+      Security::GenericPassword.add(Shenzhen::Plugins::ITunesConnect::ITUNES_CONNECT_SERVER, @account, @password, {:U => nil}) if options.save_keychain
+    end
+
+    parameters = []
+    parameters << :verbose if options.verbose
+    parameters << :warnings if options.warnings
+    parameters << :errors if options.errors
+
+    client = Shenzhen::Plugins::ITunesConnect::Client.new(@file, options.sdk, parameters)
+
+    client.ensure_itunesconnect!
+    say_warning "Upload not requested, skipping." and abort unless options.upload
+
+    client.upload_build!
+    say_ok "Upload complete. You may want to double check iTunes Connect to make sure it was received correctly."
+  end
+
+  private
+
+  def determine_itunes_connect_account!
+    @account ||= ask "iTunes Connect account:"
+  end
+
+  def determine_itunes_connect_password!
+    @password ||= password "iTunes Connect password:"
+  end
+end

data/lib/shenzhen/plugins/testflight.rb

@@ -82,7 +82,6 @@ command :'distribute:testflight' do |c|
     case response.status
     when 200...300
       say_ok "Build successfully uploaded to TestFlight"
-      return response.body
     else
       say_error "Error uploading to TestFlight: #{response.body}" and abort
     end

data/lib/shenzhen/version.rb

@@ -1,3 +1,3 @@
 module Shenzhen
-  VERSION = '0.7.1'
+  VERSION = '0.8.2'
 end

data/shenzhen.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
   s.add_dependency "net-sftp", "~> 2.1.2"
   s.add_dependency "plist", "~> 3.1.0"
   s.add_dependency "rubyzip", "~> 1.1"
+  s.add_dependency "security", "~> 0.1.3"
 
   s.add_development_dependency "rspec"
   s.add_development_dependency "rake"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shenzhen
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Mattt Thompson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-18 00:00:00.000000000 Z
+date: 2014-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -150,6 +150,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: security
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -196,6 +210,7 @@ files:
 - ./lib/shenzhen/plugins/deploygate.rb
 - ./lib/shenzhen/plugins/ftp.rb
 - ./lib/shenzhen/plugins/hockeyapp.rb
+- ./lib/shenzhen/plugins/itunesconnect.rb
 - ./lib/shenzhen/plugins/s3.rb
 - ./lib/shenzhen/plugins/testflight.rb
 - ./lib/shenzhen/version.rb
@@ -204,7 +219,8 @@ files:
 - ./LICENSE
 - ./Rakefile
 - ./README.md
-- ./shenzhen-0.7.0.gem
+- ./shenzhen-0.8.0.gem
+- ./shenzhen-0.8.1.gem
 - ./shenzhen.gemspec
 - bin/ipa
 homepage: http://nomad-cli.com