deliver 0.7.12 → 0.7.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41e57184b3f01ed38542f66b736cbafcc8b9f770
-  data.tar.gz: 378b63355d1a174c0b21764e210c3affb7ef867a
+  metadata.gz: 0add76bf74f163777d037b134df460f0302c05e7
+  data.tar.gz: 9faf0e247f17458e9e621a624e8954d66138cb46
 SHA512:
-  metadata.gz: 03117ffc1fb7543550a793b9b4020c6346aeb1907da4b1a01faf531e892f0951a9e461be7b54287d683b51d3dd976567c7c5d43c8fe379023d8996311fa704df
-  data.tar.gz: f0a92bf67b934e81ff34c456c4c28c3f4b92be7b44044b2bbd6079cb465f001bf4d970e30b927c96f0c3ced975b23bde10c3458792a9978cb31bc78d8fc20de0
+  metadata.gz: 9acc3f5094509eb5d922ffb9ef23c0669509b7f048f44fba5a77b52d4fd33fe1b0f178b8116ad00435c8990fa8fbf3b9db54142a0c901e95fca2d52ed89229ab
+  data.tar.gz: 1d02d552eca8085f8e02b92715f86d663912fa065c1853548a0a4b9549dc71fd406fcc365a20ab91e51c6516974e66af85c733a40aee89fcc83a2476ea5202f8

data/README.md

