deliver 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e8b78f5d2bd18344f491a53d2d2097137ca6ea5
-  data.tar.gz: a30ebf40d66983d4b1aec2a9050ffe3c33a29223
+  metadata.gz: 8156d24d9ac47337d5f3d1647c4d79209c4dbd4b
+  data.tar.gz: 6c4aa1ceee21c1c4585ca1cc4f1192d023d1d760
 SHA512:
-  metadata.gz: e5ef73826eb558bd5c47b7ce1d63af2b1f94a980a72769af7b1145444f403edd0fc1e7dbdd5b0e84ccd88148fd5bf367f7ab5824cd82bbd56591f59f2f9c1844
-  data.tar.gz: 5f86527190c1e4457203d97652f4b301716e6b435eb746c20333c866dabc8f94f2c070152903c207d4e52130179eba8fce82b0c945511bfa34fbf8ba63857c23
+  metadata.gz: bb21bd1e99341f908f37c8f2380a2d84e86f18f1674348eb731411361446734b22b6acf1962d6636075bc255cc89cb7e103c0f997f65a6009985e25aa6ecbcea
+  data.tar.gz: 0d5fef2525aee2338ac2defad6fa10839f8e079d0f705f08082c626436659b263058dd37545dc58cb3a7d7ffe30e527a37ba759dd418a1c0963e1660c74188e8

data/README.md

