deliver 0.3.6 → 0.3.7.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29a8cd17091cc3b85709b9dce0f5b0ea6457320c
-  data.tar.gz: 6d361bbaba3f7908fc1e15fe8547853f53060461
+  metadata.gz: c0c8e78d1a6ebb13df0846c007e5451ceea0ab83
+  data.tar.gz: c52cb37533409e84d2aa002a2b0a7e20efc4396b
 SHA512:
-  metadata.gz: aed7ccb0a4cf68b1f272bcff55d8ac21bc9a88c6d974537af8db171901f4a8f1f54cf973036182cea730d926df634a7f962acf7af9977546c1f272ff815b0450
-  data.tar.gz: 4bab9b894e31591d2a4ed1bda8c12a3df733203f82d6453a8076ec7aa6b8fa478a537ba6c05200cb5943c21ff4930aa8a4ba204e0b5329e2df402974bc768cd4
+  metadata.gz: 492eca241565072da82291e80c1f22450b29494db1c36955600195dfd2efbac7d6dfe8575fb4868bb71930afe5c853bf9f8ec620121efa0aa753a5b395a7e778
+  data.tar.gz: 3e02ab4bdfdf9bf014a1a11ff37c9a3bd85818cbc136905b9d0e8edc30d173bd871a9adce7317e497a74964e1060f6950ac9c3921f69981abff2539ac62492cc

data/README.md

@@ -1,7 +1,9 @@
 <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>
+<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>
 -------
 
