deliver 1.14.5 → 1.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2451302ab0fe0651f35ae79ed7f69fdcc16e2ef
-  data.tar.gz: e75fb3abbeb2afec9211739476126654708c10dc
+  metadata.gz: 567c701cbd4630a8b139b6278f6e5cb49c5b0dfe
+  data.tar.gz: a761b179cc3bca74f4494ba076e4ab5047f334c0
 SHA512:
-  metadata.gz: c7db0ec409517aae6e0b236369caf0708afdc0ad2b6ff216d3d6320e8102d26b485c284a00aae45c4a5e88e0c8d4b2f340e08bc454d50725605e1a1a8add453f
-  data.tar.gz: ee14c485603cb01b8bf4b420d0905fdfb79b8c4720baec26fe38b9f30ce6c3c316477728f28fe558dfa32c1ee6afa87130ca9e797aed4678991e6c1a36f7125b
+  metadata.gz: a0009f8d3812b6b22d7a5143ed3cf6c7ac92ac97cd1fa141508b5298ab752838284dd3068ab84f01e392d8184b98e5f0b11c11bc44630b940074ed53f903722a
+  data.tar.gz: d9ac5993789ba8dc0c6da99c7d9dc1ac056c01702acea60d51091b022bfeb1927524229ddc6a185251f6ba8e113177b905595211ac30a6422b3c2e82ad035417

data/README.md

