deliver 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e92daeb5d5f0058937a3e2b177303f2fdcfc001f
-  data.tar.gz: 8dd64896cae88f3da1e2a7d74ea25bb6791557e9
+  metadata.gz: 221e6f16252aa538e403f17cdf318edb2dd6ea20
+  data.tar.gz: fb4058c128cc42e5f871714c41c23b521949557e
 SHA512:
-  metadata.gz: 1989b0ba55fe2fa98287575d73b08c4d49f492d0cb882dc5c99cefbf9272106c2af02fd1a0ffd83a34bf194dd03a17a12286696ab362bbb19d3c48f9cba24594
-  data.tar.gz: cb746319220f76fd3b4c09926850c89161ec3e2c9268359cbc3120f5629f6cb2bf25daaae40cb60f64b5dfd3f03e73153e40124adf20904f000e0396aeb34e0f
+  metadata.gz: 860cdd383422e8e531c73db2bc549d2a56d8db91465275b3c4266746fad5cb2dd7e65b870adf71f81aac5abfe18c387ec76b6905362b697cf725bb3dab8beb6e
+  data.tar.gz: a76927b8bbbcf2b4f63b1a10410f0b55d82c96d6a130d8eb124ed7a345b1ae462d0f6753e4cb0357ef001752c67b56761cd8e68f812d340e6b492d5729d37620

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014 Felix Krause
+Copyright (c) 2015 Felix Krause
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,9 +1,16 @@
+<h3 align="center">
+  <a href="https://github.com/KrauseFx/fastlane">
+    <img src="assets/fastlane.png" width="150" />
+    <br />
+    fastlane
+  </a>
+</h3>
 <p align="center">
-<b>Deliver</b> &bull; 
-<a href="https://github.com/KrauseFx/snapshot">Snapshot</a> &bull; 
-<a href="https://github.com/KrauseFx/frameit">FrameIt</a> &bull; 
-<a href="https://github.com/KrauseFx/PEM">PEM</a> &bull; 
-<a href="https://github.com/KrauseFx/sigh">Sigh</a>
+  <b>deliver</b> &bull; 
+  <a href="https://github.com/KrauseFx/snapshot">snapshot</a> &bull; 
+  <a href="https://github.com/KrauseFx/frameit">frameit</a> &bull; 
+  <a href="https://github.com/KrauseFx/PEM">PEM</a> &bull; 
+  <a href="https://github.com/KrauseFx/sigh">sigh</a>
 </p>
 -------
 
@@ -11,7 +18,7 @@
     <img src="assets/deliver.png">
 </p>
 
