deliver 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1aa9678c4c8f492ca46805f1ac07c306a14c7675
-  data.tar.gz: eb392c8ca031399725e9a106e88599356b7ae508
+  metadata.gz: 48fe52689d7e1c50573b7ec705ab02c338299e18
+  data.tar.gz: 5b85fbc851c1061a12722691d570ce361b1cb6f8
 SHA512:
-  metadata.gz: 03ebce1c92b8cf19827ef6a70c7b6a686235e3fa424ff2ad44f46281a8f04d30d80e7077da9661448a7969b0f04afd5cf6a26e87cd4b93d0d813385138bbf0b9
-  data.tar.gz: 5400a931ee5717062c523f47e2e0d828e0f20bf29458d80ea3340b0885899bde6a043020b0d5fbc3d78e9477607469333fdc083b29fa44168393b63c301435b7
+  metadata.gz: 0aa37714a00986d1d31bd4791e73d721c2e945a9f0af13cff64263314d57b400b1c34bfca734b4a3fda2bd6f5dab1025769ebcabd238b2a04454392a37cb29e6
+  data.tar.gz: 569d4c61f0a4fb8ec36f78a7b756f45c522d2557effa3c3bb84c921c847e56e5d96ccb9f81625e773ed757a5a6835f1cca7d199ef3273de08aa5c77cddc4b2b5

data/README.md

