deliver 0.9.0.pre2 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbb3cf4785750f0e7da41a6e530de252562c5ebb
-  data.tar.gz: 0c9586db31a2f63b1b747c705f2d041ae443ea5f
+  metadata.gz: e6cf52ea7c54cff537c5076e467d2855dd71b86f
+  data.tar.gz: 66b241359283c9750d4deab05d260b1b9c6713ac
 SHA512:
-  metadata.gz: 9f9fe6e20a9951fd3e4a1485d7fac7472b4bbba87da747deb7a812c1bb522bdda4a234ca74f99b232a34689b080c6abb0d56e25278952233208a5ce9280ca895
-  data.tar.gz: e9cdc4647a9eccea4b9e9f531315c7d069c5d156b094485c43d0ea7a0cfdf54d6be9b643f6eaeafd65133b36f77d5e088ba0c851fdaf664dda49189a7edaf973
+  metadata.gz: f688f771ef3201824dc3f4d0786dfca5232c5c52fa102ac1296958febd8aa5ea7dfe495806ee9a1392d004e7bb7c5ecae3249c82ace132fa259b10c5865ffd9a
+  data.tar.gz: 67a0bb0f6c225a00f59549e6859b534a764e7a71dee4e6d3c56ee557c176e9fff41d71be166bbb71db3f15f775f22409db011231f687e5d7352ce217f966bda1

data/README.md

@@ -116,6 +116,8 @@ You can pass the "What to Test" value using the environment variable `DELIVER_WH
 DELIVER_WHAT_TO_TEST="Try the brand new project button" deliver testflight
 ```
 
+Additional environment variables: `DELIVER_BETA_DESCRIPTION`, `DELIVER_BETA_FEEDBACK_EMAIL`.
+
 # Quick Start
 
 

data/bin/deliver

@@ -18,7 +18,7 @@ class FastlaneApplication
     program :help, 'GitHub', 'https://github.com/krausefx/deliver'
     program :help_formatter, :compact
 
-    global_option '--force', 'Runs a deployment without verifying any information (PDF file). This can be used for build servers.'
+    global_option '-f', '--force', 'Runs a deployment without verifying any information (PDF file). This can be used for build servers.'
     global_option '--beta', 'Upload a beta build to iTunes Connect. This uses the `beta_ipa` block.'
     global_option '--skip-deploy', 'Skips submission of the build on iTunes Connect. This will only upload the ipa and/or metadata.'
 

data/lib/assets/DeliverfileDefault

@@ -9,10 +9,10 @@
 # This part is only relevant, if you want to submit a new binary
 # If you don't use fastlane (https://github.com/KrauseFx/fastlane)
 # you can set the path to your ipa file using:
-# ipa './app.ip'
+# ipa "./app.ipa"
 
 # to provide an ipa file for TestFlight distribution, use beta_ipa 
-# beta_ipa './app.ip'
+# beta_ipa "./app.ipa"
 
 # The version of your app - remove this if you provide an ipa file
 version "[[APP_VERSION]]"

data/lib/assets/DeliverfileExample

@@ -17,10 +17,10 @@
 # This part is only relevant, if you want to submit a new binary
 # If you don't use fastlane (https://github.com/KrauseFx/fastlane)
 # you can set the path to your ipa file using:
-# ipa './app.ip'
+# ipa "./app.ipa"
 
 # to provide an ipa file for TestFlight distribution, use beta_ipa 
-# beta_ipa './app.ip'
+# beta_ipa "./app.ipa"
 
 # The version of your app - remove this if you provide an ipa file
 version "[[APP_VERSION]]"

data/lib/deliver/app.rb

@@ -41,7 +41,14 @@ module Deliver
       elsif app_identifier and not apple_id
         # Fetch the Apple ID based on the given app identifier
         begin
-          self.apple_id = FastlaneCore::ItunesSearchApi.fetch_by_identifier(app_identifier)['trackId']
+          begin
+            self.apple_id = FastlaneCore::ItunesSearchApi.fetch_by_identifier(app_identifier)['trackId']
+          rescue
+            Helper.log.warn "App doesn't seem to be in the App Store yet or is not available in the US App Store. Using the iTC API instead."
+            # Use the iTunes Connect API instead: make that default in the future
+            self.apple_id = FastlaneCore::ItunesConnect.new.find_apple_id(app_identifier)
+            raise "Couldn't find Apple ID" unless self.apple_id
+          end
         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
