deliver 1.9.0 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 284dfba9874963053b4414c5498105fc0cfbb62c
-  data.tar.gz: 9d74f3004f8b57ed39f7a8dfe2fd2895ee8bcf9f
+  metadata.gz: 85b232e72ca3d072534da39681bd5f123cf56e62
+  data.tar.gz: 72f32e4ebc39f9d7307b321eebb9316510947f5f
 SHA512:
-  metadata.gz: 526d62c841ba5bcb1905507a20bf1a9e56e545533aac5789a479d7c7a0f34c59b17f367cd255b18c6ec8a7da8797f6eeebb65bdb99ace987eb08a90c0ab08b33
-  data.tar.gz: 537d93aeb93e02781db539b9e55fef5ec94137350270d45fdc9244a502c5bc8486f1f2d9ccec2970e2ecdd3b512816c1990c6182d67c81b402cca789dc6230c5
+  metadata.gz: 1e2c105d24aabc6d9d26da5864136928af30501d41a4866bf99266a05fa11f296d3b39e71da9d44755051316af6299a9b1a1d8c03b9c4bdfb8b5790d1fd40c77
+  data.tar.gz: 6d62b64ea08247a6f49b2cefd814b58001da85c4e1d8e439e0b4724c7079123481f12e9e08a1f462f7761280d783457405d0dde246a1380c01800c74052a8202

data/README.md

@@ -132,6 +132,13 @@ To get a list of available options run
 deliver --help
 ```
 
+
+Select a previously uploaded build and submit it for review.
+
+```
+deliver submit_build --build_number 830
+```
+
 Check out [Deliverfile.md](https://github.com/fastlane/deliver/blob/master/Deliverfile.md) for more options.
 
 Already using `deliver` and just updated to 1.0? Check out the [Migration Guide](https://github.com/fastlane/deliver/blob/master/MigrationGuide.md).
@@ -176,6 +183,51 @@ Before actually uploading anything to iTunes, ```deliver``` will generate a HTML
 no, en-US, en-CA, fi, ru, zh-Hans, nl-NL, zh-Hant, en-AU, id, de-DE, sv, ko, ms, pt-BR, el, es-ES, it, fr-CA, es-MX, pt-PT, vi, th, ja, fr-FR, da, tr, en-GB
 ```
 