@@ -36,6 +36,7 @@ Get in contact with the developer on Twitter: [@KrauseFx](https://twitter.com/Kr
 -------
 <p align="center">
     <a href="#features">Features</a> &bull; 
+    <a href="#testflight">TestFlight</a> &bull; 
     <a href="#installation">Installation</a> &bull; 
     <a href="#quick-start">Quick Start</a> &bull; 
     <a href="#usage">Usage</a> &bull; 
@@ -56,6 +57,7 @@ Get in contact with the developer on Twitter: [@KrauseFx](https://twitter.com/Kr
 - Store the configuration in git to easily deploy from **any** computer, including your Continuous Integration server (e.g. Jenkins)
 - Get a PDF preview of the fetched metadata before uploading the app metadata and screenshots to Apple: [Example Preview](https://github.com/krausefx/deliver/blob/master/assets/PDFExample.png?raw=1)
 - Automatically create new screenshots with [Snapshot](https://github.com/KrauseFx/snapshot)
+- Upload new builds to the new Apple TestFlight
 
 # Installation
 
@@ -75,6 +77,40 @@ If you don't already have homebrew installed, [install it here](http://brew.sh/)
 
 To create new screenshots automatically, check out my other open source project [Snapshot](https://github.com/KrauseFx/snapshot).
 
+# TestFlight
+
+To upload a new build to Apple `TestFlight` use the following command:
+
+```
+deliver testflight
+```
+
+This will auotmatically look for an ipa file in the current directory.
+
+`deliver` currently supports **Internal Testers** only.
+
+Make sure to increase your build number before building and uploading your app.
+
+#### More options:
+
+Specify the `ipa` file to be used: 
+
+```
+deliver testflight ./my_app.ipa
+```
+
+Pass the Apple ID and App ID to be used (optional):
+
+```
+deliver testflight -u felix@krausefx.com -a 862582703
+```
+
+To build and upload the ipa in one step, you can use [shenzhen](https://github.com/nomad/shenzhen):
+
+```
+ipa build && deliver testflight
+```
+
 # Quick Start
 
 
@@ -304,7 +340,7 @@ Detailed instructions about how to set up `deliver` and `fastlane` in `Jenkins`
 Change syntax highlighting to *Ruby*.
 
 # Need help?
-- If there is a technical problem with ```deliver```, submit an issue. Run ```deliver --trace``` to get the stack trace.
+- If there is a technical problem with ```deliver```, submit an issue.
 - I'm available for contract work - drop me an email: deliver@krausefx.com
 
 # License

data/bin/deliver

@@ -18,14 +18,15 @@ class FastlaneApplication
     program :help, 'GitHub', 'https://github.com/krausefx/deliver'
     program :help_formatter, :compact
 
-    global_option('--verbose') { $verbose = true }
+    global_option '--force', 'Runs a deployment without verifying any information (PDF file). This can be used for build servers.'
+    global_option '--beta', 'Upload a beta build to iTunes Connect. This uses the `beta_ipa` block.'
+    global_option '--skip-deploy', 'Skips submission of the build on iTunes Connect. This will only upload the ipa and/or metadata.'
+
+    always_trace!
 
     command :run do |c|
       c.syntax = 'deliver'
       c.description = 'Run a deploy process using the Deliverfile in the current folder'
-      c.option '--force', 'Runs a deployment without verifying any information (PDF file). This can be used for build servers.'
-      c.option '--beta', 'Runs a deployment to beta build on iTunes Connect'
-      c.option '--skip-deploy', 'Skips deployment on iTunes Connect'
       c.action do |args, options|
         path = (Deliver::Helper.fastlane_enabled?? './fastlane' : '.')
         Dir.chdir(path) do # switch the context
@@ -52,14 +53,33 @@ class FastlaneApplication
       end
     end
 
+    command :testflight do |c|
+      c.syntax = 'deliver testflight'
+      c.description = "Uploads a given ipa file to the new Apple TestFlight"
+      c.option '-a', '--app_id String', String, 'The App ID (numeric, like 956814360)'
+      c.option '-u', '--username String', String, 'Your Apple ID'
+
+      c.action do |args, options|
+        ipa_path = (args.first || determine_ipa) + '' # unfreeze the string
+
+        set_username(options.username)
+
+        Deliver::Testflight.upload!(ipa_path, options.app_id, options.skip_deploy)
+      end
+    end
 
     def set_username(username)
       user = username
       user ||= ENV["DELIVER_USERNAME"]
-      user ||= CredentialsManager::AppfileConfig.try_fetch_value(:apple_id)      
+      user ||= CredentialsManager::AppfileConfig.try_fetch_value(:apple_id)
       CredentialsManager::PasswordManager.shared_manager(user) if user
     end
 
+    def determine_ipa
+      return Dir['*.ipa'].first if Dir["*.ipa"].count == 1
+      return ask("Path to IPA file to upload: ".green)
+    end
+
     default_command :run
 
     run!

data/lib/deliver.rb

@@ -17,6 +17,8 @@ require 'deliver/pdf_generator'
 require 'deliver/deliver_process'
 require 'deliver/dependency_checker'
 require 'deliver/update_checker'
+require 'deliver/ipa_file_analyser'
+require 'deliver/testflight'
 
 # Third Party code
 require 'colored'

data/lib/deliver/ipa_file_analyser.rb

@@ -0,0 +1,44 @@
+module Deliver
+  class IpaFileAnalyser
+
+    # Fetches the app identifier (e.g. com.facebook.Facebook) from the given ipa file.
+    def self.fetch_app_identifier(path)
+      plist = IpaFileAnalyser.fetch_info_plist_file(path)
+      return plist['CFBundleIdentifier'] if plist
+      return nil
+    end
+
+    # Fetches the app version from the given ipa file.
+    def self.fetch_app_version(path)
+      plist = IpaFileAnalyser.fetch_info_plist_file(path)
+      return plist['CFBundleShortVersionString'] if plist
+      return nil
+    end
+
+    def self.fetch_info_plist_file(path)
+      Zip::File.open(path) do |zipfile|
+        zipfile.each do |file|
+          if file.name.include?'.plist' and not ['.bundle', '.framework'].any? { |a| file.name.include?a }
+            # We can not be completely sure, that's the correct plist file, so we have to try
+            begin
+              # The XML file has to be properly unpacked first
+              tmp_path = "/tmp/deploytmp.plist"
+              File.write(tmp_path, zipfile.read(file))
+              system("plutil -convert xml1 #{tmp_path}")
+              result = Plist::parse_xml(tmp_path)
+              File.delete(tmp_path)
+
+              if result['CFBundleIdentifier'] or result['CFBundleVersion']
+                return result
+              end
+            rescue
+              # We don't really care, look for another XML file
+            end
+          end
+        end
+      end
+
+      nil
+    end
+  end
+end

data/lib/deliver/ipa_uploader.rb

@@ -36,16 +36,12 @@ module Deliver
 
     # Fetches the app identifier (e.g. com.facebook.Facebook) from the given ipa file.
     def fetch_app_identifier
-      plist = fetch_info_plist_file
-      return plist['CFBundleIdentifier'] if plist
-      return nil
+      return IpaFileAnalyser.fetch_app_identifier(@ipa_file.path)
     end
 
     # Fetches the app version from the given ipa file.
     def fetch_app_version
-      plist = fetch_info_plist_file
-      return plist['CFBundleShortVersionString'] if plist
-      return nil
+      return IpaFileAnalyser.fetch_app_version(@ipa_file.path)
     end
 
 
@@ -70,7 +66,7 @@ module Deliver
 
       is_okay = true
       begin
-        transporter.upload(@app, @metadata_dir)
+        is_okay = transporter.upload(@app, @metadata_dir)
       rescue => ex
         Helper.log.debug ex
         is_okay = ex.to_s.include?"ready exists a binary upload with build" # this just means, the ipa is already online
@@ -137,32 +133,5 @@ module Deliver
         asset = @data.xpath('//x:asset', "x" => Deliver::AppMetadata::ITUNES_NAMESPACE).first
         asset << @ipa_file.create_xml_node(@data)
       end
-
-      def fetch_info_plist_file
-        Zip::File.open(@ipa_file.path) do |zipfile|
-          zipfile.each do |file|
-            if file.name.include?'.plist' and not ['.bundle', '.framework'].any? { |a| file.name.include?a }
-              # We can not be completely sure, that's the correct plist file, so we have to try
-              begin
-                # The XML file has to be properly unpacked first
-                tmp_path = "/tmp/deploytmp.plist"
-                File.write(tmp_path, zipfile.read(file))
-                system("plutil -convert xml1 #{tmp_path}")
-                result = Plist::parse_xml(tmp_path)
-                File.delete(tmp_path)
-
-                if result['CFBundleIdentifier'] or result['CFBundleVersion']
-                  return result
-                end
-              rescue
-                # We don't really care, look for another XML file
-              end
-            end
-          end
-        end
-
-        nil
-      end
-
   end
 end

data/lib/deliver/itunes_connect/itunes_connect_helper.rb

@@ -49,7 +49,7 @@ module Deliver
         started = Time.now
 
         # Wait, while iTunesConnect is processing the uploaded file
-        while page.has_content?"Uploaded"
+        while (page.has_content?"Uploaded" or page.has_content?"Processing")
           # iTunesConnect is super slow... so we have to wait...
           Helper.log.info("Sorry, we have to wait for iTunesConnect, since it's still processing the uploaded ipa file\n" + 
             "If this takes longer than 45 minutes, you have to re-upload the ipa file again.\n" + 
@@ -72,7 +72,6 @@ module Deliver
 
           counter += 1
           if counter > 100
-            Helper.log.debug page.html
             Helper.log.debug caller
             raise ItunesConnectGeneralError.new("Couldn't find element '#{name}' after waiting for quite some time")
           end

data/lib/deliver/itunes_connect/itunes_connect_submission.rb

@@ -19,15 +19,16 @@ module Deliver
         end
 
         if first(".switcher.ng-binding")['class'].include?"checked"
-          Helper.log.warn("Beta Build seems to be already active. Take a look at '#{current_url}'")
+          Helper.log.info("Beta is already active. Take a look at '#{current_url}'.")
           return true
         end
 
         first(".switcher.ng-binding").click
         if page.has_content?"Are you sure you want to start testing"
           click_on "Start"
-        end
 
+          Helper.log.info "Successfully enabled beta builds".green
+        end
 
         return true
       rescue => ex
@@ -102,7 +103,7 @@ module Deliver
             Helper.log.info("App is already Waiting For Review")
             return true
           else
-            raise "Couldn't find button with name '#{BUTTON_STRING_SUBMIT_FOR_REVIEW}'"
+            raise "Couldn't find button with name '#{BUTTON_STRING_SUBMIT_FOR_REVIEW}'!"
           end
         end
 

data/lib/deliver/itunes_transporter.rb

@@ -95,8 +95,7 @@ module Deliver
         if defined?@@hide_transporter_output
           # Show a one time message instead
           Helper.log.info "Waiting for iTunes Connect transporter to be finished.".green
-          Helper.log.info "If you want upload/download logs to be enabled, remove 'hide_transporter_output' from your Deliverfile."
-          Helper.log.info "iTunes Transporter progress...".green
+          Helper.log.info "iTunes Transporter progress... this might take a few minutes...".green
         end
 
         begin

data/lib/deliver/testflight.rb

@@ -0,0 +1,26 @@
+module Deliver
+  class Testflight
+
+    # Uploads a new build to Apple TestFlight
+    # @param ipa_path (String) a path to the IPA to upload
+    # @param app_id (String) optional, the app ID
+    # @param skip_deploy (boolean) Should the submission be skipped? 
+    def self.upload!(ipa_path, app_id, skip_deploy)
+      ItunesTransporter.hide_transporter_output
+
+      app_identifier = IpaFileAnalyser.fetch_app_identifier(ipa_path)
+      app_identifier ||= ask("Could not automatically find the app identifier, please enter the app's bundle identifier: ")
+      app_id ||= (Deliver::ItunesSearchApi.fetch_by_identifier(app_identifier)['trackId'] rescue nil)
+      app_id ||= ask("Could not automatically find the app ID, please enter it here (e.g. 956814360): ")
+      strategy = (skip_deploy ? Deliver::IPA_UPLOAD_STRATEGY_JUST_UPLOAD : Deliver::IPA_UPLOAD_STRATEGY_BETA_BUILD)
+
+      Helper.log.info "Ready to upload new build to TestFlight (#{app_identifier} - #{app_id})".green
+
+      # Got everything to replaoy
+      app = App.new(app_identifier: app_identifier, apple_id: app_id)
+      ipa = IpaUploader.new(app, '/tmp/', ipa_path, strategy)
+      result = ipa.upload!
+      raise "Error distributing new beta version!".red unless result == true
+    end
+  end
+end

data/lib/deliver/version.rb

@@ -1,3 +1,3 @@
 module Deliver
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deliver
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-26 00:00:00.000000000 Z
+date: 2015-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -305,6 +305,7 @@ files:
 - lib/deliver/deliverfile/dsl.rb
 - lib/deliver/dependency_checker.rb
 - lib/deliver/helper.rb
+- lib/deliver/ipa_file_analyser.rb
 - lib/deliver/ipa_uploader.rb
 - lib/deliver/itunes_connect/itunes_connect.rb
 - lib/deliver/itunes_connect/itunes_connect_additional.rb
@@ -320,6 +321,7 @@ files:
 - lib/deliver/languages.rb
 - lib/deliver/metadata_item.rb
 - lib/deliver/pdf_generator.rb
+- lib/deliver/testflight.rb
 - lib/deliver/update_checker.rb
 - lib/deliver/version.rb
 homepage: http://fastlane.tools