deliver 1.6.2 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a5ac4e91c50690b7453f12f37e364d3b0d5c2a9
-  data.tar.gz: d5ff925845ead11f1a408bb1ec648c1bd8463ef6
+  metadata.gz: 4d944187af1f09ddb8dbd35ba7af26a8e4054a83
+  data.tar.gz: 0dfc83745602d624642e836a6b7c7fab5c9197a1
 SHA512:
-  metadata.gz: 272aef64218df3e1cd7bf7c8c8c80a51c767f9d476ad9f31a7ce7582f5c05dfc1b505e81427723470dfeaae6565ccc72b38fe91e2907034775a649c702bea8de
-  data.tar.gz: 251f008d352c9174b22b209d2660b345a30f7025bba57397dbc13a84ca6770e6184b82c503803b624f20cec3dadf072632bbd3b1ee59ec4d224658105732f1f1
+  metadata.gz: 237217436cb0d0bd19912f017024d9e49dfafbde43dc0cd0f7dd187ab4091a94687090a8d67ff2eb89327c434e4e2d6aa56e36ad9b03adbfeea62317d671d41f
+  data.tar.gz: 2421573adb3cbfeb1cdae730df0be7a9b134cf5888677bc3a21dddedc5ccdeced74b3bfe66b3b67e01e7575439e6f4554298acd4a521187394ce05eb856afc5e

data/lib/deliver.rb

@@ -11,6 +11,7 @@ require 'deliver/upload_assets'
 require 'deliver/submit_for_review'
 require 'deliver/app_screenshot'
 require 'deliver/html_generator'
+require 'deliver/loader'
 
 require 'spaceship'
 require 'fastlane_core'

data/lib/deliver/loader.rb

@@ -0,0 +1,13 @@
+require 'fastlane_core/languages'
+
+module Deliver
+  module Loader
+    ALL_LANGUAGES = FastlaneCore::Languages::ALL_LANGUAGES.map(&:downcase).freeze
+
+    def self.language_folders(root)
+      Dir.glob(File.join(root, '*')).select do |path|
+        File.directory?(path) && ALL_LANGUAGES.include?(File.basename(path).downcase)
+      end.sort
+    end
+  end
+end

data/lib/deliver/upload_metadata.rb

@@ -95,11 +95,8 @@ module Deliver
       return if options[:skip_metadata]
 
       # Load localised data
-      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
-
+      Loader.language_folders(options[:metadata_path]).each do |lng_folder|
         language = File.basename(lng_folder)
-
         (LOCALISED_VERSION_VALUES + LOCALISED_APP_VALUES).each do |key|
           path = File.join(lng_folder, "#{key}.txt")
           next unless File.exist?(path)

data/lib/deliver/upload_screenshots.rb

@@ -57,21 +57,23 @@ module Deliver
 
       screenshots = []
       extensions = '{png,jpg,jpeg}'
-      Dir.glob(File.join(options[:screenshots_path], "*"), File::FNM_CASEFOLD).sort.each do |lng_folder|
-        language = File.basename(lng_folder)
-
+      Loader.language_folders(options[:screenshots_path]).each do |lng_folder|
         files = Dir.glob(File.join(lng_folder, "*.#{extensions}"))
         next if files.count == 0
 
         prefer_framed = Dir.glob(File.join(lng_folder, "*_framed.#{extensions}")).count > 0
 
+        language = File.basename(lng_folder)
         files.each do |path|
-          if prefer_framed && !path.downcase.include?("_framed.#{extensions}") && !path.downcase.include?("watch")
-            next
-          end
-
-          if !prefer_framed && path.downcase.include?("_framed.#{extensions}")
-            next
+          if path.downcase.include?("_framed.")
+            # That's cool
+          else
+            if path.downcase.include?("watch")
+              # Watch doesn't support frames (yet)
+            else
+              # That might not be cool... if that screenshot is not framed but we only want framed
+              next if prefer_framed
+            end
           end
 
           screenshots << AppScreenshot.new(path, language)

data/lib/deliver/version.rb

@@ -1,4 +1,4 @@
 module Deliver
-  VERSION = "1.6.2"
+  VERSION = "1.6.3"
   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.6.2
+  version: 1.6.3
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-03 00:00:00.000000000 Z
+date: 2015-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane_core
@@ -224,6 +224,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.34'
+- !ruby/object:Gem::Dependency
+  name: fakefs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Upload screenshots, metadata and your app to the App Store using a single
   command
 email:
@@ -245,6 +259,7 @@ files:
 - lib/deliver/detect_values.rb
 - lib/deliver/download_screenshots.rb
 - lib/deliver/html_generator.rb
+- lib/deliver/loader.rb
 - lib/deliver/options.rb
 - lib/deliver/runner.rb
 - lib/deliver/setup.rb
@@ -274,7 +289,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.0
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Upload screenshots, metadata and your app to the App Store using a single