@@ -126,6 +133,12 @@ module Deliver
       itc.upload_app_icon!(self, path)
     end
 
+    # Uploads a new apple watch app icon to iTunesConnect. This uses a headless browser
+    # which makes this command quite slow.
+    # @param (path) a path to the new apple watch app icon. The image must have the resolution of 1024x1024
+    def upload_apple_watch_app_icon!(path)
+      itc.upload_apple_watch_app_icon!(self, path)
+    end
     #####################################################
     # @!group Destructive/Constructive methods
     #####################################################

data/lib/deliver/app_screenshot.rb

@@ -16,6 +16,8 @@ module Deliver
       IOS_55 = "iOS-5.5-in"
       # iPad
       IOS_IPAD = "iOS-iPad"
+      #  Watch
+      IOS_APPLE_WATCH= "iOS-Apple-Watch"
       # Mac
       MAC = "Mac"
     end
@@ -106,6 +108,9 @@ module Deliver
           [1440, 900],
           [2880, 1800],
           [2560, 1600]
+        ],
+        ScreenSize::IOS_APPLE_WATCH=> [
+          [312, 390]
         ]
       }
 

data/lib/deliver/deliver_process.rb

@@ -288,6 +288,9 @@ module Deliver
 
       # App Icon
       itc.upload_app_icon!(@app, @deploy_information[Deliverer::ValKey::APP_ICON]) if @deploy_information[Deliverer::ValKey::APP_ICON]
+
+      # Apple Watch App Icon
+      itc.upload_apple_watch_app_icon!(@app, @deploy_information[Deliverer::ValKey::APPLE_WATCH_APP_ICON]) if @deploy_information[Deliverer::ValKey::APPLE_WATCH_APP_ICON]
     end
 
     def trigger_ipa_upload

data/lib/deliver/deliverer.rb

@@ -35,7 +35,8 @@ module Deliver
       SUBMIT_FURTHER_INFORMATION = :submit_further_information # export compliance, content rights and advertising identifier
       PRICE_TIER = :price_tier
       APP_ICON = :app_icon
-      
+      APPLE_WATCH_APP_ICON = :apple_watch_app_icon
+
       COPYRIGHT = :copyright
       PRIMARY_CATEGORY = :primary_category
       SECONDARY_CATEGORY = :secondary_category

data/lib/deliver/deliverfile/dsl.rb

@@ -21,7 +21,7 @@ module Deliver
           not_translated = [:ipa, :app_identifier, :apple_id, :screenshots_path, :config_json_folder, 
                             :submit_further_information, :copyright, :primary_category, :secondary_category,
                             :automatic_release, :app_review_information, :ratings_config_path, :price_tier,
-                            :app_icon]
+                            :app_icon, :apple_watch_app_icon]
 
           if allowed.include?(method_sym)
             value = arguments.first

data/lib/deliver/itunes_connect/itunes_connect.rb

@@ -5,6 +5,7 @@ require 'deliver/itunes_connect/itunes_connect_submission'
 require 'deliver/itunes_connect/itunes_connect_reader'
 require 'deliver/itunes_connect/itunes_connect_new_version'
 require 'deliver/itunes_connect/itunes_connect_app_icon'
+require 'deliver/itunes_connect/itunes_connect_apple_watch_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'

data/lib/deliver/itunes_connect/itunes_connect_app_icon.rb

@@ -23,7 +23,7 @@ module Deliver
 
         Helper.log.info "Starting upload of new app icon".green
 
-        evaluate_script("$('.appversionicon > .ios7-style-icon').prev().click()") # delete button
+        evaluate_script("$('.appversionicon:not(.watchIcon) > .ios7-style-icon').prev().click()") # delete button
         evaluate_script("$('[style-class=\"appversionicon rounded\"] [itc-launch-filechooser] + input').attr('id', 'deliverFileUploadInput')") # set div
         evaluate_script("URL = webkitURL; URL.createObjectURL = function(){return 'blob:abc'}"); # shim URL
         page.attach_file("deliverFileUploadInput", path) # add file

data/lib/deliver/itunes_connect/itunes_connect_apple_watch_app_icon.rb

