deliver 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09ef987a38d4e23c32084e479906c80647c13e0f
-  data.tar.gz: 91bbad8fbe088f74439a3c6a3691838f9f340930
+  metadata.gz: be16fd06999f4fd2f5621ea5b1c4997f461776f6
+  data.tar.gz: d694a822e357510159c6c54cb9fe85259294df81
 SHA512:
-  metadata.gz: 5085795e4ce3188b7919a869b739c90752a4ec11939775b94f5eb7b5d7cd3cd7579d7d106754cb80569cd01da13c2254854cf632291b812806da04417149c1d1
-  data.tar.gz: f2233fb71a3d6b017efd4a971fe8d2ec963cd99a68ad5efdf7f94fbe2f57ffb4e3bf862a34abb2c70d4461d453059e6e1c6a0b1cfcf5aac42b406152edf05a09
+  metadata.gz: 4b1cbc989b40241a3f86ee2d1a85e670725b573f4cd3834be0efe92f799458e879b5521258aae7656c35074d5a18a760496b0a75134534f31ced29fd4f171e9a
+  data.tar.gz: 65a221d7ce61b6e083b0a3f07caef042e62a17def9d02b37f862c189f5d4b0020d6a8fdb81cf136e220b50230ccae355983779c5e3013d52782ca7c55bcdda39

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    deliver (0.1.0)
+    deliver (0.1.1)
       capybara (~> 2.4.3)
       colored
       commander (~> 4.2.0)

data/README.md

@@ -14,7 +14,7 @@ Deliver - Continuous Deployment for iOS
 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 iTunesConnect backend**, which means, you can deploy new iPhone app updates just by using one command.
+```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)
 
@@ -34,11 +34,11 @@ Follow the developer on Twitter: [@KrauseFx](https://twitter.com/KrauseFx)
 
 # Features
 - Upload hundreds of screenshots with different languages from different devices
-- Upload a new ipa file to iTunesConnect without Xcode from any computer
+- Upload a new ipa file to iTunes Connect without Xcode from any computer
 - Update app metadata
 - Easily implement a real Continuous Deployment process
 - 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 on 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) (Yes, those are screenshots taken for all screen sizes)
 
 # Installation
 
@@ -50,7 +50,7 @@ Make sure, you have the latest version of the Xcode command line tools installed
 
     xcode-select --install
 
-Install phantomjs (this is needed to control the iTunesConnect frontend)
+Install phantomjs (this is needed to control the iTunes Connect frontend)
 
     brew update && brew install phantomjs
 
@@ -59,12 +59,12 @@ If you don't have homebrew installed already, [install it here](http://brew.sh/)
 # Quick Start
 
 
-The guide will create all the necessary files for you, using the existing app metadata from iTunesConnect.
+The guide will create all the necessary files for you, using the existing app metadata from iTunes Connect.
 
 - ```cd [your_project_folder]```
 - ```deliver init```
-- When your app is already in the AppStore: ```y```
- - Enter your iTunesConnect credentials
+- When your app is already in the App Store: ```y```
+ - Enter your iTunes Connect credentials
  - Enter your app identifier
  - Enjoy a good drink, while the computer does all the work for you
 - When it's a new app: ```n```
@@ -85,12 +85,12 @@ Why should you have to remember complicated commands and parameters?
 
 Store your configuration in a text file to easily deploy from any computer.
 
-Run ```deliver init``` to create a new ```Deliverfile```. You can either let the wizard generate a file based on the metadata from iTunesConnect or create one from a template.
+Run ```deliver init``` to create a new ```Deliverfile```. You can either let the wizard generate a file based on the metadata from iTunes Connect or create one from a template.
 
 Once you created your configuration, just run ```deliver```.
 
 Here are a few example files:
-#### Upload screenshots to iTunesConnect
+#### Upload screenshots to iTunes Connect
 ```ruby
 app_identifier "net.sunapps.1"
 version "1.1"