+## Default values
+
+Deliver has a special `default` language code which allows you to provide values that are not localised, and which will be used as defaults when you don’t provide a specific localised value.
+
+You can use this either in json within your deliverfile, or as a folder in your metadata file.
+
+Imagine that you have localised data for the following language codes:  ```en-US, de-DE, el, it```
+
+You can set the following in your deliverfile
+
+```
+release_notes({
+  'default' => "Shiny and new”,
+  'de-DE' => "glänzend und neu"
+})
+```
+
+Deliver will use "Shiny and new" for en-US, el and it.
+
+It will use "glänzend und neu" for de-DE.
+
+You can do the same with folders
+
+```
+   default
+      keywords.txt     
+      marketing_url.txt
+      name.txt
+      privacy_url.txt
+      support_url.txt
+      release_notes.txt
+   en-US
+      description.txt
+   de-DE
+      description.txt
+   el
+      description.txt
+   it
+      description.txt
+```
+
+In this case, default values for keywords, urls, name and release notes are used in all localisations, but each language has a fully localised description
+
+
+
 ## Automatically create screenshots
 
 If you want to integrate `deliver` with [snapshot](https://github.com/fastlane/snapshot), check out [fastlane](https://fastlane.tools)!

data/lib/deliver/app_screenshot.rb

@@ -44,7 +44,7 @@ module Deliver
 
       self.screen_size = screen_size
 
-      Helper.log.error "Looks like the screenshot given (#{path}) does not match the requirements of #{screen_size}" unless self.is_valid?
+      UI.error("Looks like the screenshot given (#{path}) does not match the requirements of #{screen_size}") unless self.is_valid?
     end
 
     # The iTC API requires a different notation for the device
@@ -139,7 +139,7 @@ module Deliver
     def self.calculate_screen_size(path)
       size = FastImage.size(path)
 
-      raise "Could not find or parse file at path '#{path}'" if size.nil? or size.count == 0
+      UI.user_error!("Could not find or parse file at path '#{path}'") if size.nil? or size.count == 0
 
       # Walk up two directories and test if we need to handle a platform that doesn't support landscape
       path_component = Pathname.new(path).each_filename.to_a[-3]
@@ -162,7 +162,7 @@ module Deliver
         end
       end
 
-      raise "Unsupported screen size #{size} for path '#{path}'".red
+      UI.user_error!("Unsupported screen size #{size} for path '#{path}'")
     end
   end
 

data/lib/deliver/commands_generator.rb

@@ -6,7 +6,6 @@ HighLine.track_eof = false
 module Deliver
   class CommandsGenerator
     include Commander::Methods
-    UI = FastlaneCore::UI
 
     def self.start
       FastlaneCore::UpdateChecker.start_looking_for_update('deliver')
@@ -39,7 +38,7 @@ module Deliver
           loaded = options.load_configuration_file("Deliverfile")
           loaded = true if options[:description] || options[:ipa] || options[:pkg] # do we have *anything* here?
           unless loaded
-            if agree("No deliver configuration found in the current directory. Do you want to setup deliver? (y/n)".yellow, true)
+            if UI.confirm("No deliver configuration found in the current directory. Do you want to setup deliver?")
               require 'deliver/setup'
               Deliver::Runner.new(options) # to login...
               Deliver::Setup.new.run(options)
@@ -50,13 +49,23 @@ module Deliver
           Deliver::Runner.new(options).run
         end
       end
-
+      command :submit_build do |c|
+        c.syntax = 'deliver submit_build'
+        c.description = 'Submit a specific build-nr for review, use latest for the latest build'
+        c.action do |args, options|
+          options = FastlaneCore::Configuration.create(Deliver::Options.available_options, options.__hash__)
+          options.load_configuration_file("Deliverfile")
+          options[:submit_for_review] = true
+          options[:build_number] = "latest" unless options[:build_number]
+          Deliver::Runner.new(options).run
+        end
+      end
       command :init do |c|
         c.syntax = 'deliver init'
         c.description = 'Create the initial `deliver` configuration based on an existing app'
         c.action do |args, options|
           if File.exist?("Deliverfile") or File.exist?("fastlane/Deliverfile")
-            Helper.log.info "You already got a running deliver setup in this directory".yellow
+            Ui.important("You already got a running deliver setup in this directory")
             return 0
           end
 
@@ -88,7 +97,7 @@ module Deliver
           options = FastlaneCore::Configuration.create(Deliver::Options.available_options, options.__hash__)
           options.load_configuration_file("Deliverfile")
           Deliver::Runner.new(options) # to login...
-          path = (FastlaneCore::Helper.fastlane_enabled? ? './fastlane' : '.')
+          path = options[:screenshots_path] || (FastlaneCore::Helper.fastlane_enabled? ? './fastlane' : '.')
           Deliver::DownloadScreenshots.run(options, path)
         end
       end
@@ -101,9 +110,9 @@ module Deliver
           options = FastlaneCore::Configuration.create(Deliver::Options.available_options, options.__hash__)
           options.load_configuration_file("Deliverfile")
           Deliver::Runner.new(options) # to login...
-          path = (FastlaneCore::Helper.fastlane_enabled? ? './fastlane' : '.')
+          path = options[:metadata_path] || (FastlaneCore::Helper.fastlane_enabled? ? './fastlane' : '.')
           res = ENV["DELIVER_FORCE_OVERWRITE"]
-          res ||= agree("Do you want to overwrite existing metadata on path '#{File.expand_path(path)}/metadata'? (y/n)", true)
+          res ||= UI.confirm("Do you want to overwrite existing metadata on path '#{File.expand_path(path)}/metadata'?")
           if res
             require 'deliver/setup'
             v = options[:app].latest_version

data/lib/deliver/detect_values.rb

@@ -17,7 +17,7 @@ module Deliver
       end
 
       options[:app_identifier] = identifier if identifier.to_s.length > 0
-      options[:app_identifier] ||= ask("The Bundle Identifier of your App: ")
+      options[:app_identifier] ||= UI.input("The Bundle Identifier of your App: ")
     end
 
     def find_app(options)
@@ -27,7 +27,7 @@ module Deliver
       if app
         options[:app] = app
       else
-        raise "Could not find app with app identifier '#{options[:app_identifier]}' in your iTunes Connect account (#{options[:username]} - Team: #{Spaceship::Tunes.client.team_id})".red
+        UI.user_error!("Could not find app with app identifier '#{options[:app_identifier]}' in your iTunes Connect account (#{options[:username]} - Team: #{Spaceship::Tunes.client.team_id})")
       end
     end
 

data/lib/deliver/download_screenshots.rb

@@ -1,12 +1,12 @@
 module Deliver
   class DownloadScreenshots
     def self.run(options, path)
-      Helper.log.info "Downloading all existing screenshots...".green
+      UI.message("Downloading all existing screenshots...")
       download(options, path)
-      Helper.log.info "Successfully downloaded all existing screenshots".green
+      UI.success("Successfully downloaded all existing screenshots")
     rescue => ex
-      Helper.log.error ex
-      Helper.log.error "Couldn't download already existing screenshots from iTunesConnect.".red
+      UI.error(ex)
+      UI.error("Couldn't download already existing screenshots from iTunes Connect.")
     end
 
     def self.download(options, folder_path)
@@ -18,7 +18,7 @@ module Deliver
           original_file_extension = File.basename(screenshot.original_file_name)
           file_name += "." + original_file_extension
 
-          Helper.log.info "Downloading existing screenshot '#{file_name}'"
+          UI.message("Downloading existing screenshot '#{file_name}'")
 
           # If the screen shot is for an appleTV we need to store it in a way that we'll know it's an appleTV
           # screen shot later as the screen size is the same as an iPhone 6 Plus in landscape.

data/lib/deliver/html_generator.rb

@@ -4,24 +4,22 @@ module Deliver
       begin
         html_path = self.render(options, screenshots, '.')
       rescue => ex
-        Helper.log.error ex.inspect
-        Helper.log.error ex.backtrace.join("\n")
-        okay = agree("Could not render HTML preview. Do you still want to continue? (y/n)".red, true)
+        UI.error(ex.inspect)
+        UI.error(ex.backtrace.join("\n"))
+        okay = UI.input("Could not render HTML preview. Do you still want to continue?")
         return if okay
-        raise "Could not render HTML page"
+        UI.crash!("Could not render HTML page")
       end
-      puts "----------------------------------------------------------------------------"
-      puts "Verifying the upload via the HTML file can be disabled by either adding"
-      puts "`force true` to your Deliverfile or using `deliver --force`"
-      puts "----------------------------------------------------------------------------"
+      UI.important("Verifying the upload via the HTML file can be disabled by either adding")
+      UI.important("`force true` to your Deliverfile or using `deliver --force`")
 
       system("open '#{html_path}'")
-      okay = agree("Does the Preview on path '#{html_path}' look okay for you? (y/n)", true)
+      okay = UI.confirm("Does the Preview on path '#{html_path}' look okay for you?")
 
       if okay
-        puts "HTML file confirmed...".green # print this to give feedback to the user immediately
+        UI.success("HTML file confirmed...") # print this to give feedback to the user immediately
       else
-        raise "Did not upload the metadata, because the HTML file was rejected by the user".yellow
+        UI.user_error!("Did not upload the metadata, because the HTML file was rejected by the user")
       end
     end
 

data/lib/deliver/loader.rb

@@ -4,8 +4,9 @@ module Deliver
   module Loader
     # The directory 'appleTV' is a special folder that will cause our screenshot gathering code to iterate
     # through it as well searching for language folders.
-    APPLE_TV_DIR_NAME = "appleTV"
-    ALL_LANGUAGES = (FastlaneCore::Languages::ALL_LANGUAGES + [APPLE_TV_DIR_NAME]).map(&:downcase).freeze
+    APPLE_TV_DIR_NAME = "appleTV".freeze
+    DEFAULT_DIR_NAME = "default".freeze
+    ALL_LANGUAGES = (FastlaneCore::Languages::ALL_LANGUAGES + [APPLE_TV_DIR_NAME, APPLE_TV_DIR_NAME]).map(&:downcase).freeze
 
     def self.language_folders(root)
       Dir.glob(File.join(root, '*')).select do |path|

data/lib/deliver/options.rb

@@ -94,6 +94,15 @@ module Deliver
                                      description: "The price tier of this application",
                                      is_string: false,
                                      optional: true),