-Deliver - Continuous Deployment for iOS
+deliver
 ============
 
 [![Twitter: @KauseFx](https://img.shields.io/badge/contact-@KrauseFx-blue.svg?style=flat)](https://twitter.com/KrauseFx)
@@ -19,13 +26,11 @@ Deliver - Continuous Deployment for iOS
 [![Gem](https://img.shields.io/gem/v/deliver.svg?style=flat)](http://rubygems.org/gems/deliver)
 [![Build Status](https://img.shields.io/travis/KrauseFx/deliver/master.svg?style=flat)](https://travis-ci.org/KrauseFx/deliver)
 
+###### Upload screenshots, metadata and your app to the App Store using a single command
 
-Updating your iOS app should not be painful and time consuming. Automate the 
-whole process to start with Continuous Deployment.
+`deliver` **can upload ipa files, app screenshots and more to the iTunes Connect backend**, which means, you can deploy new iPhone app updates using the command line.
 
-```Deliver``` **can upload ipa files, app screenshots and more to the iTunes Connect backend**, which means, you can deploy new iPhone app updates just by using one command.
-
-Follow the developer on Twitter: [@KrauseFx](https://twitter.com/KrauseFx)
+Get in contact with the developer on Twitter: [@KrauseFx](https://twitter.com/KrauseFx)
 
 
 -------
@@ -34,22 +39,22 @@ Follow the developer on Twitter: [@KrauseFx](https://twitter.com/KrauseFx)
     <a href="#installation">Installation</a> &bull; 
     <a href="#quick-start">Quick Start</a> &bull; 
     <a href="#usage">Usage</a> &bull; 
-    <a href="#credentials">Credentials</a> &bull; 
-    <a href="#can-i-trust-deliver">Can I trust Deliver?</a> &bull; 
+    <a href="#can-i-trust-deliver">Can I trust deliver?</a> &bull; 
     <a href="#tips">Tips</a> &bull; 
     <a href="#need-help">Need help?</a>
 </p>
 
 -------
 
+<h5 align="center"><code>deliver</code> is part of <a href="http://fastlane.tools">fastlane</a>: connect all deployment tools into one streamlined workflow.</h5>
 
 # Features
 - Upload hundreds of screenshots with different languages from different devices
 - Upload a new ipa file to iTunes Connect without Xcode from any computer
 - Update app metadata
-- Easily implement a real Continuous Deployment process
+- Easily implement a real Continuous Deployment process using [fastlane](https://github.com/KrauseFx/fastlane)
 - 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) (Yes, those are screenshots taken for all screen sizes)
+- 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)
 
 # Installation
@@ -122,7 +127,11 @@ If you want to have the screenshots inside a device frame, with a background and
 #### Upload a new ipa file with a changelog to the App Store
 This will submit a new update to Apple
 ```ruby
-ipa "./latest.ipa"
+ipa do 
+    system("ipa build")
+    "./name.ipa"
+end
+
 changelog({
     "en-US" => "This update adds cool new features",
     "de-DE" => "Dieses Update ist super"
@@ -130,25 +139,33 @@ changelog({
 ```
 If you wish to skip automated submission to review you can provide `--skip-deploy` option when calling `deliver`. This will upload the ipa file and app metadata, but will not submit the app for review.
 
+The changelog is only used for App Store submission, not for TestFlight builds.
+
 #### 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`
 
 ```ruby
-beta_ipa "./latest.ipa"
+beta_ipa do 
+    system("ipa build")
+    "./name.ipa"
+end
 ```
 
 and provide `--beta` option when calling `deliver`.
 
 #### Implement blocks to run unit tests
+If you're using [fastlane](http://github.com/krausefx/fastlane), run tests and error blocks there.
+
+If you only use `deliver`, you can use the following blocks:
+
 ```ruby
 unit_tests do
     system("xctool test")
 end
 
 success do
-    notifier = Slack::Notifier.new("SlackTeam", "SlackToken")
-    notifier.ping "Successfully deployed new version"
+    system("Say 'success'")
 end
 
 error do |exception|
@@ -156,7 +173,6 @@ error do |exception|
     raise "Something went wrong: #{exception}"    
 end
 ```
-For this example I used [slack-notifier](https://github.com/stevenosloan/slack-notifier).
 
 
 #### Set a default language if you are lucky enough to only maintain one language
@@ -191,8 +207,8 @@ ipa do
     # Add any code you want, like incrementing the build 
     # number or changing the app identifier
   
-    system("ipa build") # build your project using Shenzhen
-    "./AppName.ipa" # Tell 'Deliver' where it can find the finished ipa file
+    system("ipa build --verbose") # build your project using Shenzhen
+    "./AppName.ipa" # Tell 'deliver' where it can find the finished ipa file
 end
 ```
 
@@ -238,36 +254,18 @@ This project is well documented, check it out on [Rubydoc](http://www.rubydoc.in
 
 
 # Credentials
-The used username (Apple ID) will be stored in the ```Deliverfile``` by default. When you run ```deliver``` for the first time on another computer, you will only be asked for the password.
-
-Therefore it is easy to switch between projects, without needing to logout and login again.
 
-## Use the Keychain
-The first time you use *Deliver* you have to enter your iTunes Connect 
-credentials. They will be stored in the Keychain. 
+A detailed description about your credentials is available on a [seperate repo](https://github.com/KrauseFx/CredentialsManager).
 
-If you decide to remove your
-credentials from the Keychain, just open the *Keychain Access*, select 
-*All Items* and search for 'deliver'.
 
-## Use environment variables
-You can use the following environment variables to use a specific account instead of the one stored in the keychain.
-This is especially important if you have more than one iTunes Connect account in your keychain:
-
-    DELIVER_USER
-    DELIVER_PASSWORD
-    
-## Implement your custom solution
-Take a look at [Using the exposed Ruby classes](#use-the-exposed-ruby-classes).
-
-# Can I trust *Deliver*? 
+# Can I trust `deliver`? 
 ###How does this thing even work? Is magic involved? 🎩###
 
-```Deliver``` is fully open source, you can take a look at it. It will only modify the content you want to modify using the ```Deliverfile```. Your password will be stored in the Mac OS X keychain, but can also be passed using environment variables.
+`deliver` is fully open source, you can take a look at its source files. It will only modify the content you want to modify using the ```Deliverfile```. Your password will be stored in the Mac OS X keychain, but can also be passed using environment variables.
 
 Before actually uploading anything to iTunes, ```Deliver``` will generate a [PDF summary](https://github.com/krausefx/deliver/blob/master/assets/PDFExample.png?raw=1) of the collected data. 
 
-```Deliver``` uses the following techniques under the hood:
+```deliver``` uses the following techniques under the hood:
 
 - The iTMSTransporter tool is used to fetch the latest app metadata from iTunes Connect and upload the updated app metadata back to Apple. It is also used to upload the ipa file. iTMSTransporter is a command line tool provided by Apple.
 - With the iTMSTransporter you cannot create new version on iTunes Connect or actually publish the newly uploaded ipa file. This is why there is some browser scripting involved, using [Capybara](https://github.com/jnicklas/capybara) and [Poltergeist](https://github.com/teampoltergeist/poltergeist).
@@ -275,13 +273,13 @@ Before actually uploading anything to iTunes, ```Deliver``` will generate a [PDF
 
 # Tips
 
-## Other helpful tools
-Check out other tools in this collection to speed up your deployment process:
-- [```snapshot```](https://github.com/KrauseFx/snapshot): Create hundreds of screenshots of your iPhone app... while doing something else.
-- [```frameit```](https://github.com/KrauseFx/frameit): Want a device frame around your screenshot? Do it in an instant!
-- [```PEM```](https://github.com/KrauseFx/pem): Tired of manually creating and maintaining your push certification profiles?
-- [```sigh```](https://github.com/KrauseFx/sigh): Because you would rather spend your time building stuff than fighting provisioning.
+## [`fastlane`](http://fastlane.tools) Toolchain
 
+- [`fastlane`](http://fastlane.tools): Connect all deployment tools into one streamlined workflow
+- [`snapshot`](https://github.com/KrauseFx/snapshot): Automate taking localized screenshots of your iOS app on every device
+- [`frameit`](https://github.com/KrauseFx/frameit): Quickly put your screenshots into the right device frames
+- [`PEM`](https://github.com/KrauseFx/pem): Automatically generate and renew your push notification profiles
+- [`sigh`](https://github.com/KrauseFx/sigh): Because you would rather spend your time building stuff than fighting provisioning
 
 ## Available language codes
 ```ruby
@@ -293,31 +291,18 @@ You can use [SimulatorStatusMagic](https://github.com/shinydevelopment/Simulator
 
 ## Automatically create screenshots
 
-You can easily create screenshots completely automatically in the background using [```snapshot```](https://github.com/KrauseFx/snapshot), the little brother of ```deliver```.
-
-**Getting started:**
-
-- Run ```snapshot init``` in your project folder
-- You can edit the new ```snapshot.js``` file with your UI Automation code
-- Run ```snapshot``` to test if the screenshots work as expected
-- Remove the line ```screenshots_path``` from your ```Deliverfile``` to automatically create new screenshots for each deployment. 
-
-From now on, when you start ```deliver```, it will first create the new screenshots for you, which then will be uploaded to iTunes Connect.
+If you want to integrate ```deliver``` with ```snapshot```, check out [fastlane](https://github.com/KrauseFx/fastlane)!
 
 More information about ```snapshot``` can be found on the [Snapshot GitHub page](https://github.com/KrauseFx/snapshot).
 
 ## Jenkins integration
-Depending on how you set up your Jenkins instance, there might be problems with the ```phantomjs``` dependency.
-
-I've been using [Jenkins App](https://github.com/stisti/jenkins-app) for a long time, where ```Deliver``` works just fine. 
-
-You should not deploy a new App Store update after every commit, since you still have to wait for your review. Instead I recommend using Git Tags, or custom triggers to deploy a new update. 
+Detailed instructions about how to set up `deliver` and `fastlane` in `Jenkins` can be found in the [fastlane README](https://github.com/KrauseFx/fastlane#jenkins-integration).
 
 ## Editing the ```Deliverfile```
 Change syntax highlighting to *Ruby*.
 
 # Need help?
-- If there is a technical problem with ```Deliver```, submit an issue. Run ```deliver --trace``` to get the stacktrace.
+- If there is a technical problem with ```deliver```, submit an issue. Run ```deliver --trace``` to get the stack trace.
 - I'm available for contract work - drop me an email: deliver@krausefx.com
 
 # License

data/bin/deliver

@@ -4,25 +4,21 @@ $:.push File.expand_path("../../lib", __FILE__)
 
 require 'deliver'
 require 'commander/import'
-require 'deliver/update_checker'
 
 HighLine.track_eof = false
 
 
 # Commander
 program :version, Deliver::VERSION
-program :description, 'CLI for \'Deliver\' - Automate uploading of app metadata, screenshots and app updates to Apple'
+program :description, 'CLI for \'Deliver\' - Upload screenshots, metadata and your app to the App Store using a single command'
 program :help, 'Author', 'Felix Krause <deliver@krausefx.com>'
-program :help, 'Website', 'http://krausefx.com'
+program :help, 'Website', 'http://fastlane.tools'
 program :help, 'GitHub', 'https://github.com/krausefx/deliver'
 program :help_formatter, :compact
 
 global_option('--verbose') { $verbose = true }
 
 
-Deliver::UpdateChecker.verify_latest_version
-
-
 default_command :run
 
 require 'deliver/commands'

data/lib/assets/DeliverfileDefault

@@ -1,7 +1,6 @@
 # For more information about each property, visit the GitHub documentation: https://github.com/krausefx/deliver
 # Everything next to a # is a comment and will be ignored
 
-email '[[EMAIL]]'
 # hide_transporter_output # remove the '#' in the beginning of the line, to hide the output while uploading
 
 
@@ -16,6 +15,7 @@ apple_id "[[APPLE_ID]]"
 
 # 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 "./deliver/screenshots/"
 
 
@@ -38,18 +38,22 @@ ipa do
     # 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") # build your project using Shenzhen
+    # system("ipa build --verbose") # build your project using Shenzhen
     "./[[APP_NAME]].ipa" # Tell 'Deliver' where it can find the finished ipa file
 end
 
-# ipa "./latest.ipa" # this can be used, if you prefer manually building the ipa file
+# ipa "./latest.ipa" # this can be used instead of the `do` block, if you prefer manually building the ipa file
 
-# beta_ipa "./ad_hoc_build.ipa" # upload ipa file using `deliver --beta`
+# 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.'")
+  # system("say 'Successfully deployed a new version.'")
 end

data/lib/assets/DeliverfileExample

@@ -7,7 +7,6 @@
 # 
 # Everything next to a # is a comment and will be ignored
 
-email "yourappleid@company.com"
 # hide_transporter_output # remove the '#' in the beginning of the line, to hide the output while uploading
 
 ########################################
@@ -15,13 +14,9 @@ email "yourappleid@company.com"
 ########################################
 
 
-
-# The app identifier is required
-app_identifier "[Your App Identifier, e.g. at.felixkrause.app_name]"
-
-
 # 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"
 
 
@@ -51,18 +46,22 @@ ipa do
     # 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") # build your project using Shenzhen
+    # system("ipa build --verbose") # build your project using Shenzhen
     "./[[APP_NAME]].ipa" # Tell 'Deliver' where it can find the finished ipa file
 end
 
-# ipa "./latest.ipa" # this can be used, if you prefer manually building the ipa file
+# ipa "./latest.ipa" # this can be used instead of the `do` block, if you prefer manually building the ipa file
 
-# beta_ipa "./ad_hoc_build.ipa" # upload ipa file using `deliver --beta`
+# 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
+  # system("say 'Successfully deployed a new version.'")
+end

data/lib/deliver.rb

@@ -14,12 +14,14 @@ require 'deliver/deliverer'
 require 'deliver/ipa_uploader'
 require 'deliver/languages'
 require 'deliver/pdf_generator'
-require 'deliver/dependency_checker'
 require 'deliver/deliver_process'
+require 'deliver/dependency_checker'
+require 'deliver/update_checker'
 
 # Third Party code
 require 'colored'
 
 module Deliver
-  # Your code goes here...
+  Deliver::UpdateChecker.verify_latest_version
+  Deliver::DependencyChecker.check_dependencies
 end

data/lib/deliver/app_metadata.rb

@@ -5,6 +5,8 @@ module Deliver
   end
   class AppMetadataParameterError < StandardError
   end
+  class AppMetadataTooManyScreenshotsError < StandardError
+  end
 
   class AppMetadata
     ITUNES_NAMESPACE = "http://apple.com/itunes/importer"
@@ -214,7 +216,7 @@ module Deliver
     # Appends another screenshot to the already existing ones
     # @param (String) language The language, which has to be in this list: {Deliver::Languages}.
     # @param (Deliver::AppScreenshot) app_screenshot The screenshot you want to add to the app metadata.
-    # @raise (AppMetadataParameterError) When there are already 5 screenshots (MAXIMUM_NUMBER_OF_SCREENSHOTS).
+    # @raise (AppMetadataTooManyScreenshotsError) When there are already 5 screenshots (MAXIMUM_NUMBER_OF_SCREENSHOTS).
 
     def add_screenshot(language, app_screenshot)
       raise AppMetadataParameterError.new(INVALID_LANGUAGE_ERROR) unless Languages::ALL_LANGUAGES.include?language
@@ -246,7 +248,7 @@ module Deliver
         end
 
         if next_index > MAXIMUM_NUMBER_OF_SCREENSHOTS
-          raise AppMetadataParameterError.new("Only #{MAXIMUM_NUMBER_OF_SCREENSHOTS} screenshots are allowed per language per device type (#{app_screenshot.screen_size})")
+          raise AppMetadataTooManyScreenshotsError.new("Only #{MAXIMUM_NUMBER_OF_SCREENSHOTS} screenshots are allowed per language per device type (#{app_screenshot.screen_size})")
         end
 
         # Ready for storing the screenshot into the metadata.xml now
@@ -312,7 +314,13 @@ module Deliver
           self.clear_all_screenshots(language)
 
           Dir.glob(resulting_path, File::FNM_CASEFOLD).sort.each do |path|
-            add_screenshot(language, Deliver::AppScreenshot.new(path))
+            next if path.include?"_framed."
+
+            begin
+              add_screenshot(language, Deliver::AppScreenshot.new(path))
+            rescue AppMetadataTooManyScreenshotsError => ex
+              # We just use the first 5 ones
+            end
           end
         end
       end

data/lib/deliver/commands/init.rb

@@ -5,8 +5,6 @@ command :init do |c|
   c.description = "Creates a new Deliverfile in the current directory"
 
   c.action do |args, options|
-    Deliver::DependencyChecker.check_dependencies
-
     Deliver::DeliverfileCreator.create(enclosed_directory)
   end
 end

data/lib/deliver/commands/run.rb

@@ -7,16 +7,17 @@ command :run do |c|
   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|
-    Deliver::DependencyChecker.check_dependencies
-
-    if File.exists?(deliver_path)
-      # Everything looks alright, use the given Deliverfile
-      options.default :beta => false, :skip_deploy => false
-      Deliver::Deliverer.new(deliver_path, force: options.force, is_beta_ipa: options.beta, skip_deploy: options.skip_deploy)
-    else
-      Deliver::Helper.log.warn("No Deliverfile found at path '#{deliver_path}'.")
-      if agree("Do you want to create a new Deliverfile at the current directory? (y/n)", true)
-        Deliver::DeliverfileCreator.create(enclosed_directory)
+    path = (Deliver::Helper.fastlane_enabled?? './fastlane' : '.')
+    Dir.chdir(path) do # switch the context
+      if File.exists?(deliver_path)
+        # Everything looks alright, use the given Deliverfile
+        options.default :beta => false, :skip_deploy => false
+        Deliver::Deliverer.new(deliver_path, force: options.force, is_beta_ipa: options.beta, skip_deploy: options.skip_deploy)
+      else
+        Deliver::Helper.log.warn("No Deliverfile found at path '#{deliver_path}'.")
+        if agree("Do you want to create a new Deliverfile at the current directory? (y/n)", true)
+          Deliver::DeliverfileCreator.create(enclosed_directory)
+        end
       end
     end
   end

data/lib/deliver/deliver_process.rb

@@ -1,5 +1,3 @@
-require 'snapshot'
-
 module Deliver
   # This class takes care of verifying all inputs and triggering the upload process
   class DeliverProcess
@@ -8,10 +6,6 @@ module Deliver
     class DeliverUnitTestsError < StandardError
     end
 
-    # DeliverUnitTestsError is triggered, when the unit tests of the given block failed.
-    class DeliverUIAutomationError < StandardError
-    end
-
     # @return (Deliver::App) The App that is currently being edited.
     attr_accessor :app
 
@@ -22,6 +16,9 @@ module Deliver
     #  is used to store the deploy information until the Deliverfile finished running.
     attr_accessor :deploy_information
 
+    # @return (String): The app identifier of the currently used app (e.g. com.krausefx.app)
+    attr_accessor :app_identifier
+
     def initialize(deploy_information = nil)
       @deploy_information = deploy_information || {}
       @deploy_information[:blocks] ||= {}
@@ -49,7 +46,7 @@ module Deliver
         trigger_ipa_upload
 
         call_success_block
-      rescue Exception => ex
+      rescue => ex
         call_error_block(ex)
       end
     end
@@ -91,6 +88,8 @@ module Deliver
         raise "Could not find an ipa file for 'beta' mode. Provide one using `beta_ipa do ... end` in your Deliverfile.".red
       end
 
+      ENV["DELIVER_IPA_PATH"] = used_ipa_file
+
       if used_ipa_file
         upload_strategy = Deliver::IPA_UPLOAD_STRATEGY_APP_STORE
         if is_beta_build?
@@ -109,7 +108,12 @@ module Deliver
       end
     end
 
+    def fetch_app_identifier_from_app_file
+      @app_identifier = (CredentialsManager::AppfileConfig.try_fetch_value(:app_identifier) rescue nil)
+    end
+
     def verify_ipa_file
+      fetch_app_identifier_from_app_file unless @app_identifier
       raise Deliverfile::Deliverfile::DeliverfileDSLError.new(Deliverfile::Deliverfile::MISSING_APP_IDENTIFIER_MESSAGE.red) unless @app_identifier
       raise Deliverfile::Deliverfile::DeliverfileDSLError.new(Deliverfile::Deliverfile::MISSING_VERSION_NUMBER_MESSAGE.red) unless @app_version
     end
@@ -174,23 +178,12 @@ module Deliver
     def set_screenshots
       screens_path = @deploy_information[Deliverer::ValKey::SCREENSHOTS_PATH]
 
-      # Check if there is a Snapfile
-      if File.exists?('./Snapfile') and not screens_path
-
-        Helper.log.info("Found a Snapfile, using it to create new screenshots.".green)
-        begin
-          Snapshot::Runner.new.work
-          Helper.log.info("Looking for screenshots in './screenshots'.".yellow)
-          @app.metadata.set_all_screenshots_from_path('./screenshots')
-        rescue Exception => ex
-          # There were some UI Automation errors
-          raise DeliverUIAutomationError.new(ex)
-        end
-
-      elsif screens_path
-        if File.exists?('./Snapfile')
-          Helper.log.info("Found a Snapfile. Ignoring it. If you want 'deliver' to automatically take new screenshots for you, remove 'screenshots_path' from your 'Deliverfile'.".yellow)
-        end
+      if (ENV["DELIVER_SCREENSHOTS_PATH"] || '').length > 0
+        Helper.log.warn "Overwriting screenshots path from config (#{screens_path}) with (#{ENV["DELIVER_SCREENSHOTS_PATH"]})".yellow
+        screens_path = ENV["DELIVER_SCREENSHOTS_PATH"]
+      end
+      
+      if screens_path
         # Not using Snapfile. Not a good user.
         if not @app.metadata.set_all_screenshots_from_path(screens_path)
           # This path does not contain folders for each language

data/lib/deliver/deliverfile/deliverfile.rb

@@ -19,7 +19,7 @@ module Deliver
       #  filename itself.
       def initialize(deliver_data, path = nil)
         path ||= "./#{FILE_NAME}"
-        raise "#{FILE_NAME} not found at path '#{path}'".red unless File.exists?(path.to_s)
+        raise "#{FILE_NAME} not found at path '#{File.expand_path(path)}'".red unless File.exists?(path.to_s)
 
         self.path = path
         @deliver_data = deliver_data

data/lib/deliver/deliverfile/deliverfile_creator.rb

@@ -1,3 +1,6 @@
+require 'credentials_manager/password_manager'
+require 'credentials_manager/appfile_config'
+
 module Deliver
   # Helps new user quickly adopt Deliver
   class DeliverfileCreator
@@ -12,14 +15,14 @@ module Deliver
       project_name ||= Dir.pwd.split("/").last
 
       if agree("Do you want Deliver to automatically create the Deliverfile for you based " + 
-              "on your current app? (y/n)", true)
+              "on your current app? The app has to be in the App Store to use this feature. (y/n)", true)
 
         puts "\n\nFirst, you need to login with your iTunesConnect credentials. ".yellow + 
           "\nThis is necessary to fetch the latest metadata from your app and use it to create a Deliverfile for you." + 
           "\nIf you have previously entered your credentials already, you will not be asked again."
 
-        if Deliver::PasswordManager.shared_manager.username and Deliver::PasswordManager.shared_manager.password
-          identifier = ''
+        if CredentialsManager::PasswordManager.shared_manager.username and CredentialsManager::PasswordManager.shared_manager.password
+          identifier = ((CredentialsManager::AppfileConfig.try_fetch_value(:app_identifier) rescue '') || '')
           while identifier.length < 3
             identifier = ask("\nApp Identifier of your app (e.g. at.felixkrause.app_name): ")
           end
@@ -91,7 +94,7 @@ module Deliver
         deliver.gsub!("[[APP_IDENTIFIER]]", app.app_identifier)
         deliver.gsub!("[[APP_NAME]]", project_name)
         deliver.gsub!("[[APPLE_ID]]", app.apple_id.to_s)
-        deliver.gsub!("[[EMAIL]]", PasswordManager.shared_manager.username)
+        deliver.gsub!("[[EMAIL]]", CredentialsManager::PasswordManager.shared_manager.username)
 
         return deliver
       end

data/lib/deliver/deliverfile/dsl.rb

@@ -1,4 +1,5 @@
 # Inspired by https://github.com/CocoaPods/Core/blob/master/lib/cocoapods-core/podfile/dsl.rb
+require 'credentials_manager/password_manager'
 
 module Deliver
   module Deliverfile
@@ -102,7 +103,7 @@ module Deliver
         # This will set the email address of the Apple ID to be used
         def email(value)
           value ||= yield if block_given?
-          PasswordManager.shared_manager(value)
+          CredentialsManager::PasswordManager.shared_manager(value)
         end
 
         # This will hide the output of the iTunes Connect transporter while uploading/downloading

data/lib/deliver/dependency_checker.rb

@@ -1,6 +1,7 @@
 module Deliver
   class DependencyChecker
     def self.check_dependencies
+      return if Helper.is_test?
       self.check_phantom_js
       self.check_xcode_select
     end

data/lib/deliver/helper.rb

@@ -50,6 +50,11 @@ module Deliver
     def self.transporter_path
       self.xcode_path + '../Applications/Application\ Loader.app/Contents/MacOS/itms/bin/iTMSTransporter'
     end
+
+    def self.fastlane_enabled?
+      # This is called from the root context on the first start
+      @@enabled ||= File.directory?"./fastlane"
+    end
     
   end
 end

data/lib/deliver/ipa_uploader.rb

@@ -71,15 +71,13 @@ module Deliver
       is_okay = true
       begin
         transporter.upload(@app, @metadata_dir)
-      rescue Exception => ex
+      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
       end
 
       if is_okay
         unless Helper.is_test?
-          `rm -rf ./#{@app.apple_id}.itmsp` # we don't need this file any more
-
           return publish_on_itunes_connect(submit_information)
         end
       end

data/lib/deliver/itunes_connect.rb

@@ -1,9 +1,7 @@
-require 'deliver/password_manager'
-
 require 'capybara'
 require 'capybara/poltergeist'
-require 'security'
 require 'fastimage'
+require 'credentials_manager/password_manager'
 
 
 module Deliver
@@ -62,7 +60,7 @@ module Deliver
 
     # Loggs in a user with the given login data on the iTC Frontend.
     # You don't need to pass a username and password. It will
-    # Automatically be fetched using the {Deliver::PasswordManager}.
+    # Automatically be fetched using the {CredentialsManager::PasswordManager}.
     # This method will also automatically be called when triggering other 
     # actions like {#open_app_page}
     # @param user (String) (optional) The username/email address
@@ -75,8 +73,8 @@ module Deliver
       begin
         Helper.log.info "Logging into iTunesConnect"
 
-        user ||= PasswordManager.shared_manager.username
-        password ||= PasswordManager.shared_manager.password
+        user ||= CredentialsManager::PasswordManager.shared_manager.username
+        password ||= CredentialsManager::PasswordManager.shared_manager.password
 
         result = visit ITUNESCONNECT_URL
         raise "Could not open iTunesConnect" unless result['status'] == 'success'
@@ -100,7 +98,7 @@ module Deliver
           else
             raise ItunesConnectLoginError.new("Looks like your login data was correct, but you do not have access to the apps.")
           end
-        rescue Exception => ex
+        rescue => ex
           Helper.log.debug(ex)
           raise ItunesConnectLoginError.new("Error logging in user #{user} with the given password. Make sure you entered them correctly.")
         end
@@ -108,7 +106,7 @@ module Deliver
         Helper.log.info "Successfully logged into iTunesConnect"
 
         true
-      rescue Exception => ex
+      rescue => ex
         error_occured(ex)
       end
     end
@@ -131,11 +129,11 @@ module Deliver
         sleep 3
 
         if current_url.include?"wa/defaultError" # app could not be found
-          raise "Could not open app details for app '#{app}'. Make sure you're using the correct Apple ID and the correct Apple developer account (#{PasswordManager.shared_manager.username}).".red
+          raise "Could not open app details for app '#{app}'. Make sure you're using the correct Apple ID and the correct Apple developer account (#{CredentialsManager::PasswordManager.shared_manager.username}).".red
         end
 
         true
-      rescue Exception => ex
+      rescue => ex
         error_occured(ex)
       end
     end
@@ -191,7 +189,7 @@ module Deliver
           Helper.log.debug "Could not fetch version number of the live version for app #{app}."
           return nil
         end
-      rescue Exception => ex
+      rescue => ex
         error_occured(ex)
       end
     end
@@ -242,7 +240,7 @@ module Deliver
             if created_version != version_number
               raise "Some other version ('#{created_version}') was created instead of the one you defined ('#{version_number}')"
             end
-          rescue Exception => ex
+          rescue => ex
             # Can not fetch the version number of the new version (this happens, when it's e.g. 'Developer Rejected')
             unless page.has_content?version_number
               raise "Some other version was created instead of the one you defined ('#{version_number}')."
@@ -251,7 +249,7 @@ module Deliver
         end
 
         true
-      rescue Exception => ex
+      rescue => ex
         error_occured(ex)
       end
     end
@@ -275,7 +273,7 @@ module Deliver
     #     Capybara.ignore_hidden_elements = true
     #     first(:button, "Save").click
 
-    #   rescue Exception => ex
+    #   rescue => ex
     #     error_occured(ex)
     #   end
     # end
@@ -309,7 +307,7 @@ module Deliver
 
 
         return true
-      rescue Exception => ex
+      rescue => ex
         error_occured(ex)
       end
     end
@@ -338,7 +336,7 @@ module Deliver
         begin
           first('a', :text => BUTTON_ADD_NEW_BUILD).click
           wait_for_elements(".buildModalList")
-          sleep 1
+          sleep 5
         rescue
           if page.has_content?"Upload Date"
             # That's fine, the ipa was already selected
@@ -360,7 +358,7 @@ module Deliver
         raise "Could not put build itself onto production. Try opening '#{current_url}'" if error
 
         return true
-      rescue Exception => ex
+      rescue => ex
         error_occured(ex)
       end
     end
@@ -408,10 +406,17 @@ module Deliver
               contains_third_party_content: false,
               has_rights: false
             },
-            advertising_identifier: false
+            advertising_identifier: {
+              use_idfa: false,
+              serve_advertisement: false,
+              attribute_advertisement: false,
+              attribute_actions: false,
+              limit_ad_tracking: false
+            }
           }
 
           basic = "//*[@itc-radio='submitForReviewAnswers"
+          checkbox = "//*[@itc-checkbox='submitForReviewAnswers"
 
           #####################
           # Export Compliance #
@@ -450,10 +455,21 @@ module Deliver
           # Advertising Identifier #
           ##########################
           if page.has_content?"Advertising Identifier"
-            first(:xpath, "#{basic}.adIdInfo.usesIdfa.value' and @radio-value='#{perms[:advertising_identifier]}']//input").trigger('click') rescue nil
-
-            if perms[:advertising_identifier]
-              raise "Sorry, the advertising_identifier menu is not yet supported. Open '#{current_url}' in your browser and manally submit the app".red
+            first(:xpath, "#{basic}.adIdInfo.usesIdfa.value' and @radio-value='#{perms[:advertising_identifier][:use_idfa]}']//a").click rescue nil
+
+            if perms[:advertising_identifier][:use_idfa]
+              if perms[:advertising_identifier][:serve_advertisement]
+              	first(:xpath, "#{checkbox}.adIdInfo.servesAds.value']//a").click
+              end
+              if perms[:advertising_identifier][:attribute_advertisement]
+              	first(:xpath, "#{checkbox}.adIdInfo.tracksInstall.value']//a").click
+              end
+              if perms[:advertising_identifier][:attribute_actions]
+              	first(:xpath, "#{checkbox}.adIdInfo.tracksAction.value']//a").click
+              end
+              if perms[:advertising_identifier][:limit_ad_tracking]
+              	first(:xpath, "#{checkbox}.adIdInfo.limitsTracking.value']//a").click
+              end
             end
           end
           
@@ -474,7 +490,7 @@ module Deliver
           raise "Something is missing here.".red
         end
         return false
-      rescue Exception => ex
+      rescue => ex
         error_occured(ex)
       end
     end
@@ -533,4 +549,4 @@ module Deliver
         return results
       end
   end
-end
+end

data/lib/deliver/itunes_transporter.rb

@@ -1,6 +1,6 @@
 require 'pty'
 require 'shellwords'
-require 'deliver/password_manager'
+require 'credentials_manager/password_manager'
 
 
 module Deliver
@@ -27,10 +27,10 @@ module Deliver
 
     # Returns a new instance of the iTunesTransporter.
     # If no username or password given, it will be taken from
-    # the #{Deliver::PasswordManager}
+    # the #{CredentialsManager::PasswordManager}
     def initialize(user = nil, password = nil)
-      @user = (user || PasswordManager.shared_manager.username)
-      @password = (password || PasswordManager.shared_manager.password)
+      @user = (user || CredentialsManager::PasswordManager.shared_manager.username)
+      @password = (password || CredentialsManager::PasswordManager.shared_manager.password)
     end
 
     # Downloads the latest version of the app metadata package from iTC.
@@ -80,6 +80,8 @@ module Deliver
 
       if result
         Helper.log.info "Successfully uploaded package to iTunesConnect. It might take a few minutes until it's visible online.".green
+
+        FileUtils.rm_rf(dir) unless Helper.is_test? # we don't need the package any more, since the upload was successful
       end
 
       result
@@ -103,7 +105,7 @@ module Deliver
               parse_line(line) # this is where the parsing happens
             end
           end
-        rescue Exception => ex
+        rescue => ex
           Helper.log.fatal(ex.to_s)
           @errors << ex.to_s
         end
@@ -114,6 +116,7 @@ module Deliver
 
         if @errors.count > 0
           Helper.log.error(@errors.join("\n"))
+          return false
         end
 
         true
@@ -131,7 +134,7 @@ module Deliver
           if $1.include?"Your Apple ID or password was entered incorrectly" or
              $1.include?"This Apple ID has been locked for security reasons"
 
-            Deliver::PasswordManager.shared_manager.password_seems_wrong
+            CredentialsManager::PasswordManager.shared_manager.password_seems_wrong unless Helper.is_test?
           elsif $1.include?"Redundant Binary Upload. There already exists a binary upload with build"
             Helper.log.fatal $1
             Helper.log.fatal "You have to change the build number of your app to upload your ipa file"

data/lib/deliver/update_checker.rb

@@ -25,7 +25,7 @@ module Deliver
         if latest and Gem::Version.new(latest) > Gem::Version.new(current_version)
           return true
         end
-      rescue Exception => ex
+      rescue => ex
         Helper.log.error("Could not check if 'deliver' is up to date.")
       end
       return false

data/lib/deliver/version.rb

@@ -1,3 +1,3 @@
 module Deliver
-  VERSION = "0.4.2"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deliver
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-04 00:00:00.000000000 Z
+date: 2015-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -24,20 +24,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !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: highline
   requirement: !ruby/object:Gem::Requirement
@@ -151,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: snapshot
+  name: credentials_manager
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -290,12 +276,8 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: "Using Deliver you can easily integrate a real continuous delivery \n
-  \   solution for iOS applications. You can update the app metadata, upload screenshots
-  \n    in all languages for different screensizes to iTunesConnect and even publish
-  a new \n    ipa file to iTunesConnect. You define your prefered deployment information
-  once in a so called\n    Deliverfile and store it in git, to easily deploy from
-  every machine, even your Continuos Integration server"
+description: Upload screenshots, metadata and your app to the App Store using a single
+  command
 email:
 - deliver@krausefx.com
 executables:
@@ -330,15 +312,14 @@ files:
 - lib/deliver/itunes_transporter.rb
 - lib/deliver/languages.rb
 - lib/deliver/metadata_item.rb
-- lib/deliver/password_manager.rb
 - lib/deliver/pdf_generator.rb
 - lib/deliver/update_checker.rb
 - lib/deliver/version.rb
-homepage: http://krausefx.com
+homepage: http://fastlane.tools
 licenses:
 - MIT
 metadata: {}
-post_install_message: This gem requires phantomjs. Install it using 'brew update &&
+post_install_message: deliver requires phantomjs. Install it using 'brew update &&
   brew install phantomjs'
 rdoc_options: []
 require_paths:
@@ -358,7 +339,7 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Deliver - Continuous Deployment for iOS - automatically publish new app updates
-  and app screenshots to the AppStore
+summary: Upload screenshots, metadata and your app to the App Store using a single
+  command
 test_files: []
 has_rdoc: 

data/lib/deliver/password_manager.rb

@@ -1,110 +0,0 @@
-require 'security'
-require 'highline/import' # to hide the entered password
-
-module Deliver
-  # Handles reading out the password from the keychain or asking for login data
-  class PasswordManager
-    # @return [String] The username / email address of the currently logged in user
-    attr_accessor :username
-    # @return [String] The password of the currently logged in user
-    attr_accessor :password
-
-    HOST = "deliver" # there might be a string appended, if user has multiple accounts
-    private_constant :HOST
-
-    # A singleton object, which also makes sure, to use the correct Apple ID
-    # @param id_to_use (String) The Apple ID email address which should be used
-    def self.shared_manager(id_to_use = nil)
-      @@instance ||= PasswordManager.new(id_to_use)
-    end
-
-    # A new instance of PasswordManager.
-    # 
-    # This already check the Keychain if there is a username and password stored.
-    # If that's not the case, it will ask for login data via stdin
-    # @param id_to_use (String) Apple ID (e.g. steve@apple.com) which should be used for this upload.
-    #  if given, only the password will be asked/loaded.
-    def initialize(id_to_use = nil)
-      self.username ||= ENV["DELIVER_USER"] || id_to_use || load_from_keychain[0]
-      self.password ||= ENV["DELIVER_PASSWORD"] || load_from_keychain[1]
-
-      if (self.username || '').length == 0 or (self.password || '').length == 0
-        puts "No username or password given. You can set environment variables:"
-        puts "DELIVER_USER, DELIVER_PASSWORD"
-
-        ask_for_login
-      end
-    end
-
-    # This method is called, when the iTunes backend returns that the login data is wrong
-    # This will ask the user, if he wants to re-enter the password
-    def password_seems_wrong
-      return false if Helper.is_test?
-      
-      puts "It seems like the username or password for the account '#{self.username}' is wrong."
-      reenter = agree("Do you want to re-enter your username and password? (y/n)", true)
-      if reenter
-        remove_from_keychain
-
-        @username = nil
-        @password = nil
-
-        puts "You will have to re-run the recent command to use the new username/password."
-        return true
-      else
-        return false
-      end
-    end
-
-    private
-      def ask_for_login
-        puts "--------------------------------------------------------------------------".green
-        puts "The login information you enter now will be stored in your keychain       ".green
-        puts "More information about that on GitHub: https://github.com/krausefx/deliver".green
-        puts "--------------------------------------------------------------------------".green
-
-        username_was_there = self.username
-
-        while (self.username || '').length == 0
-          self.username = ask("Username: ")
-        end
-
-        self.password ||= load_from_keychain[1] # maybe there was already something stored in the keychain
-
-        if (self.password || '').length > 0
-          return true
-        else
-          while (self.password || '').length == 0
-            text = "Password: "
-            text = "Password (for #{self.username}): " if username_was_there
-            self.password = ask(text) { |q| q.echo = "*" }
-          end
-
-          # Now we store this information in the keychain
-          # Example usage taken from https://github.com/nomad/cupertino/blob/master/lib/cupertino/provisioning_portal/commands/login.rb
-          if Security::InternetPassword.add(hostname, self.username, self.password)
-            return true
-          else
-            Helper.log.error "Could not store password in keychain"
-            return false
-          end
-        end
-      end
-
-      def remove_from_keychain
-        puts "removing keychain item: #{hostname}"
-        Security::InternetPassword.delete(:server => hostname)
-      end
-    
-      def load_from_keychain
-        pass = Security::InternetPassword.find(:server => hostname)
-        
-        return [pass.attributes['acct'], pass.password] if pass
-        return [nil, nil]
-      end
-
-      def hostname
-        [HOST, self.username].join('.')
-      end
-  end
-end