@@ -27,14 +29,16 @@ Follow the developer on Twitter: [@KrauseFx](https://twitter.com/KrauseFx)
 
 
 -------
-[Features](#features) &bull;
-[Installation](#installation) &bull;
-[Quick Start](#quick-start) &bull;
-[Usage](#usage) &bull;
-[Credentials](#credentials) &bull;
-[Can I trust Deliver?](#can-i-trust-deliver) &bull;
-[Tips](#tips) &bull;
-[Need help?](#need-help)
+<p align="center">
+    <a href="#features">Features</a> &bull; 
+    <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="#tips">Tips</a> &bull; 
+    <a href="#need-help">Need help?</a>
+</p>
 
 -------
 
@@ -62,7 +66,7 @@ Install phantomjs (this is needed to control the iTunes Connect frontend)
 
     brew update && brew install phantomjs
 
-If you don't have homebrew installed already, [install it here](http://brew.sh/).
+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).
 
@@ -260,6 +264,15 @@ Before actually uploading anything to iTunes, ```Deliver``` will generate a [PDF
 - The iTunes search API to find missing information about a certain app, like the *apple_id* when you only pass the *bundle_identifier*. 
 
 # 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.
+
+
 ## Available language codes
 ```ruby
 ["da-DK", "de-DE", "el-GR", "en-AU", "en-CA", "en-GB", "en-US", "es-ES", "es-MX", "fi-FI", "fr-CA", "fr-FR", "id-ID", "it-IT", "ja-JP", "ko-KR", "ms-MY", "nl-NL", "no-NO", "pt-BR", "pt-PT", "ru-RU", "sv-SE", "th-TH", "tr-TR", "vi-VI", "cmn-Hans", "zh_CN", "cmn-Hant"]
@@ -277,6 +290,7 @@ You can easily create screenshots completely automatically in the background usi
 - 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 ```screenshot_folder``` 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.
 

data/lib/deliver/app_metadata.rb

@@ -1,9 +1,9 @@
 require 'nokogiri'
 
 module Deliver
-  class AppMetadataError < StandardError 
+  class AppMetadataError < StandardError
   end
-  class AppMetadataParameterError < StandardError 
+  class AppMetadataParameterError < StandardError
   end
 
   class AppMetadata
@@ -40,7 +40,7 @@ module Deliver
     # @param app [Deliver::App] The app this metadata is from/for
     # @param dir [String] The app this metadata is from/for
     # @param redownload_package [bool] When true
-    #  the current package will be downloaded from iTC before you can 
+    #  the current package will be downloaded from iTC before you can
     #  modify any values. This should only be false for unit tests
     # @raise (AppMetadataParameterError) Is thrown when don't pass a correct app object
     def initialize(app, dir, redownload_package = true)
@@ -93,10 +93,10 @@ module Deliver
         Helper.log.info("Locale '#{language}' already exists. Can not create it again.")
         return false
       end
-      
+
 
       locales = fetch_value("//x:locales").first
-      
+
       new_locale = @data.create_element('locale')
       new_locale['name'] = language
       locales << new_locale
@@ -110,7 +110,7 @@ module Deliver
 
       Helper.log.info("Successfully created the new locale '#{language}'. The default title '#{default_title}' was set, since it's required by iTunesConnect.")
       Helper.log.info("You can update the title using 'app.metadata.update_title'")
-      
+
       information[language] ||= {}
       information[language][:title] = { value: default_title, modified: true}
 
@@ -218,14 +218,14 @@ module Deliver
 
     def add_screenshot(language, app_screenshot)
       raise AppMetadataParameterError.new(INVALID_LANGUAGE_ERROR) unless Languages::ALL_LANGUAGES.include?language
-      
+
       create_locale_if_not_exists(language)
 
       # Fetch the 'software_screenshots' node (array) for the specific locale
       locales = self.fetch_value("//x:locale[@name='#{language}']")
 
       screenshots = self.fetch_value("//x:locale[@name='#{language}']/x:software_screenshots").first
-      
+
       if not screenshots or screenshots.children.count == 0
         screenshots.remove if screenshots
 
@@ -277,7 +277,7 @@ module Deliver
 
       new_screenshots.each do |key, value|
         if key.kind_of?String and value.kind_of?Array and value.count > 0 and value.first.kind_of?AppScreenshot
-          
+
           self.clear_all_screenshots(key)
 
           value.each do |screen|
@@ -291,24 +291,24 @@ module Deliver
     end
 
     # Automatically add all screenshots contained in the given directory to the app.
-    # 
+    #
     # This method will automatically detect which device type each screenshot is.
-    # 
+    #
     # This will also clear all existing screenshots before setting the new ones.
     # @param (Hash) hash A hash containing a different path for each locale ({Deliver::Languages::ALL_LANGUAGES})
     def set_screenshots_for_each_language(hash)
       raise AppMetadataParameterError.new("Parameter needs to be an hash, containg strings with the new description") unless hash.kind_of?Hash
 
       hash.each do |language, current_path|
-        resulting_path = "#{current_path}/*.png"
+        resulting_path = "#{current_path}/*.{png,PNG,jpg,JPG,jpeg,JPEG}"
 
         raise AppMetadataParameterError.new(INVALID_LANGUAGE_ERROR) unless Languages::ALL_LANGUAGES.include?language
 
         if Dir[resulting_path].count == 0
-          Helper.log.error("No screenshots found at the given path '#{resulting_path}'") 
+          Helper.log.error("No screenshots found at the given path '#{resulting_path}'")
         else
           self.clear_all_screenshots(language)
-          
+
           Dir[resulting_path].sort.each do |path|
             add_screenshot(language, Deliver::AppScreenshot.new(path))
           end
@@ -318,7 +318,7 @@ module Deliver
       true
     end
 
-    # This method will run through all the available locales, check if there is 
+    # This method will run through all the available locales, check if there is
     # a folder for this language (e.g. 'en-US') and use all screenshots in there
     # @param (String) path A path to the folder, which contains a folder for each locale
     def set_all_screenshots_from_path(path)
@@ -383,7 +383,7 @@ module Deliver
         end
       end
 
-      # @return (Deliver::ItunesTransporter) The iTunesTranspoter which is
+      # @return (Deliver::ItunesTransporter) The iTunesTransporter which is
       #  used to upload/download the app metadata.
       def transporter
         @transporter ||= ItunesTransporter.new
@@ -402,7 +402,7 @@ module Deliver
           locale = fetch_value("//x:locale[@name='#{language}']").first
 
           raise AppMetadataParameterError.new("#{INVALID_LANGUAGE_ERROR} (#{language})") unless Languages::ALL_LANGUAGES.include?language
-          
+
 
           field = locale.search(xpath_name).first
 
@@ -475,7 +475,7 @@ module Deliver
               modified: false
             }
           end
-          
+
           information[language][:keywords] = { value: [], modified: false}
           locale.search('keyword').each do |current|
             information[language][:keywords][:value] << current.content
@@ -485,4 +485,4 @@ module Deliver
         end
       end
   end
-end
+end

data/lib/deliver/app_screenshot.rb

@@ -59,7 +59,7 @@ module Deliver
 
     # Validates the given screenshots (size and format)
     def is_valid?
-      return false unless self.path.split(".").last == "png"
+      return false unless ["png", "PNG", "jpg", "JPG", "jpeg", "JPEG"].include? self.path.split(".").last
 
       size = FastImage.size(self.path)
 

data/lib/deliver/deliver_process.rb

@@ -128,7 +128,7 @@ module Deliver
         matching.each do |key, value|
           if current[key]
             @deploy_information[value] ||= {}
-            @deploy_information[value][language] = current[key]
+            @deploy_information[value][language] ||= current[key]
           end
         end
       end
@@ -226,10 +226,10 @@ module Deliver
       if @deploy_information[:blocks][:error]
         # Custom error handling, we just call this one
         @deploy_information[:blocks][:error].call(ex)
-      else
-        # Re-Raise the exception
-        raise ex
       end
+      
+      # Re-Raise the exception
+      raise ex
     end
 
     private

data/lib/deliver/helper.rb

@@ -6,7 +6,7 @@ module Deliver
     # Logging happens using this method
     def self.log
       if is_test?
-        @@log ||= Logger.new(nil) # don't show any logs when running tests
+        @@log ||= Logger.new(STDOUT) # don't show any logs when running tests
       else
         @@log ||= Logger.new(STDOUT)
       end

data/lib/deliver/itunes_transporter.rb

@@ -5,7 +5,7 @@ require 'deliver/password_manager'
 
 module Deliver
   # The TransporterInputError occurs when you passed wrong inputs to the {Deliver::ItunesTransporter}
-  class TransporterInputError < StandardError 
+  class TransporterInputError < StandardError
   end
   # The TransporterTransferError occurs when some error happens
   # while uploading or downloading something from/to iTC
@@ -13,18 +13,19 @@ module Deliver
   end
 
   class ItunesTransporter
-    ERROR_REGEX = />\s*ERROR:\s+(.+)/  
+    ERROR_REGEX = />\s*ERROR:\s+(.+)/
     WARNING_REGEX = />\s*WARN:\s+(.+)/
     OUTPUT_REGEX = />\s+(.+)/
+    RETURN_VALUE_REGEX = />\sDBG-X:\sReturning\s+(\d+)/
 
-    private_constant :ERROR_REGEX, :WARNING_REGEX, :OUTPUT_REGEX
+    private_constant :ERROR_REGEX, :WARNING_REGEX, :OUTPUT_REGEX, :RETURN_VALUE_REGEX
 
-    # This will be called from the Deliverfile, and disables the logging of the transpoter output
+    # This will be called from the Deliverfile, and disables the logging of the transporter output
     def self.hide_transporter_output
       @@hide_transporter_output = true
     end
-    
-    # Returns a new instance of the iTunesTranspoter.
+
+    # Returns a new instance of the iTunesTransporter.
     # If no username or password given, it will be taken from
     # the #{Deliver::PasswordManager}
     def initialize(user = nil, password = nil)
@@ -73,7 +74,7 @@ module Deliver
       dir += "/#{app.apple_id}.itmsp"
 
       Helper.log.info "Going to upload updated app to iTunesConnect"
-      
+
       command = build_upload_command(@user, @password, dir)
       result = execute_transporter(command)
 
@@ -91,7 +92,7 @@ module Deliver
 
         if defined?@@hide_transporter_output
           # Show a one time message instead
-          Helper.log.info "Waiting for iTunes Connect transpoter to be finished.".green
+          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
         end
@@ -107,37 +108,58 @@ module Deliver
           @errors << ex.to_s
         end
 
-        if @errors.count > 0
-          raise TransporterTransferError.new(@errors.join("\n"))
-        end
-
         if @warnings.count > 0
           Helper.log.warn(@warnings.join("\n"))
         end
 
+        if @errors.count > 0
+          Helper.log.error(@errors.join("\n"))
+        end
+
         true
       end
 
       def parse_line(line)
         # Taken from https://github.com/sshaw/itunes_store_transporter/blob/master/lib/itunes/store/transporter/output_parser.rb
 
+        output_done = false
         if line =~ ERROR_REGEX
           @errors << $1
+          Helper.log.error "[Transporter Error Output]: #{$1}".red
 
           # Check if it's a login error
           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
+          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"
           end
 
+          output_done = true
         elsif line =~ WARNING_REGEX
           @warnings << $1
+          Helper.log.warn "[Transporter Warning Output]: #{$1}".yellow
+          output_done = true
+        end
+
+        if line =~ RETURN_VALUE_REGEX
+          if $1.to_i != 0
+            Helper.log.fatal "Transporter transfer failed.".red
+            Helper.log.warn(@warnings.join("\n").yellow)
+            Helper.log.error(@errors.join("\n").red)
+            raise "Return status of iTunes Transporter was #{$1}: #{@errors.join('\n')}".red
+          else
+            Helper.log.info "iTunes Transporter successfully finished its job".green
+          end
         end
 
         if not defined?@@hide_transporter_output and line =~ OUTPUT_REGEX
           # General logging for debug purposes
-          Helper.log.debug "[Transpoter Output]: #{$1}"
+          unless output_done
+            Helper.log.debug "[Transporter Output]: #{$1}"
+          end
         end
       end
 
@@ -167,4 +189,4 @@ module Deliver
       end
 
   end
-end
+end

data/lib/deliver/version.rb

@@ -1,3 +1,3 @@
 module Deliver
-  VERSION = "0.3.6"
+  VERSION = "0.3.7.beta1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deliver
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7.beta1
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-20 00:00:00.000000000 Z
+date: 2014-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -350,9 +350,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2