shenzhen 0.8.2 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41fbea6a348b6faa6ec8516a81c1d37328e0c62b
-  data.tar.gz: b56480983fb412b9b5e32bdae83aa69c0a986e07
+  metadata.gz: 2745f53de64c6a957f3a244a80ed2bba9158bef2
+  data.tar.gz: 07d9564be28ee258ca0a34fd455d6cde603d6458
 SHA512:
-  metadata.gz: 118b437781c43dc2076c71eb0802048b72e1cf2772e7f2719353a99a3b0192f61c75ab8c4d6c2737742e1571033da86e079041d222a239fd570d2985dd909216
-  data.tar.gz: 793f40936c249c90c0d020fb4b04ab1a783f5fc572791127f626ddd0fef42bbd00bc35fe672ac56a3de1c70f0907bf4434b33b04abdcaeaf0c0c21affa63816a
+  metadata.gz: 9c66500a86a7a9ffa9120f565a0d151b4fa9dc87bad995730d1d186d8f06b4b03602e9ac0f5f577f4c86d818b95f4639968e7ddec82053c511079d2a8ff9ad8a
+  data.tar.gz: 3fab0ee6067d5f030bbed3de04d6ee3dd7e12aec3887b59da1e4a5a0266846a2b1b842e2923141015d6a4d52754d42e59736bfd13105a25c03dfc085c91d6b95

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shenzhen (0.8.2)
+    shenzhen (0.9.0)
       aws-sdk (~> 1.0)
       commander (~> 4.1)
       dotenv (~> 0.7)

data/README.md