@@ -168,6 +168,10 @@ To let the computer create the screenshots for you, checkout [this section of th
 
 If you want to have the screenshots inside a device frame, with a background and a fancy label on top, you can use [Sketch to App Store](http://sketchtoappstore.com/).
 
+#### Update App description, keywords and more
+
+If you used `deliver init`, take a look at the `./metadata/` folder, which contains your app description, keywords and app title. If you change the content of the files, it will get updated when you run `deliver`.
+
 #### Upload a new ipa file with a changelog to the App Store
 This will submit a new update to Apple
 ```ruby
@@ -185,6 +189,8 @@ If you wish to skip automated submission to review you can provide `--skip-deplo
 
 The changelog is only used for App Store submission, not for TestFlight builds.
 
+It is recommended to use `deliver` in combination with [fastlane](https://github.com/KrauseFx/fastlane) to build the app using `xcodebuild`.
+
 #### Upload a new ipa for TestFlight beta testers
 
 In order to upload an `.ipa` file for Apple TestFlight you need to specify `beta_ipa` path in your `Deliverfile`
@@ -218,24 +224,6 @@ error do |information|
 end
 ```
 
-
-#### Set a default language if you only maintain one language
-```ruby
-default_language "en-US"
-version "1.2"
-
-title "Only English Title"
-```
-If you do not pass an ipa file, you have to specify the app version you want to edit.
-
-#### Update the app's keywords
-```ruby
-default_language "de-DE"
-version "1.2"
-
-keywords ["keyword1", "something", "else"]
-```
-
 #### Read content from somewhere external (file, web service, ...)
 ```ruby
 description({
@@ -275,8 +263,9 @@ All available commands with a short description can be found in [Deliverfile.md]
 - Ask the script user for a changelog
 - Deploy a new version just by starting a Jenkins job
 - Post the deployment status on Slack
-- Upload the latest screenshots on your server
-- Many more things, be creative and let me know :)
+- Upload the latest screenshots to your server
+
+For further actions, check out [fastlane](https://github.com/KrauseFx/fastlane)
     
 #### Use the exposed Ruby classes
 Some examples:
@@ -299,7 +288,7 @@ This project is well documented, check it out on [Rubydoc](http://www.rubydoc.in
 
 # Credentials
 
-A detailed description about your credentials is available on a [seperate repo](https://github.com/KrauseFx/CredentialsManager).
+A detailed description about your credentials is available on a [separate repo](https://github.com/KrauseFx/CredentialsManager).
 
 
 # Can I trust `deliver`? 

data/bin/deliver

@@ -18,7 +18,7 @@ class FastlaneApplication
     program :help, 'GitHub', 'https://github.com/krausefx/deliver'
     program :help_formatter, :compact
 
-    global_option '--force', 'Runs a deployment without verifying any information (PDF file). This can be used for build servers.'
+    global_option '-f', '--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.'
 
@@ -46,9 +46,12 @@ class FastlaneApplication
 
     command :init do |c|
       c.syntax = 'deliver init'
+      c.option '-u', '--username String', String, 'Your Apple ID'
       c.description = "Creates a new Deliverfile in the current directory"
 
       c.action do |args, options|
+        set_username(options.username)
+
         path = (Deliver::Helper.fastlane_enabled?? './fastlane' : '.')
         Deliver::DeliverfileCreator.create(path)
       end

data/lib/assets/DeliverfileDefault

@@ -1,66 +1,30 @@
-# For more information visit the GitHub documentation: https://github.com/krausefx/deliver
-# Everything next to a # is a comment and will be ignored
+###################### App Metadata ######################
+# Update the app description and metadata in the ./metadata folder
 
-# hide_transporter_output # remove the '#' in the beginning of the line, to hide the output while uploading
+###################### Screenshots ######################
+# Store all screenshots in the ./screenshots folder separated
+# by language. If you use snapshot, this happens automatically
 
+###################### IPA File ######################
+# This part is only relevant, if you want to submit a new binary
+# If you don't use fastlane (https://github.com/KrauseFx/fastlane)
+# you can set the path to your ipa file using:
+# ipa "./app.ipa"
 
-########################################
-# App Metadata
-########################################
+# to provide an ipa file for TestFlight distribution, use beta_ipa 
+# beta_ipa "./app.ipa"
 
+# The version of your app - remove this if you provide an ipa file
+version "[[APP_VERSION]]"
 
-# This folder has to include one folder for each language
-# More information about automatic screenshot upload: 
-# https://github.com/KrauseFx/deliver#upload-screenshots-to-itunes-connect
-screenshots_path "./screenshots/"
+###################### More Options ######################
+# If you want to have even more control, check out the documentation
+# https://github.com/KrauseFx/deliver/blob/master/Deliverfile.md
 
 
-# More information about all available options: https://github.com/KrauseFx/deliver/blob/master/Deliverfile.md
+###################### Automatically generated ######################
+# Feel free to remove the following lines if you use fastlane
 
-# Both lines are optional if you want to remove them:
-app_identifier "[[APP_IDENTIFIER]]"
+app_identifier "[[APP_IDENTIFIER]]" # The bundle identifier of your app
 apple_id "[[APPLE_ID]]" # This is NOT your Apple login ID, but the App ID of your app
-email "[[EMAIL]]" # the login email address
-
-# version '1.2' # you can pass this if you want to verify the version number with the ipa file
-
-# To update the app's description, changelog, etc. or to avoid updating it using deliver, edit the files in ./metadata/[language]
-
-########################################
-# Building and Testing
-########################################
-
-# Dynamic generation of the ipa file
-# I'm using Shenzhen by Mattt, but you can use any build tool you want
-# Remove the whole block if you do not want to upload an ipa file
-ipa do
-    # Add any code you want, like incrementing the build 
-    # number or changing the app identifier
-
-    # Attention: When you return a valid ipa file, this file will get uploaded and released
-    # If you only want to upload app metadata, remove the complete ipa block.
-
-    # system("ipa build --verbose") # build your project using Shenzhen
-
-    # ENV["IPA_OUTPUT_PATH"] # if you're using fastlane uncomment this and remove the line below
-    
-    "./[[APP_NAME]].ipa" # Tell 'Deliver' where it can find the finished ipa file
-end
-
-# ipa "./latest.ipa" # this can be used instead of the `do` block, if you prefer manually building the ipa file
-
-# beta_ipa do
-    # system("ipa build --verbose") # customize this to build beta version
-    # "./ad_hoc_build.ipa" # upload ipa file using `deliver --beta`
-# end
-
-# unit_tests do
-#   If you use fastlane (http://github.com/krausefx/fastlane), run the tests there
-#   system("xctool test")
-# end
-
-success do
-  # system("say 'Successfully deployed a new version.'")
-end
-
-# More information about all available options: https://github.com/KrauseFx/deliver/blob/master/Deliverfile.md
+email "[[EMAIL]]" # the login email address

data/lib/assets/DeliverfileExample

@@ -1,26 +1,4 @@
-# This is the example Deliverfile
-# For more information about each property, visit the GitHub documentation: https://github.com/krausefx/deliver
-# 
-# You can remove those parts you don't need
-# 
-# A list of available language codes can be found here: https://github.com/krausefx/deliver#available-language-codes
-# 
-# Everything next to a # is a comment and will be ignored
-
-# hide_transporter_output # remove the '#' in the beginning of the line, to hide the output while uploading
-
-########################################
-# App Metadata
-########################################
-
-
-# This folder has to include one folder for each language
-# More information about automatic screenshot upload: 
-# https://github.com/KrauseFx/deliver#upload-screenshots-to-itunes-connect
-screenshots_path "./screenshots"
-
-
-# version '1.2' # you can pass this if you want to verify the version number with the ipa file
+###################### App Metadata ######################
 # 
 # title({
 #   "en-US" => "Your App Name"
@@ -29,42 +7,32 @@ screenshots_path "./screenshots"
 # changelog({
 #   "en-US" => "iPhone 6 (Plus) Support" 
 # })
+# More options: https://github.com/KrauseFx/deliver/blob/master/Deliverfile.md
 
+###################### Screenshots ######################
+# Store all screenshots in the ./screenshots folder separated
+# by language. If you use snapshot, this happens automatically
 
+###################### IPA File ######################
+# This part is only relevant, if you want to submit a new binary
+# If you don't use fastlane (https://github.com/KrauseFx/fastlane)
+# you can set the path to your ipa file using:
+# ipa "./app.ipa"
 
-########################################
-# Building and Testing
-########################################
-
-# Dynamic generation of the ipa file
-# I'm using Shenzhen by Mattt, but you can use any build tool you want
-# Remove the whole block if you do not want to upload an ipa file
-ipa do
-    # Add any code you want, like incrementing the build 
-    # number or changing the app identifier
-
-    # Attention: When you return a valid ipa file, this file will get uploaded and released
-    # If you only want to upload app metadata, remove the complete ipa block.
-
-    # system("ipa build --verbose") # build your project using Shenzhen
-
-    # ENV["IPA_OUTPUT_PATH"] # if you're using fastlane uncomment this and remove the line below
+# to provide an ipa file for TestFlight distribution, use beta_ipa 
+# beta_ipa "./app.ipa"
 
-    "./[[APP_NAME]].ipa" # Tell 'Deliver' where it can find the finished ipa file
-end
+# The version of your app - remove this if you provide an ipa file
+version "[[APP_VERSION]]"
 
-# ipa "./latest.ipa" # this can be used instead of the `do` block, if you prefer manually building the ipa file
+###################### More Options ######################
+# If you want to have even more control, check out the documentation
+# https://github.com/KrauseFx/deliver/blob/master/Deliverfile.md
 
-# beta_ipa do
-    # system("ipa build --verbose") # customize this to build beta version
-    # "./ad_hoc_build.ipa" # upload ipa file using `deliver --beta`
-# end
 
-# unit_tests do
-#   If you use fastlane (http://github.com/krausefx/fastlane), run the tests there
-#   system("xctool test")
-# end
+###################### Automatically generated ######################
+# Feel free to remove the following lines if you use fastlane
 
-success do
-  # system("say 'Successfully deployed a new version.'")
-end
+app_identifier "[[APP_IDENTIFIER]]" # The bundle identifier of your app
+apple_id "[[APPLE_ID]]" # This is NOT your Apple login ID, but the App ID of your app
+email "[[EMAIL]]" # the login email address

data/lib/deliver/deliver_process.rb

@@ -79,10 +79,12 @@ module Deliver
       @app_version = @deploy_information[Deliverer::ValKey::APP_VERSION]
       @app_identifier = @deploy_information[Deliverer::ValKey::APP_IDENTIFIER]
 
+      used_ipa_file = ENV["IPA_OUTPUT_PATH"]# if (ENV["IPA_OUTPUT_PATH"] and File.exists?(ENV["IPA_OUTPUT_PATH"]))
+
       if is_release_build?
-        used_ipa_file = @deploy_information[:ipa]
+        used_ipa_file = @deploy_information[:ipa] if @deploy_information[:ipa]
       elsif is_beta_build?
-        used_ipa_file = @deploy_information[:beta_ipa]
+        used_ipa_file = @deploy_information[:beta_ipa] if @deploy_information[:beta_ipa]
       end
 
       if used_ipa_file.kind_of?Proc
@@ -217,6 +219,8 @@ module Deliver
         Helper.log.warn "Overwriting screenshots path from config (#{screens_path}) with (#{ENV["DELIVER_SCREENSHOTS_PATH"]})".yellow
         screens_path = ENV["DELIVER_SCREENSHOTS_PATH"]
       end
+
+      screens_path ||= "./screenshots/" # default value
       
       if screens_path
         # Not using Snapfile. Not a good user.

data/lib/deliver/deliverfile/deliverfile_creator.rb

@@ -57,9 +57,11 @@ module Deliver
       app = Deliver::App.new(app_identifier: identifier)
       app.set_metadata_directory("/tmp") # we don't want to pollute the current folder
       app.metadata # this will download the latest app metadata
+
+      version_number = app.metadata.fetch_value("//x:version").first["string"] # fetch the latest app version
       
       file_path = File.join(deliver_path, Deliver::Deliverfile::Deliverfile::FILE_NAME)
-      json = generate_deliver_file(app, deliver_path, project_name)
+      json = generate_deliver_file(app, deliver_path, project_name, version_number)
       File.write(file_path, json)
 
       FileUtils.mkdir_p File.join(deliver_path, 'screenshots')
@@ -81,7 +83,7 @@ module Deliver
     private
       # This method takes care of creating a new 'deliver' folder, containg the app metadata 
       # and screenshots folders
-      def self.generate_deliver_file(app, path, project_name)
+      def self.generate_deliver_file(app, path, project_name, version_number)
         FileUtils.mkdir_p path rescue nil # never mind if it's already there
 
         json = create_json_based_on_xml(app, path)
@@ -107,6 +109,7 @@ module Deliver
         deliver.gsub!("[[APP_NAME]]", project_name)
         deliver.gsub!("[[APPLE_ID]]", app.apple_id.to_s)
         deliver.gsub!("[[EMAIL]]", CredentialsManager::PasswordManager.shared_manager.username)
+        deliver.gsub!("[[APP_VERSION]]", version_number)
 
         return deliver
       end

data/lib/deliver/ipa_uploader.rb

@@ -99,7 +99,6 @@ module Deliver
         # Distribute to beta testers
         Helper.log.info "Distributing the latest build to Beta Testers."
         if self.app.itc.put_build_into_beta_testing!(self.app, self.fetch_app_version)
-          Helper.log.info "Successfully distributed a new beta build of your app.".green
           return true
         end
         return false

data/lib/deliver/itunes_connect/itunes_connect_submission.rb

@@ -11,53 +11,68 @@ module Deliver
 
         Helper.log.info("Choosing the latest build on iTunesConnect for beta distribution")
 
-        sleep 3
-        click_on "Prerelease"
-        sleep 3
+        require 'excon'
 
-        wait_for_preprocessing
+        # Migrate session
+        cookie_string = page.driver.cookies.collect { |key, cookie| "#{cookie.name}=#{cookie.value}" }.join(";")
 
+        trains_url = "https://itunesconnect.apple.com/WebObjects/iTunesConnect.woa/ra/apps/#{app.apple_id}/trains/"
 
-        # Beta Switches
-        if all(".switcher.ng-binding.checked").count == 0
-          raise "Looks like Beta Testing is not yet enabled for this app. Open '#{current_url}' and enable TestFlight Beta Testing.".red
-        end
-        
-        if all(".bt-version > a").count == 0
-          raise "Couldn't find any builds. Please check the iTunes Conncet page: '#{current_url}'".red
-        end
+        current_build = nil
+        current_train = nil
+        started = Time.now
 
-        # We might have to wait until the second part of "Processing" is finished
-        while first("tr > td.bt-internal").text == "Processing"
-          Helper.log.debug "iTC needs some more processing... Waiting even longer..."
-          sleep 10
-          visit current_url
-          sleep 10
-        end
 
-        first(".bt-version > a").click
+        loop do
+          trains = JSON.parse(Excon.get(trains_url, headers: { "Cookie" => cookie_string } ).body)
+          if trains['data']['processingBuilds'].count == 0
+            # Make sure the build was successfully processed
+            latest_build_time = 0
 
-        
-        # Inside the build now, enabling the 'Save' button
-        save_button = wait_for_elements(".formActionButtons.btn-actions > button").first
-
-        if save_button
-          # First, enable the save button
-          evaluate_script("$('.formActionButtons.btn-actions > button').removeAttr('disabled')")
-
-          # Maybe we have a 'What to Test' to fill in
-          to_test = ENV["DELIVER_WHAT_TO_TEST"]
-          if to_test
-            text_area = first('span[ng-show="testinfo.data.details[currentLoc].whatsNew.isEditable"] > * > textarea')
-            text_area.set to_test if text_area
+            trains['data']['trains'].each do |train|
+              train['builds'].each do |build|
+                if build['uploadDate'] > latest_build_time
+                  current_build = build
+                  current_train = train
+                  latest_build_time = build['uploadDate']
+                end
+              end
+            end
+
+            # We got the most recent build, let's see if it's ready
+            if current_build['internalState'] == 'inactive' and current_build['readyToInstall'] == true
+              Helper.log.info "Build is ready 3.2.1...".green
+              break # Success! 
+            end
           end
 
-          save_button.click
-        else
-          raise "Couldn't find the save button, looks like there is an internet connection problem.".red
+          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" + 
+            "You can always open the browser page yourself: '#{current_url}'\n" +
+            "Passed time: ~#{((Time.now - started) / 60.0).to_i} minute(s)")
+          sleep 60
+        end
+        
+
+        if not current_train['testing']['value']
+          # Beta testing for latest build is not yet enabled
+          current_train['testing']['value'] = true
+
+          Helper.log.info "Beta Testing is disabled for version #{current_train['versionString']}... enabling it now!".green
+          
+          # Update the only train we modify
+          Excon.post(trains_url, body: {trains: [current_train]}.to_json, headers: { "Cookie" => cookie_string } )
         end
 
-        Helper.log.info "Successfully enabled latest beta build.".green
+        build_url = "https://itunesconnect.apple.com/WebObjects/iTunesConnect.woa/ra/apps/#{app.apple_id}/trains/#{current_build['trainVersion']}/builds/#{current_build['buildVersion']}/testInformation"
+        build_info = JSON.parse(Excon.get(build_url, headers: { "Cookie" => cookie_string } ).body)['data']
+
+        build_info['details'][0]['whatsNew']['value'] = ENV["DELIVER_WHAT_TO_TEST"]
+        build_info['details'][0]['description']['value'] = ENV["DELIVER_BETA_DESCRIPTION"]
+        build_info['details'][0]['feedbackEmail']['value'] = ENV["DELIVER_BETA_FEEDBACK_EMAIL"]
+        Excon.post(build_url, body: build_info.to_json, headers: { "Cookie" => cookie_string } )
+
+        Helper.log.info "Successfully distributed latest beta build 🚀".green
 
         return true
       rescue => ex

data/lib/deliver/testflight.rb

@@ -10,7 +10,7 @@ module Deliver
 
       app_identifier = IpaFileAnalyser.fetch_app_identifier(ipa_path)
       app_identifier ||= ENV["TESTFLIGHT_APP_IDENTITIFER"] || 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 ||= (FastlaneCore::ItunesSearchApi.fetch_by_identifier(app_identifier)['trackId'] rescue nil)
       app_id ||= ENV["TESTFLIGHT_APPLE_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)
 

data/lib/deliver/version.rb

@@ -1,3 +1,3 @@
 module Deliver
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deliver
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-20 00:00:00.000000000 Z
+date: 2015-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane_core
@@ -94,6 +94,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: excon
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement