deliver 0.7.10 → 0.7.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 945773ee223c9e92da550da88cb48c5c7e4ae892
-  data.tar.gz: 2916e3bab546cba726de17b9f0c16ef0f950096f
+  metadata.gz: ae2a7efba86742205dd2fc3e8da2190613b359f1
+  data.tar.gz: f8c901ab211e04c82a6c891487c1e4b85ca7926f
 SHA512:
-  metadata.gz: bfe66033b9b3da8127c2b5b6e0be30c7865550b0abdaf8abf8662663b7555d41f37cc103ae51500e032f553b00be67ce0f2d27f5d432d5057d8d13870e7f4b91
-  data.tar.gz: 54d4f2f0ef25b1e8ce95755ce42bc230bef70f53be5396f643b5d18902fa6cd1a730bfbf7985e68a2036fd426f52d999cab119b622cfe80f1361ba82fcba4498
+  metadata.gz: 88989c941b95a4cf84cdd765c78c97449a8a71c2bc553d0fd24f937fc162aaaece7615766f67f340bb42b7de85cd2f88fd5363c26993d67b6fd4d8acbb45b196
+  data.tar.gz: 568c867e81a72391635f553636e797c3ff691c5953cf6861aa13d80026ca2354a963f1c8eed1bbd73913bcad6378557927a8c1d4a3ca596395958c7ba0108b2d

data/README.md

@@ -11,7 +11,9 @@
   <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> &bull; 
-  <a href="https://github.com/KrauseFx/produce">produce</a>
+  <a href="https://github.com/KrauseFx/produce">produce</a> &bull; 
+  <a href="https://github.com/KrauseFx/cert">cert</a> &bull; 
+  <a href="https://github.com/KrauseFx/codes">codes</a>
 </p>
 -------
 
@@ -60,6 +62,8 @@ Get in contact with the developer on Twitter: [@KrauseFx](https://twitter.com/Kr
 - Automatically create new screenshots with [Snapshot](https://github.com/KrauseFx/snapshot)
 - Upload new builds to the new Apple TestFlight
 
+##### [Like this tool? Be the first to know about updates and new fastlane tools](https://tinyletter.com/krausefx)
+
 # Installation
 
 Install the gem
@@ -125,8 +129,6 @@ The guide will create all the necessary files for you, using the existing app me
  - Enjoy a good drink, while the computer does all the work for you
 - When it's a new app: ```n```
 
-Copy your screenshots into the ```deliver/screenshots/[language]``` folders (see [Available language codes](#available-language-codes))
-
 From now on, you can run ```deliver``` to deploy a new update, or just upload new app metadata and screenshots.
 
 ### Customize the ```Deliverfile```
@@ -287,7 +289,7 @@ app.metadata.set_all_screenshots_from_path("./screenshots")
 app.upload_metadata!
 app.itc.submit_for_review!(app)
 
-Deliver::ItunesSearchApi.fetch_by_identifier("net.sunapps.15") # => Fetches public metadata
+FastlaneCore::ItunesSearchApi.fetch_by_identifier("net.sunapps.15") # => Fetches public metadata
 ```
 This project is well documented, check it out on [Rubydoc](http://www.rubydoc.info/github/KrauseFx/deliver/frames).
 
@@ -320,6 +322,10 @@ Before actually uploading anything to iTunes, ```Deliver``` will generate a [PDF
 - [`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
 - [`produce`](https://github.com/KrauseFx/produce): Create new iOS apps on iTunes Connect and Dev Portal using the command line
+- [`cert`](https://github.com/KrauseFx/cert): Automatically create and maintain iOS code signing certificates
+- [`codes`](https://github.com/KrauseFx/codes): Create promo codes for iOS Apps using the command line
+
+##### [Like this tool? Be the first to know about updates and new fastlane tools](https://tinyletter.com/krausefx)
 
 ## Available language codes
 ```ruby

data/lib/assets/DeliverLanguageMapping.json

@@ -0,0 +1,167 @@
+[
+ {
+  "locale": "cmn-Hans",
+  "name": "Simplified Chinese",
+  "game-center": true
+
+  },
+  {
+  "locale": "cmn-Hant",
+  "name": "Traditional Chinese",
+  "game-center": true
+  },
+  {
+  "locale": "da-DK",
+  "name": "Danish",
+  "game-center": true,
+  "alternatives": ["da"]
+  },
+  {
+  "locale": "nl-NL",
+  "name": "Dutch",
+ "game-center": true,
+ "alternatives": ["nl"]
+  },
+  {
+  "locale": "en-AU",
+  "name": "Australian English",
+  "game-center": false,
+  "readable-alternatives": ["English_Australian"]
+  },
+  {
+  "locale": "en-CA",
+  "name": "Canadian English",
+  "game-center": false,
+  "readable-alternatives": ["English_CA"]
+  },
+  {
+  "locale": "en-GB",
+  "name": "UK English",
+  "game-center": true,
+  "readable-alternatives": ["English_UK"]
+  },
+  {
+  "locale": "en-US",
+  "name": "English",
+  "game-center": true
+  },
+  {
+  "locale": "fi-FI",
+  "name": "Finnish",
+  "game-center": true,
+  "alternatives": ["fi"]
+  },
+  {
+  "locale": "fr-CA",
+  "name": "Canadian French",
+  "game-center": false,
+  "readable-alternatives": ["French_CA"]
+  },
+  {
+  "locale": "fr-FR",
+  "name": "French",
+ "game-center": true,
+ "alternatives": ["fr"]
+  },
+  {
+  "locale": "de-DE",
+  "name": "German",
+  "game-center": true,
+  "alternatives": ["de"]
+  },
+  {
+  "locale": "el-GR",
+  "name": "Greek",
+ "game-center": true,
+ "alternatives": ["el"]
+  },
+  {
+  "locale": "id-ID",
+  "name": "Indonesian",
+ "game-center": true,
+ "alternatives": ["id"]
+  },
+  {
+  "locale": "it-IT",
+  "name": "Italian",
+ "game-center": true,
+ "alternatives": ["it"]
+  },
+  {
+  "locale": "ja-JP",
+  "name": "Japanese",
+ "game-center": true,
+ "alternatives": ["ja"]
+  },
+  {
+  "locale": "ko-KR",
+  "name": "Korean",
+ "game-center": true,
+ "alternatives": ["ko"]
+  },
+  {
+  "locale": "ms-MY",
+  "name": "Malay",
+ "game-center": true,
+ "alternatives": ["ms"]
+  },
+  {
+  "locale": "no-NO",
+  "name": "Norwegian",
+ "game-center": true,
+ "alternatives": ["no"]
+  },
+  {
+  "locale": "pt-BR",
+  "name": "Brazilian Portuguese",
+  "game-center": true
+  },
+  {
+  "locale": "pt-PT",
+  "name": "Portuguese",
+  "game-center": true,
+ "alternatives": ["pt"]
+  },
+  {
+  "locale": "ru-RU",
+  "name": "Russian",
+ "game-center": true,
+ "alternatives": ["ru"]
+  },
+  {
+  "locale": "es-MX",
+  "name": "Mexican Spanish",
+  "game-center": false,
+  "readable-alternatives": ["Spanish_MX"]
+  },
+  {
+  "locale": "es-ES",
+  "name": "Spanish",
+  "game-center": true,
+  "alternatives": ["es"]
+  },
+  {
+  "locale": "sv-SE",
+  "name": "Swedish",
+ "game-center": true,
+ "alternatives": ["sv"]
+  },
+  {
+  "locale": "th-TH",
+  "name": "Thai",
+ "game-center": true,
+ "alternatives": ["th"]
+  },
+  {
+  "locale": "tr-TR",
+  "name": "Turkish",
+ "game-center": true,
+ "alternatives": ["tr"]
+  },
+  {
+  "locale": "vi-VI",
+  "name" : "Vietnamese",
+ "game-center": true,
+ "alternatives": ["vi"]
+  }
+  ]

data/lib/assets/DeliverfileDefault

@@ -12,7 +12,7 @@
 # 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/"
+screenshots_path "./screenshots/"
 
 
 # version '1.2' # you can pass this if you want to verify the version number with the ipa file

data/lib/deliver.rb

@@ -5,7 +5,6 @@ require 'deliver/app_metadata'
 require 'deliver/metadata_item'
 require 'deliver/app_screenshot'
 require 'deliver/itunes_connect/itunes_connect'
-require 'deliver/itunes_search_api'
 require 'deliver/itunes_transporter'
 require 'deliver/deliverfile/deliverfile'
 require 'deliver/deliverfile/deliverfile_creator'

data/lib/deliver/app.rb

@@ -37,11 +37,11 @@ module Deliver
       
       if apple_id and not app_identifier
         # Fetch the app identifier based on the given Apple ID
-        self.app_identifier = Deliver::ItunesSearchApi.fetch_bundle_identifier(apple_id)
+        self.app_identifier = FastlaneCore::ItunesSearchApi.fetch_bundle_identifier(apple_id)
       elsif app_identifier and not apple_id
         # Fetch the Apple ID based on the given app identifier
         begin
-          self.apple_id = Deliver::ItunesSearchApi.fetch_by_identifier(app_identifier)['trackId']
+          self.apple_id = FastlaneCore::ItunesSearchApi.fetch_by_identifier(app_identifier)['trackId']
         rescue
           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

data/lib/deliver/deliverfile/deliverfile_creator.rb

@@ -1,5 +1,6 @@
 require 'credentials_manager/password_manager'
 require 'credentials_manager/appfile_config'
+require 'deliver/itunes_connect/itunes_connect'
 
 module Deliver
   # Helps new user quickly adopt Deliver
@@ -45,8 +46,6 @@ module Deliver
       example.gsub!("[[APP_NAME]]", project_name)
       File.write(path, example)
 
-      FileUtils.mkdir_p './screenshots/'
-
       puts "Successfully created new Deliverfile at '#{path}'".green
     end
 
@@ -62,16 +61,28 @@ module Deliver
       file_path = [deliver_path, Deliver::Deliverfile::Deliverfile::FILE_NAME].join('/')
       json = generate_deliver_file(app, deliver_path, project_name)
       File.write(file_path, json)
+
+      FileUtils.mkdir_p './screenshots/'
+      begin
+        Helper.log.info "Downloading all previously used app screenshots.".green
+        ItunesConnect.new.download_existing_screenshots(app)
+      rescue
+        Helper.log.error "Couldn't download already existing screenshots from iTunesConnect. You have to add them manually!".red
+      end
+
+      # Add a README to the screenshots folder
+      FileUtils.mkdir_p File.join(deliver_path, 'screenshots') # just in case the fetching didn't work
+      File.write(File.join(deliver_path, 'screenshots', 'README.txt'), File.read("#{Helper.gem_path('deliver')}/lib/assets/ScreenshotsHelp"))
       
-      puts "Successfully created new Deliverfile at '#{file_path}'".green
+      Helper.log.info "Successfully created new Deliverfile at '#{file_path}'".green
     end
 
     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)
-        metadata_path = "#{path}/deliver/"
-        FileUtils.mkdir_p metadata_path
+        metadata_path = File.join(path, 'deliver')
+        FileUtils.mkdir_p metadata_path rescue nil # never mind if it's already there
 
         json = create_json_based_on_xml(app, metadata_path)
 
@@ -79,15 +90,12 @@ module Deliver
           json[key].delete(:version_whats_new)
         end
         
-        meta_path = "#{metadata_path}metadata.json"
+        meta_path = File.join(metadata_path, "metadata.json")
         File.write(meta_path, JSON.pretty_generate(json))
         puts "Successfully created new metadata JSON file at '#{meta_path}'".green
 
         gem_path = Helper.gem_path('deliver')
 
-        # Add a README to the screenshots folder
-        File.write("#{metadata_path}screenshots/README.txt", File.read("#{gem_path}/lib/assets/ScreenshotsHelp"))
-
         # Generate the final Deliverfile here
         deliver = File.read("#{gem_path}/lib/assets/DeliverfileDefault")
         deliver.gsub!("[[APP_IDENTIFIER]]", app.app_identifier)
@@ -112,9 +120,6 @@ module Deliver
           end
 
           json[locale] = current
-
-          # Create an empty folder for the screenshots too
-          FileUtils.mkdir_p "#{path}screenshots/#{locale}/"
         end
 
         return json

data/lib/deliver/itunes_connect/itunes_connect.rb

@@ -7,6 +7,7 @@ require 'deliver/itunes_connect/itunes_connect_new_version'
 require 'deliver/itunes_connect/itunes_connect_app_icon'
 require 'deliver/itunes_connect/itunes_connect_app_rating'
 require 'deliver/itunes_connect/itunes_connect_additional'
+require 'deliver/itunes_connect/itunes_connect_screenshot_fetcher'
 
 module Deliver
   ItunesConnect = FastlaneCore::ItunesConnect

data/lib/deliver/itunes_connect/itunes_connect_screenshot_fetcher.rb

@@ -0,0 +1,55 @@
+require 'open-uri'
+
+module FastlaneCore  
+  # For all the information reading (e.g. version number)
+  class ItunesConnect
+    ALL_INFORMATION_URL = "https://itunesconnect.apple.com/WebObjects/iTunesConnect.woa/ra/apps/version/"
+
+    # This method will download all existing app screenshots
+    # @param app (Deliver::App) the app you want this information from
+    # @raise [ItunesConnectGeneralError] General error while executing 
+    #  this action
+    # @raise [ItunesConnectLoginError] Login data is wrong
+    def download_existing_screenshots(app)
+      languages = JSON.parse(File.read(File.join(Helper.gem_path('deliver'), "lib", "assets", "DeliverLanguageMapping.json")))
+
+      begin
+        verify_app(app)
+
+        url = ALL_INFORMATION_URL + app.apple_id.to_s
+
+        # Turn off/on the async mode of jQuery
+        evaluate_script("jQuery.ajaxSetup({async:false});")
+        response = evaluate_script("$.get('#{url}').responseText")
+        evaluate_script("jQuery.ajaxSetup({async:true});")
+
+        raise "Could not fetch previously uploaded screenshots" unless response
+
+        data = JSON.parse(response)
+        screenshots = data['data']['details']['value'].each do |language_values|
+          language_code = languages.find { |a| a['name'] == language_values['language'] }
+          unless language_code
+            Helper.log.error "Could not find language information for language #{language_values['language']}".red
+            next
+          end
+          language_code = language_code['locale']
+
+          language_values['screenshots']['value'].each do |type, value|
+            value['value'].each do |screenshot|
+              url = screenshot['value']['url']
+              file_name = [screenshot['value']['sortOrder'], type, screenshot['value']['originalFileName']].join("_")
+              Helper.log.info "Downloading existing screenshot '#{file_name}' of device type: '#{type}'"
+
+              containing_folder = File.join(".", "screenshots", language_code)
+              FileUtils.mkdir_p containing_folder rescue nil # if it's already there
+              path = File.join(containing_folder, file_name)
+              File.write(path, open(url).read)
+            end
+          end
+        end
+      rescue Exception => ex
+        error_occured(ex)
+      end
+    end
+  end
+end

data/lib/deliver/version.rb

@@ -1,3 +1,3 @@
 module Deliver
-  VERSION = "0.7.10"
+  VERSION = "0.7.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deliver
 version: !ruby/object:Gem::Version
-  version: 0.7.10
+  version: 0.7.11
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-18 00:00:00.000000000 Z
+date: 2015-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane_core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.4
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -204,6 +204,7 @@ files:
 - LICENSE
 - README.md
 - bin/deliver
+- lib/assets/DeliverLanguageMapping.json
 - lib/assets/DeliverfileDefault
 - lib/assets/DeliverfileExample
 - lib/assets/ScreenshotsHelp
@@ -228,8 +229,8 @@ files:
 - lib/deliver/itunes_connect/itunes_connect_app_rating.rb
 - lib/deliver/itunes_connect/itunes_connect_new_version.rb
 - lib/deliver/itunes_connect/itunes_connect_reader.rb
+- lib/deliver/itunes_connect/itunes_connect_screenshot_fetcher.rb
 - lib/deliver/itunes_connect/itunes_connect_submission.rb
-- lib/deliver/itunes_search_api.rb
 - lib/deliver/itunes_transporter.rb
 - lib/deliver/metadata_item.rb
 - lib/deliver/pdf_generator.rb

data/lib/deliver/itunes_search_api.rb

@@ -1,48 +0,0 @@
-require 'open-uri'
-
-module Deliver
-  # A wrapper around the Apple iTunes Search API to access app information like
-  # the app identifier of an app.
-  class ItunesSearchApi
-
-    # Fetch all information you can get from a specific AppleID of an app
-    # @param id (int) The AppleID of the given app. This usually consists of 9 digits.
-    # @return (Hash) the response of the first result from Apple (https://itunes.apple.com/lookup?id=284882215)
-    # @example Response of Facebook App: https://itunes.apple.com/lookup?id=284882215
-    #  { 
-    #   ...
-    #   artistName: "Facebook, Inc.",
-    #   price: 0,
-    #   version: "14.9",
-    #   ...
-    #  }
-    def self.fetch(id)
-      # Example: https://itunes.apple.com/lookup?id=284882215
-      fetch_url("https://itunes.apple.com/lookup?id=#{id.to_s}")
-    end
-
-    def self.fetch_by_identifier(app_identifier)
-      # Example: http://itunes.apple.com/lookup?bundleId=net.sunapps.1
-      fetch_url("https://itunes.apple.com/lookup?bundleId=#{app_identifier}")
-    end
-      
-
-    # This method only fetches the bundle identifier of a given app
-    # @param id (int) The AppleID of the given app. This usually consists of 9 digits.
-    # @return (String) the Bundle identifier of the app
-    def self.fetch_bundle_identifier(id)
-      self.fetch(id)['bundleId']
-    end
-
-    private
-      def self.fetch_url(url)
-        response = JSON.parse(open(url).read)
-        return nil if response['resultCount'] == 0
-
-        return response['results'].first
-      rescue
-        Helper.log.error "Could not find object '#{url}' using the iTunes API"
-        nil
-      end
-  end
-end