@@ -0,0 +1,42 @@
+require 'fastimage'
+
+module Deliver
+  class ItunesConnect < FastlaneCore::ItunesConnect
+    # Uploading a new full size app icon
+
+    def upload_apple_watch_app_icon!(app, path)
+      path = File.expand_path(path)
+      raise "Could not find watch app icon at path '#{path}'".red unless File.exists?path
+
+      size = FastImage.size(path)
+      raise "Watch App icon must have the resolution of 1024x1024px".red unless (size[0] == 1024 and size[1] == 1024)
+
+      # Remove alpha channel
+      Helper.log.info "Removing alpha channel from provided Watch App Icon (iTunes Connect requirement)".green
+      
+      `sips -s format bmp '#{path}' &> /dev/null ` # &> /dev/null since there is warning because of the extension
+      `sips -s format png '#{path}'`
+
+      begin
+        verify_app(app)
+        open_app_page(app)
+
+        Helper.log.info "Starting upload of new watch app icon".green
+
+        evaluate_script("$('.ico.icon-chevron-animate-open-close.close').click()") # delete button
+        evaluate_script("$('.appversionicon.watchIcon > .ios7-style-icon').prev().click()") # delete button
+        evaluate_script("$('[style-class=\"appversionicon watchIcon rounded\"] [itc-launch-filechooser] + input').attr('id', 'deliverFileUploadInputWatch')") # set div
+        evaluate_script("URL = webkitURL; URL.createObjectURL = function(){return 'blob:abc'}"); # shim URL
+        page.attach_file("deliverFileUploadInputWatch", path) # add file
+
+        sleep 10
+
+        click_on "Save"
+
+        Helper.log.info "Finished uploading the new watch app icon".green
+      rescue => ex
+        error_occured(ex)
+      end
+    end
+  end
+end

data/lib/deliver/itunes_connect/itunes_connect_submission.rb

@@ -40,7 +40,7 @@ module Deliver
             end
 
             # We got the most recent build, let's see if it's ready
-            if current_build['internalState'] == 'inactive' and current_build['readyToInstall'] == true
+            if current_build['readyToInstall'] == true
               Helper.log.info "Build is ready 3.2.1...".green
               break # Success! 
             end

data/lib/deliver/itunes_transporter.rb

@@ -180,7 +180,7 @@ module Deliver
 
       def build_download_command(username, password, apple_id, destination = "/tmp")
         [
-          Helper.transporter_path,
+          '"' + Helper.transporter_path + '"',
           "-m lookupMetadata",
           "-u \"#{username}\"",
           "-p '#{escaped_password(password)}'",
@@ -191,7 +191,7 @@ module Deliver
 
       def build_upload_command(username, password, source = "/tmp")
         [
-          Helper.transporter_path,
+          '"' + Helper.transporter_path + '"',
           "-m upload",
           "-u \"#{username}\"",
           "-p '#{escaped_password(password)}'",

data/lib/deliver/testflight.rb

@@ -11,6 +11,7 @@ module Deliver
       app_identifier = IpaFileAnalyser.fetch_app_identifier(ipa_path)
       app_identifier ||= ENV["TESTFLIGHT_APP_IDENTITIFER"] || ask("Could not automatically find the app identifier, please enter the app's bundle identifier: ")
       app_id ||= (FastlaneCore::ItunesSearchApi.fetch_by_identifier(app_identifier)['trackId'] rescue nil)
+      app_id ||= (FastlaneCore::ItunesConnect.new.find_apple_id(app_identifier) rescue nil)
       app_id ||= ENV["TESTFLIGHT_APPLE_ID"] || ask("Could not automatically find the app ID, please enter it here (e.g. 956814360): ")
       strategy = (skip_deploy ? Deliver::IPA_UPLOAD_STRATEGY_JUST_UPLOAD : Deliver::IPA_UPLOAD_STRATEGY_BETA_BUILD)
 

data/lib/deliver/version.rb

@@ -1,3 +1,3 @@
 module Deliver
-  VERSION = "0.9.0.pre2"
+  VERSION = "0.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deliver
 version: !ruby/object:Gem::Version
-  version: 0.9.0.pre2
+  version: 0.9.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-29 00:00:00.000000000 Z
+date: 2015-04-08 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.2.0
+        version: 0.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.4.3
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -241,6 +241,7 @@ files:
 - lib/deliver/itunes_connect/itunes_connect_additional.rb
 - lib/deliver/itunes_connect/itunes_connect_app_icon.rb
 - lib/deliver/itunes_connect/itunes_connect_app_rating.rb
+- lib/deliver/itunes_connect/itunes_connect_apple_watch_app_icon.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
@@ -265,9 +266,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: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2