@@ -1,11 +1,11 @@
-![Shenzhen](https://raw.github.com/mattt/nomad-cli.com/assets/shenzhen-banner.png)
+![Shenzhen](https://raw.github.com/nomad/nomad.github.io/assets/shenzhen-banner.png)
 
-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!
+Create `.ipa` files and then distribute them with [TestFlight](https://testflightapp.com/), [HockeyApp](http://www.hockeyapp.net), [Crashlytics Beta](http://try.crashlytics.com/beta/), [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.
 
-> `shenzhen` is named for [深圳](http://en.wikipedia.org/wiki/Shenzhen), the Chinese city famous for its role as the center of manufacturing for a majority of consumer electronics, including iPhones and iPads.
-> It's part of a series of world-class command-line utilities for iOS development, which includes [Cupertino](https://github.com/mattt/cupertino) (Apple Dev Center management), [Houston](https://github.com/mattt/houston) (Push Notifications), [Venice](https://github.com/mattt/venice) (In-App Purchase Receipt Verification), and [Dubai](https://github.com/mattt/dubai) (Passbook pass generation).
+> `shenzhen` is named for [深圳](http://en.wikipedia.org/wiki/Shenzhen), the Chinese city famous for being the center of manufacturing for a majority of consumer electronics, including iPhones and iPads.
+> It's part of a series of world-class command-line utilities for iOS development, which includes [Cupertino](https://github.com/mattt/cupertino) (Apple Dev Center management), [Houston](https://github.com/mattt/houston) (Push Notifications), [Venice](https://github.com/mattt/venice) (In-App Purchase Receipt Verification), [Dubai](https://github.com/mattt/dubai) (Passbook pass generation), and [Nashville](https://github.com/nomad/nashville) (iTunes Store API).
 
 ## Installation
 
@@ -40,10 +40,11 @@ $ ipa
     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:crashlytics      Distribute an .ipa file over Crashlytics
     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
+    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.
 
@@ -75,11 +76,20 @@ $ ipa distribute:testflight -a API_TOKEN -T TEAM_TOKEN
 #### HockeyApp Distribution
 
 ```
-$ ipa distribute:hockeyapp --token API_TOKEN
+$ ipa distribute:hockeyapp -a API_TOKEN
 ```
 
 > Shenzhen will load credentials from the environment variable `HOCKEYAPP_API_TOKEN` unless otherwise specified.
 
+#### Crashlytics Beta Distribution
+
+```
+$ ipa distribute:crashlytics -c /path/to/Crashlytics.framework -a API_TOKEN -s BUILD_SECRET
+```
+
+> Shenzhen will load credentials from the environment variables `CRASHLYTICS_API_TOKEN` & `CRASHLYTICS_BUILD_SECRET`, and attempt to run the submit executable `submit` in the path to Crashlytics.framework specified by `CRASHLYTICS_FRAMEWORK_PATH` unless otherwise specified.
+
+
 #### DeployGate Distribution
 
 ```
@@ -110,13 +120,18 @@ $ ipa distribute:s3 -a ACCESS_KEY_ID -s SECRET_ACCESS_KEY -b BUCKET
 
 #### iTunes Connect Distribution
 
-    $ ipa distribute:itunesconnect -a me@email.com -p myitunesconnectpassword --upload
+```
+$ ipa distribute:itunesconnect -a me@email.com -p myitunesconnectpassword -i appleid --upload
+```
 
 > 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
+> The `-i` (or `--apple-id`) flag is "An automatically generated ID assigned to your app". It can be found via iTunes Connect by navigating to:
+> * My Apps -> [App Name] -> More -> About This App -> Apple ID
 >
-> 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.
+> 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 its '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.
+
+**Apps built with Swift are not currently supported by this distribution method. Although initial upload checks may pass, it will eventually fail citing "Invalid Swift Support".**
 
 ### Displaying Embedded .mobileprovision Information
 

data/lib/shenzhen/commands.rb

@@ -6,6 +6,7 @@ require 'plugins/deploygate'
 require 'plugins/itunesconnect'
 require 'plugins/ftp'
 require 'plugins/s3'
+require 'plugins/crashlytics'
 
 require 'commands/build'
 require 'commands/distribute'

data/lib/shenzhen/commands/build.rb

@@ -10,6 +10,7 @@ command :build do |c|
   c.option '-c', '--configuration CONFIGURATION', 'Configuration used to build'
   c.option '-s', '--scheme SCHEME', 'Scheme used to build app'
   c.option '--xcconfig XCCONFIG', 'use an extra XCCONFIG file to build the app'
+  c.option '--xcargs XCARGS', 'pass additional arguments to xcodebuild when building the app. Be sure to quote multiple args.'
   c.option '--[no-]clean', 'Clean project before building'
   c.option '--[no-]archive', 'Archive project after building'
   c.option '-d', '--destination DESTINATION', 'Destination. Defaults to current directory'
@@ -29,6 +30,7 @@ command :build do |c|
     @sdk = options.sdk || 'iphoneos'
     @configuration = options.configuration
     @xcconfig = options.xcconfig
+    @xcargs = options.xcargs
     @destination = options.destination || Dir.pwd
     FileUtils.mkdir_p(@destination) unless File.directory?(@destination)
 
@@ -51,6 +53,7 @@ command :build do |c|
     flags << %{-scheme "#{@scheme}"} if @scheme
     flags << %{-configuration "#{@configuration}"} if @configuration
     flags << %{-xcconfig "#{@xcconfig}"} if @xcconfig
+    flags << @xcargs if @xcargs
 
     @target, @xcodebuild_settings = Shenzhen::XcodeBuild.settings(*flags).detect{|target, settings| settings['WRAPPER_EXTENSION'] == "app"}
     say_error "App settings could not be found." and abort unless @xcodebuild_settings

data/lib/shenzhen/plugins/crashlytics.rb

@@ -0,0 +1,76 @@
+module Shenzhen::Plugins
+  module Crashlytics
+    class Client
+
+      def initialize(crashlytics_path, api_token, build_secret)
+        @api_token, @build_secret = api_token, build_secret
+        @crashlytics_path = Pathname.new("#{crashlytics_path}/submit").cleanpath.to_s
+        say_error "Path to Crashlytics.framework/submit is invalid" and abort unless File.exists?(@crashlytics_path)
+      end
+
+      def upload_build(ipa, options)
+        command = "#{@crashlytics_path} #{@api_token} #{@build_secret} -ipaPath #{options[:file]}"
+        command += " -notesPath #{options[:notes]}" if options[:notes]
+        command += " -emails #{options[:emails]}" if options[:emails]
+        command += " -groupAliases #{options[:groups]}" if options[:groups]
+
+        system command
+      end
+    end
+  end
+end
+
+command :'distribute:crashlytics' do |c|
+  c.syntax = "ipa distribute:crashlytics [options]"
+  c.summary = "Distribute an .ipa file over Crashlytics"
+  c.description = ""
+  c.option '-c', '--crashlytics_path PATH', "/path/to/Crashlytics.framework/"
+  c.option '-f', '--file FILE', ".ipa file for the build"
+  c.option '-a', '--api_token TOKEN', "API Token. Available at https://www.crashlytics.com/settings/organizations"
+  c.option '-s', '--build_secret SECRET', "Build Secret. Available at https://www.crashlytics.com/settings/organizations"
+  c.option '-m', '--notes PATH', "Path to release notes file"
+  c.option '-e', '--emails EMAIL1,EMAIL2', "Emails of users for access"
+  c.option '-g', '--groups GROUPS', "Groups for users for access"
+
+  c.action do |args, options|
+    determine_file! unless @file = options.file
+    say_error "Missing or unspecified .ipa file" and abort unless @file and File.exist?(@file)
+
+    determine_crashlytics_path! unless @crashlytics_path = options.crashlytics_path || ENV['CRASHLYTICS_FRAMEWORK_PATH']
+    say_error "Missing path to Crashlytics.framework" and abort unless @crashlytics_path
+
+    determine_crashlytics_api_token! unless @api_token = options.api_token || ENV['CRASHLYTICS_API_TOKEN']
+    say_error "Missing API Token" and abort unless @api_token
+
+    determine_crashlytics_build_secret! unless @build_secret = options.build_secret || ENV['CRASHLYTICS_BUILD_SECRET']
+    say_error "Missing Build Secret" and abort unless @build_secret
+
+    parameters = {}
+    parameters[:file] = @file
+    parameters[:notes] = options.notes if options.notes
+    parameters[:emails] = options.emails if options.emails
+    parameters[:groups] = options.groups if options.groups
+
+    client = Shenzhen::Plugins::Crashlytics::Client.new(@crashlytics_path, @api_token, @build_secret)
+
+    if client.upload_build(@file, parameters)
+      say_ok "Build successfully uploaded to Crashlytics"
+    else
+      say_error "Error uploading to Crashlytics" and abort
+    end
+  end
+
+  private
+
+  def determine_crashlytics_path!
+    @crashlytics_path ||= ask "Path to Crashlytics.framework:"
+  end
+
+  def determine_crashlytics_api_token!
+    @api_token ||= ask "API Token:"
+  end
+
+  def determine_crashlytics_build_secret!
+    @build_secret ||= ask "Build Secret:"
+  end
+end

data/lib/shenzhen/plugins/hockeyapp.rb

@@ -48,7 +48,7 @@ command :'distribute:hockeyapp' do |c|
   c.description = ""
   c.option '-f', '--file FILE', ".ipa file for the build"
   c.option '-d', '--dsym FILE', "zipped .dsym package for the build"
-  c.option '--token TOKEN', "API Token. Available at https://rink.hockeyapp.net/manage/auth_tokens"
+  c.option '-a', '--token TOKEN', "API Token. Available at https://rink.hockeyapp.net/manage/auth_tokens"
   c.option '-i', '--identifier PUBLIC_IDENTIFIER', "Public identifier of the app you are targeting, if not specified HockeyApp will use the bundle identifier to choose the right"
   c.option '-m', '--notes NOTES', "Release notes for the build (Default: Textile)"
   c.option '-r', '--release RELEASE', [:alpha, :beta, :live], "Release type: 0 - Beta, 1 - Live, 2 - Alpha (Default: alpha)"

data/lib/shenzhen/plugins/itunesconnect.rb

@@ -1,4 +1,7 @@
 require 'security'
+require 'pathname'
+require 'fileutils'
+require 'digest/md5'
 
 module Shenzhen::Plugins
   module ITunesConnect
@@ -7,45 +10,69 @@ module Shenzhen::Plugins
     class Client
       attr_reader :ipa, :sdk, :params
 
-      def initialize(ipa, sdk, params = [])
+      def initialize(ipa, apple_id, sdk, account, password, params = [])
         @ipa = ipa
+        @apple_id = apple_id
         @sdk = sdk
+        @account = account
+        @password = password
         @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])
+        size = File.size(@ipa)
+        checksum = Digest::MD5.file(@ipa)
+
+        FileUtils.mkdir_p("Package.itmsp")
+        FileUtils.copy_entry(@ipa, "Package.itmsp/#{@ipa}")
+
+        File.write("Package.itmsp/metadata.xml", metadata(@apple_id, checksum, size))
+
+        case transport
         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
+
+        FileUtils.rmdir("Package.itmsp")
       end
 
       private
 
-      def xcrun(tool, options = [])
-        args = ["xcrun", "-sdk #{sdk}", tool] + (options + @params).collect{|o| "-#{o}"} + [ipa, '2>&1']
-        command = args.join(' ')
+      def transport
+        xcode = `xcode-select --print-path`.strip
+        tool = Pathname.new(xcode).parent + "Applications/Application Loader.app/Contents/MacOS/itms/bin/iTMSTransporter"
+        tool = tool.to_s.gsub(/ /, '\ ')
+
+        args = [tool.to_s, "-m upload", "-f Package.itmsp", "-u #{@account}", "-p #{@password}"]
+        command = args.join(' ').strip
 
         say "#{command}" if verbose?
 
-        output = `#{command}`
+        output = `#{command} 2> /dev/null`
         say output.chomp if verbose?
 
-        return output
+        output
       end
 
       def verbose?
         @params.collect(&:to_sym).include?(:verbose)
       end
+
+      def metadata(apple_id, checksum, size)
+        %{<?xml version="1.0" encoding="UTF-8"?>
+          <package version="software4.7" xmlns="http://apple.com/itunes/importer">
+            <software_assets apple_id="#{apple_id}">
+              <asset type="bundle">
+                <data_file>
+                  <file_name>#{@ipa}</file_name>
+                  <checksum type="md5">#{checksum}</checksum>
+                  <size>#{size}</size>
+                </data_file>
+              </asset>
+            </software_assets>
+          </package>
+        }
+      end
     end
   end
 end
@@ -60,6 +87,7 @@ command :'distribute:itunesconnect' do |c|
   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 '-i', '--apple-id STRING', "Apple ID from iTunes Connect"
   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"
@@ -73,6 +101,9 @@ command :'distribute:itunesconnect' do |c|
     determine_itunes_connect_account! unless @account = options.account || ENV['ITUNES_CONNECT_ACCOUNT']
     say_error "Missing iTunes Connect account" and abort unless @account
 
+    apple_id = options.apple_id
+    say_error "Missing Apple ID" and abort unless apple_id
+
     @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
@@ -88,10 +119,7 @@ command :'distribute:itunesconnect' do |c|
     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 = Shenzhen::Plugins::ITunesConnect::Client.new(@file, apple_id, options.sdk, @account, @password, parameters)
 
     client.upload_build!
     say_ok "Upload complete. You may want to double check iTunes Connect to make sure it was received correctly."

data/lib/shenzhen/plugins/s3.rb

@@ -10,7 +10,7 @@ module Shenzhen::Plugins
       end
 
       def upload_build(ipa, options)
-        path = expand_path_with_substitutions_from_ipa_plist(ipa, options[:path])
+        path = expand_path_with_substitutions_from_ipa_plist(ipa, options[:path]) if options[:path]
 
         @s3.buckets.create(options[:bucket]) if options[:create]
 
@@ -18,9 +18,10 @@ module Shenzhen::Plugins
 
         files = []
         files << ipa
-        files << options[:dsym]
+        files << options[:dsym] if options[:dsym]
         files.each do |file|
-          key = File.join(path, File.basename(file))
+          basename = File.basename(file)
+          key = path ? File.join(path, basename) : basename
           File.open(file) do |descriptor|
             bucket.objects.create(key, descriptor, :acl => options[:acl])
           end
@@ -77,7 +78,7 @@ command :'distribute:s3' do |c|
     say_error "Missing or unspecified .ipa file" and abort unless @file and File.exist?(@file)
 
     determine_dsym! unless @dsym = options.dsym
-    say_error "Specified dSYM.zip file doesn't exist" unless @dsym and File.exist?(@dsym)
+    say_error "Specified dSYM.zip file doesn't exist" if @dsym and !File.exist?(@dsym)
 
     determine_access_key_id! unless @access_key_id = options.access_key_id
     say_error "Missing AWS Access Key ID" and abort unless @access_key_id
@@ -89,12 +90,11 @@ command :'distribute:s3' do |c|
     say_error "Missing bucket" and abort unless @bucket
 
     determine_region! unless @region = options.region
-    say_error "Missing region" and abort unless @region
 
     determine_acl! unless @acl = options.acl
     say_error "Missing ACL" and abort unless @acl
 
-    @path = options.path || ""
+    @path = options.path
 
     client = Shenzhen::Plugins::S3::Client.new(@access_key_id, @secret_access_key, @region)
 
@@ -124,7 +124,7 @@ command :'distribute:s3' do |c|
   end
 
   def determine_region!
-    @region ||= ENV['AWS_REGION'] || ""
+    @region ||= ENV['AWS_REGION']
   end
 
   def determine_acl!

data/lib/shenzhen/version.rb

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

data/lib/shenzhen/xcodebuild.rb

@@ -22,7 +22,7 @@ module Shenzhen::XcodeBuild
       self
     end
   end
-  
+
   class Error < StandardError; end
   class NilOutputError < Error; end
 
@@ -30,8 +30,10 @@ module Shenzhen::XcodeBuild
     def info(*args)
       options = args.last.is_a?(Hash) ? args.pop : {}
       output = `xcodebuild -list #{(args + args_from_options(options)).join(" ")} 2>&1`
+
       raise Error.new $1 if /^xcodebuild\: error\: (.+)$/ === output
-      raise NilOutputError unless /\S/ === output
+
+      return nil unless /\S/ === output
 
       lines = output.split(/\n/)
       info, group = {}, nil
@@ -52,7 +54,7 @@ module Shenzhen::XcodeBuild
 
       info.each do |group, values|
         next unless Array === values
-        values.delete("") and values.uniq! 
+        values.delete("") and values.uniq!
       end
 
       Info.new(info)
@@ -61,8 +63,10 @@ module Shenzhen::XcodeBuild
     def settings(*args)
       options = args.last.is_a?(Hash) ? args.pop : {}
       output = `xcodebuild #{(args + args_from_options(options)).join(" ")} -showBuildSettings 2> /dev/null`
+
+      return nil unless /\S/ === output
+
       raise Error.new $1 if /^xcodebuild\: error\: (.+)$/ === output
-      raise NilOutputError unless /\S/ === output
 
       lines = output.split(/\n/)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shenzhen
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.0
 platform: ruby
 authors:
 - Mattt Thompson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-13 00:00:00.000000000 Z
+date: 2014-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -207,6 +207,7 @@ files:
 - ./lib/shenzhen/commands/info.rb
 - ./lib/shenzhen/commands.rb
 - ./lib/shenzhen/plistbuddy.rb
+- ./lib/shenzhen/plugins/crashlytics.rb
 - ./lib/shenzhen/plugins/deploygate.rb
 - ./lib/shenzhen/plugins/ftp.rb
 - ./lib/shenzhen/plugins/hockeyapp.rb
@@ -221,6 +222,7 @@ files:
 - ./README.md
 - ./shenzhen-0.8.0.gem
 - ./shenzhen-0.8.1.gem
+- ./shenzhen-0.8.2.gem
 - ./shenzhen.gemspec
 - bin/ipa
 homepage: http://nomad-cli.com