@@ -99,7 +99,7 @@ screenshots_path "./screenshots"
 ```
 The screenshots folder must include one subfolder per language (see [Available language codes](#available-language-codes))
 
-#### Upload a new ipa file with a changelog to the AppStore
+#### Upload a new ipa file with a changelog to the App Store
 This will submit a new update to Apple
 ```ruby
 ipa "./latest.ipa"
@@ -202,17 +202,21 @@ 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 iTunesConnect 
+The first time you use *Deliver* you have to enter your iTunes Connect 
 credentials. They will be stored in the Keychain. 
 
 If you decide to remove your
 credentials from the Keychain, just open the *Keychain Access*, select 
-*All Items* and search for 'itunesconnect.apple.com'.
+*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:
+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
@@ -229,8 +233,8 @@ Before actually uploading anything to iTunes, ```Deliver``` will generate a [PDF
 
 ```Deliver``` uses the following techniques under the hood:
 
-- The iTMSTransporter tool is used to fetch the latest app metadata from iTunesConnect 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 iTunesConnect 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).
+- 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).
 - The iTunes search API to find missing information about a certain app, like the *apple_id* when you only pass the *bundle_identifier*. 
 
 # Tips
@@ -263,7 +267,7 @@ These are features, which are implemented, but not yet fully tested and producti
 ```ruby
 beta_ipa "./latest.ipa"
 ```
-This will upload the ipa file to iTunesConnect and mark the uploaded build as Beta build.
+This will upload the ipa file to iTunes Connect and mark the uploaded build as Beta build.
 
 # Need help?
 - If there is a technical problem with ```Deliver```, submit an issue. Run ```deliver --trace``` to get the stacktrace.

data/lib/assets/DeliverfileDefault

@@ -1,7 +1,7 @@
 # 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]]'
 
 ########################################
 # App Metadata
@@ -9,6 +9,7 @@
 
 # The app identifier is required
 app_identifier "[[APP_IDENTIFIER]]"
+apple_id "[[APPLE_ID]]"
 
 
 # This folder has to include one folder for each language

data/lib/assets/DeliverfileExample

@@ -7,7 +7,7 @@
 # 
 # Everything next to a # is a comment and will be ignored
 
-
+email "yourappleid@company.com"
 
 ########################################
 # App Metadata

data/lib/deliver/app.rb

@@ -43,8 +43,15 @@ module Deliver
         begin
           self.apple_id = Deliver::ItunesSearchApi.fetch_by_identifier(app_identifier)['trackId']
         rescue
-          Helper.log.fatal "Could not find Apple ID based on the app identifier '#{app_identifier}'. Maybe the app is not in the AppStore yet?"
-          raise "Please pass a valid Apple ID using 'apple_id'".red
+          unless Helper.is_test?
+            Helper.log.info "Could not find Apple ID based on the app identifier in the US App Store. Maybe the app is not yet in the store?".yellow
+
+            while ((self.apple_id || '').to_s.length == 0) || ((self.apple_id || 0).to_i == 0)
+              self.apple_id = ask("\nApple ID of your app (e.g. 284882215): ")
+            end
+          else
+            raise "Please pass a valid Apple ID using 'apple_id'".red
+          end
         end
       end
     end

data/lib/deliver/deliverfile/deliverfile_creator.rb

@@ -18,7 +18,7 @@ module Deliver
           "\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.new.username and Deliver::PasswordManager.new.password
+        if Deliver::PasswordManager.shared_manager.username and Deliver::PasswordManager.shared_manager.password
           identifier = ''
           while identifier.length < 3
             identifier = ask("\nApp Identifier of your app (e.g. at.felixkrause.app_name): ")
@@ -86,6 +86,8 @@ module Deliver
         deliver = File.read("#{gem_path}/lib/assets/DeliverfileDefault")
         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)
 
         return deliver
       end

data/lib/deliver/deliverfile/dsl.rb

@@ -101,6 +101,12 @@ module Deliver
           @deliver_data.set_new_value(Deliverer::ValKey::BETA_IPA, value)
         end
 
+        # 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)
+        end
+
         # Set the apps new version number.
         # 
         # If you do not set this, it will automatically being fetched from the 

data/lib/deliver/itunes_connect.rb