+        FastlaneCore::ConfigItem.new(key: :build_number,
+                                     short_option: "-n",
+                                     description: "If set the given build number (already uploaded to iTC) will be used instead of the current built one",
+                                     default_value: "latest",
+                                     optional: true,
+                                     conflicting_options: [:ipa, :pkg],
+                                     conflict_block: proc do |value|
+                                       raise "You can't use 'build_number' and '#{value.key}' options in one run.".red
+                                     end),
         FastlaneCore::ConfigItem.new(key: :app_rating_config_path,
                                      short_option: "-g",
                                      description: "Path to the app rating's config",

data/lib/deliver/runner.rb

@@ -10,22 +10,22 @@ module Deliver
     end
 
     def login
-      Helper.log.info "Login to iTunes Connect (#{options[:username]})"
+      UI.message("Login to iTunes Connect (#{options[:username]})")
       Spaceship::Tunes.login(options[:username])
       Spaceship::Tunes.select_team
-      Helper.log.info "Login successful"
+      UI.message("Login successful")
     end
 
     def run
       verify_version if options[:app_version].to_s.length > 0
       upload_metadata
 
-      has_binary = options[:ipa] || options[:pkg]
-      if !options[:skip_binary_upload] && has_binary
+      has_binary = (options[:ipa] || options[:pkg])
+      if !options[:skip_binary_upload] && !options[:build_number] && has_binary
         upload_binary
       end
 
-      Helper.log.info "Finished the upload to iTunes Connect".green
+      UI.success("Finished the upload to iTunes Connect")
 
       submit_for_review if options[:submit_for_review]
     end
@@ -34,13 +34,13 @@ module Deliver
     # If not, the new version will automatically be created
     def verify_version
       app_version = options[:app_version]
-      Helper.log.info "Making sure the latest version on iTunes Connect matches '#{app_version}' from the ipa file..."
+      UI.message("Making sure the latest version on iTunes Connect matches '#{app_version}' from the ipa file...")
 
       changed = options[:app].ensure_version!(app_version)
       if changed
-        Helper.log.info "Successfully set the version to '#{app_version}'".green
+        UI.success("Successfully set the version to '#{app_version}'")
       else
-        Helper.log.info "'#{app_version}' is the latest version on iTunes Connect".green
+        UI.success("'#{app_version}' is the latest version on iTunes Connect")
       end
     end
 
@@ -49,6 +49,7 @@ module Deliver
       # First, collect all the things for the HTML Report
       screenshots = UploadScreenshots.new.collect_screenshots(options)
       UploadMetadata.new.load_from_filesystem(options)
+      UploadMetadata.new.assign_defaults(options)
 
       # Validate
       validate_html(screenshots)
@@ -62,7 +63,7 @@ module Deliver
 
     # Upload the binary to iTunes Connect
     def upload_binary
-      Helper.log.info "Uploading binary to iTunes Connect"
+      UI.message("Uploading binary to iTunes Connect")
       if options[:ipa]
         package_path = FastlaneCore::IpaUploadPackageBuilder.new.generate(
           app_id: options[:app].apple_id,

data/lib/deliver/setup.rb

@@ -16,7 +16,7 @@ module Deliver
       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"))
 
-      Helper.log.info "Successfully created new Deliverfile at path '#{file_path}'".green
+      UI.success("Successfully created new Deliverfile at path '#{file_path}'")
     end
 
     # This method takes care of creating a new 'deliver' folder, containg the app metadata
@@ -49,7 +49,7 @@ module Deliver
           resulting_path = File.join(containing, language, "#{key}.txt")
           FileUtils.mkdir_p(File.expand_path('..', resulting_path))
           File.write(resulting_path, content)
-          Helper.log.debug "Writing to '#{resulting_path}'"
+          UI.message("Writing to '#{resulting_path}'")
         end
       end
 
@@ -63,10 +63,10 @@ module Deliver
 
         resulting_path = File.join(containing, "#{key}.txt")
         File.write(resulting_path, content)
-        Helper.log.debug "Writing to '#{resulting_path}'"
+        UI.message("Writing to '#{resulting_path}'")
       end
 
-      puts "Successfully created new configuration files.".green
+      UI.success("Successfully created new configuration files.")
     end
 
     def download_screenshots(deliver_path, options)

data/lib/deliver/submit_for_review.rb

@@ -4,7 +4,7 @@ module Deliver
       app = options[:app]
       select_build(options)
 
-      Helper.log.info "Submitting the app for review..."
+      UI.message("Submitting the app for review...")
       submission = app.create_submission
 
       # Set app submission information
@@ -15,9 +15,8 @@ module Deliver
 
       # User Values
       if options[:submission_information]
-        raise "`submission_information` must be a hash" unless options[:submission_information].kind_of?(Hash)
         options[:submission_information].each do |key, value|
-          Helper.log.info "Setting '#{key}' to '#{value}'..."
+          UI.message("Setting '#{key}' to '#{value}'...")
           submission.send("#{key}=", value)
         end
       end
@@ -25,25 +24,33 @@ module Deliver
       # Finalize app submission
       submission.complete!
 
-      Helper.log.info "Successfully submitted the app for review!".green
+      UI.success("Successfully submitted the app for review!")
     end
 
     def select_build(options)
-      Helper.log.info "Selecting the latest build..."
       app = options[:app]
       v = app.edit_version
-      build = wait_for_build(app)
 
-      Helper.log.info "Selecting build #{build.train_version} (#{build.build_version})..."
+      if options[:build_number] and options[:build_number] != "latest"
+        UI.message("Selecting existing build-number: #{options[:build_number]}")
+        build = v.candidate_builds.detect { |a| a.build_version == options[:build_number] }
+        unless build
+          UI.user_error!("Build number: #{options[:build_number]} does not exist")
+        end
+      else
+        UI.message("Selecting the latest build...")
+        build = wait_for_build(app)
+      end
+      UI.message("Selecting build #{build.train_version} (#{build.build_version})...")
 
       v.select_build(build)
       v.save!
 
-      Helper.log.info "Successfully selected build".green
+      UI.success("Successfully selected build")
     end
 
     def wait_for_build(app)
-      raise "Could not find app with app identifier #{WatchBuild.config[:app_identifier]}".red unless app
+      UI.user_error!("Could not find app with app identifier #{WatchBuild.config[:app_identifier]}") unless app
 
       start = Time.now
 
@@ -51,10 +58,10 @@ module Deliver
         build = find_build(app)
         return build if build.processing == false
 
-        Helper.log.info "Waiting iTunes Connect processing for build #{build.train_version} (#{build.build_version})... this might take a while..."
+        UI.message("Waiting iTunes Connect processing for build #{build.train_version} (#{build.build_version})... this might take a while...")
         if (Time.now - start) > (60 * 5)
-          Helper.log.info ""
-          Helper.log.info "You can tweet: \"iTunes Connect #iosprocessingtime #{((Time.now - start) / 60).round} minutes\""
+          UI.message("")
+          UI.message("You can tweet: \"iTunes Connect #iosprocessingtime #{((Time.now - start) / 60).round} minutes\"")
         end
         sleep 30
       end
@@ -70,8 +77,8 @@ module Deliver
       end
 
       unless build
-        Helper.log.fatal app.latest_version.candidate_builds
-        raise "Could not find build".red
+        UI.error(app.latest_version.candidate_builds)
+        UI.crash!("Could not find build")
       end
 
       return build

data/lib/deliver/upload_assets.rb

@@ -4,15 +4,15 @@ module Deliver
       app = options[:app]
 
       v = app.edit_version
-      raise "Could not find a version to edit for app '#{app.name}'".red unless v
+      UI.user_error!("Could not find a version to edit for app '#{app.name}'") unless v
 
       if options[:app_icon]
-        Helper.log.info "Uploading app icon..."
+        UI.message("Uploading app icon...")
         v.upload_large_icon!(options[:app_icon])
       end
 
       if options[:apple_watch_app_icon]
-        Helper.log.info "Uploading apple watchapp icon..."
+        UI.message("Uploading apple watchapp icon...")
         v.upload_watch_icon!(options[:apple_watch_app_icon])
       end
 

data/lib/deliver/upload_metadata.rb

@@ -31,7 +31,7 @@ module Deliver
         next unless current
 
         unless current.kind_of?(Hash)
-          Helper.log.error "Error with provided '#{key}'. Must be a hash, the key being the language.".red
+          UI.error("Error with provided '#{key}'. Must be a hash, the key being the language.")
           next
         end
 
@@ -55,10 +55,52 @@ module Deliver
       set_review_information(v, options)
       set_app_rating(v, options)
 
-      Helper.log.info "Uploading metadata to iTunes Connect"
+      UI.message("Uploading metadata to iTunes Connect")
       v.save!
       details.save!
-      Helper.log.info "Successfully uploaded initial set of metadata to iTunes Connect".green
+      UI.success("Successfully uploaded initial set of metadata to iTunes Connect")
+    end
+
+    # If the user is using the 'default' language, then assign values where they are needed
+    def assign_defaults(options)
+      # Build a complete list of the required languages
+      enabled_languages = []
+
+      # Get all languages used in existing settings
+      (LOCALISED_VERSION_VALUES + LOCALISED_APP_VALUES).each do |key|
+        current = options[key]
+        next unless current && current.kind_of?(Hash)
+        current.each do |language, value|
+          enabled_languages << language unless enabled_languages.include?(language)
+        end
+      end
+
+      # Check folder list (an empty folder signifies a language is required)
+      Dir.glob(File.join(options[:metadata_path], "*")).each do |lng_folder|
+        next unless File.directory?(lng_folder) # We don't want to read txt as they are non localised
+
+        language = File.basename(lng_folder)
+        enabled_languages << language unless enabled_languages.include?(language)
+      end
+
+      return unless enabled_languages.include?("default")
+      UI.message("Detected languages: " + enabled_languages.to_s)
+
+      (LOCALISED_VERSION_VALUES + LOCALISED_APP_VALUES).each do |key|
+        current = options[key]
+        next unless current && current.kind_of?(Hash)
+
+        default = current["default"]
+        next if default.nil?
+
+        enabled_languages.each do |language|
+          value = current[language]
+          next unless value.nil?
+
+          current[language] = default
+        end
+        current.delete("default")
+      end
     end
 
     # Makes sure all languages we need are actually created
@@ -69,7 +111,7 @@ module Deliver
       # We only care about languages from user provided values
       # as the other languages are on iTC already anyway
       v = options[:app].edit_version
-      raise "Could not find a version to edit for app '#{options[:app].name}', the app metadata is read-only currently".red unless v
+      UI.user_error!("Could not find a version to edit for app '#{options[:app].name}', the app metadata is read-only currently") unless v
 
       enabled_languages = []
       LOCALISED_VERSION_VALUES.each do |key|
@@ -84,7 +126,7 @@ module Deliver
         v.create_languages(enabled_languages)
         lng_text = "language"
         lng_text += "s" if enabled_languages.count != 1
-        Helper.log.info "Activating #{lng_text} #{enabled_languages.join(', ')}..."
+        UI.message("Activating #{lng_text} #{enabled_languages.join(', ')}...")
         v.save!
       end
       true
@@ -101,7 +143,7 @@ module Deliver
           path = File.join(lng_folder, "#{key}.txt")
           next unless File.exist?(path)
 
-          Helper.log.info "Loading '#{path}'..."
+          UI.message("Loading '#{path}'...")
           options[key] ||= {}
           options[key][language] ||= File.read(path)
         end
@@ -112,7 +154,7 @@ module Deliver
         path = File.join(options[:metadata_path], "#{key}.txt")
         next unless File.exist?(path)
 
-        Helper.log.info "Loading '#{path}'..."
+        UI.message("Loading '#{path}'...")
         options[key] ||= File.read(path)
       end
     end
@@ -122,7 +164,7 @@ module Deliver
     def set_review_information(v, options)
       return unless options[:app_review_information]
       info = options[:app_review_information]
-      raise "`app_review_information` must be a hash" unless info.kind_of?(Hash)
+      UI.user_error!("`app_review_information` must be a hash") unless info.kind_of?(Hash)
 
       v.review_first_name = info[:first_name] if info[:first_name]
       v.review_last_name = info[:last_name] if info[:last_name]
@@ -140,8 +182,8 @@ module Deliver
       begin
         json = JSON.parse(File.read(options[:app_rating_config_path]))
       rescue => ex
-        Helper.log.fatal ex.to_s
-        raise "Error parsing JSON file at path '#{options[:app_rating_config_path]}'".red
+        UI.error(ex.to_s)
+        UI.user_error!("Error parsing JSON file at path '#{options[:app_rating_config_path]}'")
       end
       v.update_rating(json)
     end

data/lib/deliver/upload_price_tier.rb

@@ -10,12 +10,12 @@ module Deliver
 
       old_price = app.price_tier
       if options[:price_tier] == old_price
-        Helper.log.info "Price Tier unchanged (tier #{options[:price_tier]})".green
+        UI.success("Price Tier unchanged (tier #{options[:price_tier]})")
         return
       end
 
       app.update_price_tier!(options[:price_tier])
-      Helper.log.info "Successfully updated the pricing from #{old_price} to #{options[:price_tier]}".green
+      UI.success("Successfully updated the pricing from #{old_price} to #{options[:price_tier]}")
     end
   end
 end

data/lib/deliver/upload_screenshots.rb

@@ -7,9 +7,9 @@ module Deliver
       app = options[:app]
 
       v = app.edit_version
-      raise "Could not find a version to edit for app '#{app.name}'".red unless v
+      UI.user_error!("Could not find a version to edit for app '#{app.name}'") unless v
 
-      Helper.log.info "Starting with the upload of screenshots..."
+      UI.message("Starting with the upload of screenshots...")
 
       # First, clear all previously uploaded screenshots, but only where we have new ones
       # screenshots.each do |screenshot|
@@ -25,7 +25,7 @@ module Deliver
 
       screenshots_per_language = screenshots.group_by(&:language)
       screenshots_per_language.each do |language, screenshots_for_language|
-        Helper.log.info "Uploading #{screenshots_for_language.length} screenshots for language #{language}"
+        UI.message("Uploading #{screenshots_for_language.length} screenshots for language #{language}")
         screenshots_for_language.each do |screenshot|
           indized[screenshot.language] ||= {}
           indized[screenshot.language][screenshot.device_type] ||= 0
@@ -34,11 +34,11 @@ module Deliver
           index = indized[screenshot.language][screenshot.device_type]
 
           if index > 5
-            Helper.log.error "Too many screenshots found for device '#{screenshot.device_type}' in '#{screenshot.language}'"
+            UI.error("Too many screenshots found for device '#{screenshot.device_type}' in '#{screenshot.language}'")
             next
           end
 
-          Helper.log.info "Uploading '#{screenshot.path}'..."
+          UI.message("Uploading '#{screenshot.path}'...")
           v.upload_screenshot!(screenshot.path,
                                index,
                                screenshot.language,
@@ -46,10 +46,10 @@ module Deliver
         end
         # ideally we should only save once, but itunes server can't cope it seems
         # so we save per language. See issue #349
-        Helper.log.info "Saving changes"
+        UI.message("Saving changes")
         v.save!
       end
-      Helper.log.info "Successfully uploaded screenshots to iTunes Connect".green
+      UI.success("Successfully uploaded screenshots to iTunes Connect")
     end
 
     def collect_screenshots(options)

data/lib/deliver/version.rb

@@ -1,4 +1,4 @@
 module Deliver
-  VERSION = "1.9.0"
+  VERSION = "1.10.0"
   DESCRIPTION = 'Upload screenshots, metadata and your app to the App Store using a single command'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deliver
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.10.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-01 00:00:00.000000000 Z
+date: 2016-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane_core