@@ -192,7 +192,7 @@ Imagine that you have localised data for the following language codes:  ```en-US
 
 You can set the following in your deliverfile
 
-```
+```ruby
 release_notes({
   'default' => "Shiny and new”,
   'de-DE' => "glänzend und neu"

data/lib/deliver/commands_generator.rb

@@ -14,6 +14,22 @@ module Deliver
       FastlaneCore::UpdateChecker.show_update_status('deliver', Deliver::VERSION)
     end
 
+    def deliverfile_options(skip_verification: false)
+      available_options = Deliver::Options.available_options
+      return available_options unless skip_verification
+
+      # These don't matter for downloading metadata, so verification can be skipped
+      irrelevant_options_keys = [:ipa, :pkg, :app_rating_config_path]
+
+      available_options.each do |opt|
+        next unless irrelevant_options_keys.include?(opt.key)
+        opt.verify_block = nil
+        opt.conflicting_options = nil
+      end
+
+      return available_options
+    end
+
     def run
       program :version, Deliver::VERSION
       program :description, Deliver::DESCRIPTION
@@ -22,7 +38,7 @@ module Deliver
       program :help, 'GitHub', 'https://github.com/fastlane/fastlane/tree/master/deliver'
       program :help_formatter, :compact
 
-      FastlaneCore::CommanderGenerator.new.generate(Deliver::Options.available_options)
+      FastlaneCore::CommanderGenerator.new.generate(deliverfile_options)
 
       global_option('--verbose') { $verbose = true }
 
@@ -32,7 +48,7 @@ module Deliver
         c.syntax = 'deliver'
         c.description = 'Upload metadata and binary to iTunes Connect'
         c.action do |args, options|
-          options = FastlaneCore::Configuration.create(Deliver::Options.available_options, options.__hash__)
+          options = FastlaneCore::Configuration.create(deliverfile_options, options.__hash__)
           loaded = options.load_configuration_file("Deliverfile")
           loaded = true if options[:description] || options[:ipa] || options[:pkg] # do we have *anything* here?
           unless loaded
@@ -51,7 +67,7 @@ module Deliver
         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 = FastlaneCore::Configuration.create(deliverfile_options, options.__hash__)
           options.load_configuration_file("Deliverfile")
           options[:submit_for_review] = true
           options[:build_number] = "latest" unless options[:build_number]
@@ -68,7 +84,7 @@ module Deliver
           end
 
           require 'deliver/setup'
-          options = FastlaneCore::Configuration.create(Deliver::Options.available_options, options.__hash__)
+          options = FastlaneCore::Configuration.create(deliverfile_options, options.__hash__)
           Deliver::Runner.new(options) # to login...
           Deliver::Setup.new.run(options)
         end
@@ -78,7 +94,7 @@ module Deliver
         c.syntax = 'deliver generate_summary'
         c.description = 'Generate HTML Summary without uploading/downloading anything'
         c.action do |args, options|
-          options = FastlaneCore::Configuration.create(Deliver::Options.available_options, options.__hash__)
+          options = FastlaneCore::Configuration.create(deliverfile_options, options.__hash__)
           options.load_configuration_file("Deliverfile")
           Deliver::Runner.new(options)
           html_path = Deliver::GenerateSummary.new.run(options)
@@ -92,9 +108,9 @@ module Deliver
         c.description = "Downloads all existing screenshots from iTunes Connect and stores them in the screenshots folder"
 
         c.action do |args, options|
-          options = FastlaneCore::Configuration.create(Deliver::Options.available_options, options.__hash__)
+          options = FastlaneCore::Configuration.create(deliverfile_options(skip_verification: true), options.__hash__)
           options.load_configuration_file("Deliverfile")
-          Deliver::Runner.new(options) # to login...
+          Deliver::Runner.new(options, skip_version: true) # to login...
           containing = FastlaneCore::Helper.fastlane_enabled? ? './fastlane' : '.'
           path = options[:screenshots_path] || File.join(containing, 'screenshots')
           Deliver::DownloadScreenshots.run(options, path)
@@ -106,20 +122,25 @@ module Deliver
         c.description = "Downloads existing metadata and stores it locally. This overwrites the local files."
 
         c.action do |args, options|
-          options = FastlaneCore::Configuration.create(Deliver::Options.available_options, options.__hash__)
+          options = FastlaneCore::Configuration.create(deliverfile_options(skip_verification: true), options.__hash__)
           options.load_configuration_file("Deliverfile")
           Deliver::Runner.new(options) # to login...
           containing = FastlaneCore::Helper.fastlane_enabled? ? './fastlane' : '.'
           path = options[:metadata_path] || File.join(containing, 'metadata')
           res = ENV["DELIVER_FORCE_OVERWRITE"]
           res ||= UI.confirm("Do you want to overwrite existing metadata on path '#{File.expand_path(path)}'?")
-          if res
-            require 'deliver/setup'
-            v = options[:app].latest_version
-            Deliver::Setup.new.generate_metadata_files(v, path)
-          else
-            return 0
+          return 0 unless res
+
+          require 'deliver/setup'
+          v = options[:app].latest_version
+          if options[:app_version].to_s.length > 0
+            v = options[:app].live_version if v.version != options[:app_version]
+            if v.version != options[:app_version]
+              raise "Neither the current nor live version match specified app_version \"#{options[:app_version]}\""
+            end
           end
+
+          Deliver::Setup.new.generate_metadata_files(v, path)
         end
       end
 

data/lib/deliver/detect_values.rb

@@ -1,10 +1,10 @@
 module Deliver
   class DetectValues
-    def run!(options)
+    def run!(options, skip_params = {})
       find_app_identifier(options)
       find_app(options)
       find_folders(options)
-      find_version(options)
+      find_version(options) unless skip_params[:skip_version]
     end
 
     def find_app_identifier(options)
@@ -18,6 +18,8 @@ module Deliver
 
       options[:app_identifier] = identifier if identifier.to_s.length > 0
       options[:app_identifier] ||= UI.input("The Bundle Identifier of your App: ")
+    rescue
+      UI.user_error!("Could not infer your App's Bundle Identifier")
     end
 
     def find_app(options)
@@ -41,11 +43,15 @@ module Deliver
     end
 
     def find_version(options)
+      return if options[:app_version]
+
       if options[:ipa]
         options[:app_version] ||= FastlaneCore::IpaFileAnalyser.fetch_app_version(options[:ipa])
       elsif options[:pkg]
         options[:app_version] ||= FastlaneCore::PkgFileAnalyser.fetch_app_version(options[:pkg])
       end
+    rescue
+      UI.user_error!("Could not infer your app's version")
     end
   end
 end

data/lib/deliver/options.rb

@@ -159,6 +159,11 @@ module Deliver
                                      env_name: "DELIVER_ITC_PROVIDER",
                                      description: "The provider short name to be used with the iTMSTransporter to identify your team",
                                      optional: true),
+        FastlaneCore::ConfigItem.new(key: :overwrite_screenshots,
+                                     env_name: "DELIVER_OVERWRITE_SCREENSHOTS",
+                                     description: "Clear all previously uploaded screenshots before uploading the new ones",
+                                     is_string: false,
+                                     default_value: false),
 
         # App Metadata
         # Non Localised

data/lib/deliver/runner.rb

@@ -2,10 +2,10 @@ module Deliver
   class Runner
     attr_accessor :options
 
-    def initialize(options)
+    def initialize(options, skip_auto_detection = {})
       self.options = options
       login
-      Deliver::DetectValues.new.run!(self.options)
+      Deliver::DetectValues.new.run!(self.options, skip_auto_detection)
       FastlaneCore::PrintTable.print_values(config: options, hide_keys: [:app], mask_keys: ['app_review_information.demo_password'], title: "deliver #{Deliver::VERSION} Summary")
     end
 

data/lib/deliver/upload_screenshots.rb

@@ -10,20 +10,32 @@ module Deliver
       UI.user_error!("Could not find a version to edit for app '#{app.name}'") unless v
 
       UI.message("Starting with the upload of screenshots...")
+      screenshots_per_language = screenshots.group_by(&:language)
 
-      # First, clear all previously uploaded screenshots, but only where we have new ones
-      # screenshots.each do |screenshot|
-      #   to_remove = v.screenshots[screenshot.language].find_all do |current|
-      #     current.device_type == screenshot.device_type
-      #   end
-      #   to_remove.each { |t| t.reset! }
-      # end
-      # This part is not working yet...
+      if options[:overwrite_screenshots]
+        UI.message("Removing all previously uploaded screenshots...")
+        # First, clear all previously uploaded screenshots
+        screenshots_per_language.keys.each do |language|
+          v.screenshots[language].each_with_index do |t, index|
+            v.upload_screenshot!(nil, index, t.language, t.device_type)
+          end
+        end
+      end
 
       # Now, fill in the new ones
       indized = {} # per language and device type
 
-      screenshots_per_language = screenshots.group_by(&:language)
+      enabled_languages = screenshots_per_language.keys
+      if enabled_languages.count > 0
+        v.create_languages(enabled_languages)
+        lng_text = "language"
+        lng_text += "s" if enabled_languages.count != 1
+        UI.message("Activating #{lng_text} #{enabled_languages.join(', ')}...")
+        v.save!
+        # This refreshes the app version from iTC after enabling a localization
+        v = app.edit_version
+      end
+
       screenshots_per_language.each do |language, screenshots_for_language|
         UI.message("Uploading #{screenshots_for_language.length} screenshots for language #{language}")
         screenshots_for_language.each do |screenshot|

data/lib/deliver/version.rb

@@ -1,4 +1,4 @@
 module Deliver
-  VERSION = "1.14.5"
+  VERSION = "1.15.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.14.5
+  version: 1.15.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-25 00:00:00.000000000 Z
+date: 2016-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane_core
@@ -56,7 +56,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.36.2
+        version: 0.37.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.36.2
+        version: 0.37.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -310,7 +310,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Upload screenshots, metadata and your app to the App Store using a single