@@ -72,8 +72,8 @@ module Deliver
       begin
         Helper.log.info "Logging into iTunesConnect"
 
-        user ||= PasswordManager.new.username
-        password ||= PasswordManager.new.password
+        user ||= PasswordManager.shared_manager.username
+        password ||= PasswordManager.shared_manager.password
 
         result = visit ITUNESCONNECT_URL
         raise "Could not open iTunesConnect" unless result['status'] == 'success'
@@ -119,7 +119,7 @@ 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.new.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 (#{PasswordManager.shared_manager.username}).".red
         end
 
         true

data/lib/deliver/itunes_transporter.rb

@@ -23,8 +23,8 @@ module Deliver
     # If no username or password given, it will be taken from
     # the #{Deliver::PasswordManager}
     def initialize(user = nil, password = nil)
-      @user = (user || PasswordManager.new.username)
-      @password = (password || PasswordManager.new.password)
+      @user = (user || PasswordManager.shared_manager.username)
+      @password = (password || PasswordManager.shared_manager.password)
     end
 
     # Downloads the latest version of the app metadata package from iTC.
@@ -112,7 +112,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.new.password_seems_wrong
+            Deliver::PasswordManager.shared_manager.password_seems_wrong
           end
 
         elsif line =~ WARNING_REGEX

data/lib/deliver/password_manager.rb

@@ -9,15 +9,23 @@ module Deliver
     # @return [String] The password of the currently logged in user
     attr_accessor :password
 
-    HOST = "itunesconnect.apple.com"
+    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
-    def initialize
-      self.username ||= ENV["DELIVER_USER"] || load_from_keychain[0]
+    # @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
@@ -36,9 +44,10 @@ module Deliver
       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
-        remove_from_keychain
 
         puts "You will have to re-run the recent command to use the new username/password."
         return true
@@ -54,33 +63,48 @@ module Deliver
         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
 
-        while (self.password || '').length == 0
-          self.password = ask("Password: ") { |q| q.echo = "*" }
-        end
+        self.password ||= load_from_keychain[1] # maybe there was already something stored in the keychain
 
-        # 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(HOST, self.username, self.password)
+        if (self.password || '').length > 0
           return true
         else
-          Helper.log.error "Could not store password in keychain"
-          return false
+          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
-        Security::InternetPassword.delete(:server => HOST)
+        puts "removing keychain item: #{hostname}"
+        Security::InternetPassword.delete(:server => hostname)
       end
     
       def load_from_keychain
-        pass = Security::InternetPassword.find(:server => HOST)
+        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

data/lib/deliver/version.rb

@@ -1,3 +1,3 @@
 module Deliver
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/spec/deliverfile_creator_spec.rb

@@ -32,7 +32,6 @@ describe Deliver do
       FileUtils.rm_rf("/tmp/#{apple_id}.itmsp") rescue nil
 
 
-      
 
       Deliver::ItunesTransporter.set_mock_file("spec/responses/transporter/download_valid_apple_id.txt")
 
@@ -60,6 +59,8 @@ describe Deliver do
       correct = File.read("./lib/assets/DeliverfileDefault")
       correct.gsub!("[[APP_IDENTIFIER]]", 'net.sunapps.54')
       correct.gsub!("[[APP_NAME]]", project_name)
+      correct.gsub!("[[EMAIL]]", ENV["DELIVER_USER"])
+      correct.gsub!("[[APPLE_ID]]", apple_id.to_s)
       expect(File.read("/tmp/Deliverfile")).to eq(correct)
 
       expect(File.directory?([deliver_path, "screenshots"].join("/"))).to eq(true)

data/spec/spec_helper.rb

@@ -10,6 +10,9 @@ require 'mocking/webmocking'
 require 'mocking/transporter_mocking'
 
 
+ENV["DELIVER_USER"] = "DELIVERUSER"
+ENV["DELIVER_PASSWORD"] = "DELIVERPASS"
+
 # This module is only used to check the environment is currently a testing env
 module SpecHelper
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deliver
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-05 00:00:00.000000000 Z
+date: 2014-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: security