@@ -50,7 +50,7 @@ Get in contact with the developer on Twitter: [@KrauseFx](https://twitter.com/Kr
 
 -------
 
-<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>
+<h5 align="center"><code>deliver</code> is part of <a href="https://fastlane.tools">fastlane</a>: connect all deployment tools into one streamlined workflow.</h5>
 
 # Features
 - Upload hundreds of screenshots with different languages from different devices
@@ -314,9 +314,9 @@ Before actually uploading anything to iTunes, ```Deliver``` will generate a [PDF
 
 # Tips
 
-## [`fastlane`](http://fastlane.tools) Toolchain
+## [`fastlane`](https://fastlane.tools) Toolchain
 
-- [`fastlane`](http://fastlane.tools): Connect all deployment tools into one streamlined workflow
+- [`fastlane`](https://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

data/bin/deliver

@@ -14,7 +14,7 @@ class FastlaneApplication
     program :version, Deliver::VERSION
     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://fastlane.tools'
+    program :help, 'Website', 'https://fastlane.tools'
     program :help, 'GitHub', 'https://github.com/krausefx/deliver'
     program :help_formatter, :compact
 

data/lib/deliver/app_metadata.rb

@@ -111,7 +111,7 @@ module Deliver
       title.content = default_title
       new_locale << title
 
-      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("Successfully created the new locale '#{language}'. The default title '#{default_title}' was set.")
       Helper.log.info("You can update the title using 'app.metadata.update_title'")
 
       information[language] ||= {}

data/lib/deliver/app_screenshot.rb

@@ -16,6 +16,8 @@ module Deliver
       IOS_55 = "iOS-5.5-in"
       # iPad
       IOS_IPAD = "iOS-iPad"
+      # Mac
+      MAC = "Mac"
     end
 
     # @return [Deliver::ScreenSize] the screen size (device type)
@@ -98,6 +100,12 @@ module Deliver
           [768, 1024],
           [1536, 2008],
           [1536, 2048]
+        ],
+        ScreenSize::MAC => [
+          [1280, 800],
+          [1440, 900],
+          [2880, 1800],
+          [2560, 1600]
         ]
       }
 
@@ -110,8 +118,7 @@ module Deliver
         end
       end
 
-      error = "Unsupported screen size #{size} for path '#{path}'"
-      raise error
+      raise "Unsupported screen size #{size} for path '#{path}'".red
     end
   end
 

data/lib/deliver/deliver_process.rb

@@ -132,10 +132,10 @@ module Deliver
     end
 
     def verify_app_on_itunesconnect
-      if @ipa and is_release_build?
+      if (@ipa and is_release_build?) or !@ipa
         # This is a real release, which should also upload the ipa file onto production
         @app.create_new_version!(@app_version) unless Helper.is_test?
-        @app.metadata.verify_version(@app_version)
+        @app.metadata.verify_version(@app_version) if @ipa
       end
     end
 

data/lib/deliver/itunes_connect/itunes_connect.rb

@@ -7,8 +7,4 @@ 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
-end
+require 'deliver/itunes_connect/itunes_connect_screenshot_fetcher'

data/lib/deliver/itunes_connect/itunes_connect_additional.rb

@@ -1,5 +1,5 @@
-module FastlaneCore  
-  class ItunesConnect
+module Deliver
+  class ItunesConnect < FastlaneCore::ItunesConnect
     # This file sets additional information like copyright and age rating
 
     def set_copyright!(app, text)

data/lib/deliver/itunes_connect/itunes_connect_app_icon.rb

@@ -1,7 +1,7 @@
 require 'fastimage'
 
-module FastlaneCore  
-  class ItunesConnect
+module Deliver
+  class ItunesConnect < FastlaneCore::ItunesConnect
     # Uploading a new full size app icon
 
     def upload_app_icon!(app, path)

data/lib/deliver/itunes_connect/itunes_connect_app_rating.rb

@@ -1,7 +1,7 @@
 require 'json'
 
-module FastlaneCore  
-  class ItunesConnect
+module Deliver
+  class ItunesConnect < FastlaneCore::ItunesConnect
     # Setting the app's age restrictions
 
     def set_app_rating!(app, path_to_json)
@@ -19,12 +19,11 @@ module FastlaneCore
 
       rows = wait_for_elements(".defaultTable.ratingsTable > tbody > tr.ng-scope") # .ng-scope, since there is one empty row
 
-      if rows.count != config.count
-        raise "The number of options passed in the config file does not match the number of options available on iTC!".red
+      if rows.count != (config.count - 1) # -1 the kids
+        raise "The number of options passed in the config file does not match the number of options available on iTC! Make sure to use the latest template from https://github.com/KrauseFx/deliver/blob/master/assets/example_rating_config.json".red
       end
 
 
-
       # Setting all the values based on config file
       rows.each_with_index do |row, index|
         current = config[index]
@@ -38,6 +37,25 @@ module FastlaneCore
         row.first("td > div[radio-value='#{radio_value}']").click
       end
 
+
+      # Apple, doing some extra thingy for the kids section
+      val = config.last['level'].to_i
+      Helper.log.info "Setting kids mode to #{val}".green
+      currently_enabled = (all("div[itc-checkbox='tempPageContent.ratingDialog.madeForKidsChecked'] > * > input").last.value != "")
+      if val > 0
+        if not currently_enabled
+          all("div[itc-checkbox='tempPageContent.ratingDialog.madeForKidsChecked'] > * > a").last.click
+        end
+
+        # Kids is enabled, check mode
+        first("select[ng-model='tempRatings.ageBand'] > option[value='#{val - 1}']").select_option # -1 since 0 is no kids mode
+      else
+        if currently_enabled
+          # disable kids mode
+          all("div[itc-checkbox='tempPageContent.ratingDialog.madeForKidsChecked'] > * > a").last.click
+        end
+      end
+
       # Check if there is a warning or error message because of this rating
       error_message = first("p[ng-show='tempPageContent.ratingDialog.showErrorMessage']")
       Helper.log.error error_message.text if error_message

data/lib/deliver/itunes_connect/itunes_connect_new_version.rb

@@ -1,5 +1,5 @@
-module FastlaneCore  
-  class ItunesConnect
+module Deliver
+  class ItunesConnect < FastlaneCore::ItunesConnect
     # This method creates a new version of your app using the
     # iTunesConnect frontend. This will happen directly after calling
     # this method. 

data/lib/deliver/itunes_connect/itunes_connect_reader.rb

@@ -1,6 +1,6 @@
-module FastlaneCore  
+module Deliver
   # For all the information reading (e.g. version number)
-  class ItunesConnect
+  class ItunesConnect < FastlaneCore::ItunesConnect
     # This method will fetch the current status ({Deliver::App::AppStatus})
     # of your app and return it. This method uses a headless browser
     # under the hood, so it might take some time until you get the result

data/lib/deliver/itunes_connect/itunes_connect_screenshot_fetcher.rb

@@ -1,8 +1,8 @@
 require 'open-uri'
 
-module FastlaneCore  
+module Deliver
   # For all the information reading (e.g. version number)
-  class ItunesConnect
+  class ItunesConnect < FastlaneCore::ItunesConnect
     ALL_INFORMATION_URL = "https://itunesconnect.apple.com/WebObjects/iTunesConnect.woa/ra/apps/version/"
 
     # This method will download all existing app screenshots

data/lib/deliver/itunes_connect/itunes_connect_submission.rb

@@ -1,6 +1,6 @@
-module FastlaneCore
+module Deliver
   # Everything related to submitting the app
-  class ItunesConnect
+  class ItunesConnect < FastlaneCore::ItunesConnect
     BUTTON_ADD_NEW_BUILD = 'Click + to add a build before you submit your app.'
     
     # This will put the latest uploaded build as a new beta build

data/lib/deliver/itunes_transporter.rb

@@ -186,9 +186,9 @@ module Deliver
           "-u \"#{username}\"",
           "-p '#{escaped_password(password)}'",
           "-f '#{source}'",
+          ENV["DELIVER_ITMSTRANSPORTER_ADDITIONAL_UPLOAD_PARAMETERS"], # that's here, because the user might overwrite the -t option
           "-t 'Signiant'",
-          "-k 100000",
-          ENV["DELIVER_ITMSTRANSPORTER_ADDITIONAL_UPLOAD_PARAMETERS"]
+          "-k 100000"
         ].join(' ')
       end
 

data/lib/deliver/version.rb

@@ -1,3 +1,3 @@
 module Deliver
-  VERSION = "0.7.12"
+  VERSION = "0.7.13"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deliver
 version: !ruby/object:Gem::Version
-  version: 0.7.12
+  version: 0.7.13
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-26 00:00:00.000000000 Z
+date: 2015-03-06 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.1.4
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -236,7 +236,7 @@ files:
 - lib/deliver/pdf_generator.rb
 - lib/deliver/testflight.rb
 - lib/deliver/version.rb
-homepage: http://fastlane.tools
+homepage: https://fastlane.tools
 licenses:
 - MIT
 metadata: {}