deliver 1.10.5 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6b8ac013ccd637c9ff3d7161237108021a33827
-  data.tar.gz: 0fbc35e73a5c534a76ea4aec0360872e3268fc95
+  metadata.gz: 28d4c96c447e6fa197da26c5875b766e8db879d6
+  data.tar.gz: 60a8a56302fd3e4655217d3948cb46da98af2939
 SHA512:
-  metadata.gz: 3cf4ea501ff6f03b46551a484d9dcb2d4d0d8bf7f447fd5ab8ff6c3f095e22846ff60cc679abc195c93b937aaf3ca25c8816111b2b0477c6d2de0ddc56dafe7b
-  data.tar.gz: 69799296c10b8923f467d6f884b386c3002b70e0c05a598278c939e0e68418d5c5b20383bfb2381196be9cb30a6f8240dfe7e1d324e2fa52615b2cdfecd2cfc3
+  metadata.gz: 74077b0423e8e794a887eba59c39e1c600cacdf8787e7a4606eb801a6a9957096c51136fddbd9a4d16465330cc1558ca0a4df0281f522369031b2fc2356d46dc
+  data.tar.gz: db28eab9cb88ac29c46f671e628b54e6bc4d53e6774b389656a7d5257eab5d7b773aa01469e41f43b2f3bbd55b500bb5631ae87c3fc191a33716baae25f60247

data/lib/assets/summary.html.erb

@@ -138,7 +138,7 @@
           <div class="app-keyword">
               <div class="cat-headline">Keywords</div>
               <ul class="app-keyword-list">
-                <% @options[:keywords][language].split(" ").each do |keyword| %>
+                <% split_keywords(@options[:keywords][language]).each do |keyword| %>
                   <li><%= keyword %></li>
                 <% end %>
               </ul>

data/lib/deliver/html_generator.rb

@@ -1,5 +1,10 @@
 module Deliver
   class HtmlGenerator
+    # Splits keywords supporting:
+    # * separated by commas (with optional whitespace)
+    # * separated by newlines
+    KEYWORD_SPLITTER = /(?:,\s?|\r?\n)/
+
     def run(options, screenshots)
       begin
         html_path = self.render(options, screenshots, '.')
@@ -45,5 +50,11 @@ module Deliver
 
       return export_path
     end
+
+    # Splits a string of keywords separated by comma or newlines into a presentable list
+    # @param keywords (String)
+    def split_keywords(keywords)
+      keywords.split(KEYWORD_SPLITTER)
+    end
   end
 end

data/lib/deliver/options.rb

@@ -31,12 +31,12 @@ module Deliver
                                      description: "Path to your ipa file",
                                      default_value: Dir["*.ipa"].first,
                                      verify_block: proc do |value|
-                                       raise "Could not find ipa file at path '#{value}'".red unless File.exist?(value)
-                                       raise "'#{value}' doesn't seem to be an ipa file".red unless value.end_with?(".ipa")
+                                       UI.user_error!("Could not find ipa file at path '#{value}'") unless File.exist?(value)
+                                       UI.user_error!("'#{value}' doesn't seem to be an ipa file") unless value.end_with?(".ipa")
                                      end,
                                      conflicting_options: [:pkg],
                                      conflict_block: proc do |value|
-                                       raise "You can't use 'ipa' and '#{value.key}' options in one run.".red
+                                       UI.user_error!("You can't use 'ipa' and '#{value.key}' options in one run.")
                                      end),
         FastlaneCore::ConfigItem.new(key: :pkg,
                                      short_option: "-c",
@@ -45,12 +45,12 @@ module Deliver
                                      description: "Path to your pkg file",
                                      default_value: Dir["*.pkg"].first,
                                      verify_block: proc do |value|
-                                       raise "Could not find pkg file at path '#{value}'".red unless File.exist?(value)
-                                       raise "'#{value}' doesn't seem to be a pkg file".red unless value.end_with?(".pkg")
+                                       UI.user_error!("Could not find pkg file at path '#{value}'") unless File.exist?(value)
+                                       UI.user_error!("'#{value}' doesn't seem to be a pkg file") unless value.end_with?(".pkg")
                                      end,
                                      conflicting_options: [:ipa],
                                      conflict_block: proc do |value|
-                                       raise "You can't use 'pkg' and '#{value.key}' options in one run.".red
+                                       UI.user_error!("You can't use 'pkg' and '#{value.key}' options in one run.")
                                      end),
         FastlaneCore::ConfigItem.new(key: :metadata_path,
                                      short_option: '-m',
@@ -100,7 +100,7 @@ module Deliver
                                      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
+                                       UI.user_error!("You can't use 'build_number' and '#{value.key}' options in one run.")
                                      end),
         FastlaneCore::ConfigItem.new(key: :app_rating_config_path,
                                      short_option: "-g",
@@ -108,8 +108,8 @@ module Deliver
                                      is_string: true,
                                      optional: true,
                                      verify_block: proc do |value|
-                                       raise "Could not find config file at path '#{value}'".red unless File.exist?(value)
-                                       raise "'#{value}' doesn't seem to be a JSON file".red unless value.end_with?(".json")
+                                       UI.user_error!("Could not find config file at path '#{value}'") unless File.exist?(value)
+                                       UI.user_error!("'#{value}' doesn't seem to be a JSON file") unless value.end_with?(".json")
                                      end),
         FastlaneCore::ConfigItem.new(key: :submission_information,
                                      short_option: "-b",
@@ -143,16 +143,16 @@ module Deliver
                                      optional: true,
                                      short_option: "-l",
                                      verify_block: proc do |value|
-                                       raise "Could not find png file at path '#{value}'".red unless File.exist?(value)
-                                       raise "'#{value}' doesn't seem to be a png file".red unless value.end_with?(".png")
+                                       UI.user_error!("Could not find png file at path '#{value}'") unless File.exist?(value)
+                                       UI.user_error!("'#{value}' doesn't seem to be a png file") unless value.end_with?(".png")
                                      end),
         FastlaneCore::ConfigItem.new(key: :apple_watch_app_icon,
                                      description: "Metadata: The path to the Apple Watch app icon",
                                      optional: true,
                                      short_option: "-q",
                                      verify_block: proc do |value|
-                                       raise "Could not find png file at path '#{value}'".red unless File.exist?(value)
-                                       raise "'#{value}' doesn't seem to be a png file".red unless value.end_with?(".png")
+                                       UI.user_error!("Could not find png file at path '#{value}'") unless File.exist?(value)
+                                       UI.user_error!("'#{value}' doesn't seem to be a png file") unless value.end_with?(".png")
                                      end),
         FastlaneCore::ConfigItem.new(key: :copyright,
                                      description: "Metadata: The copyright notice",

data/lib/deliver/upload_screenshots.rb

@@ -75,17 +75,16 @@ module Deliver
 
         prefer_framed = Dir.glob(File.join(lng_folder, "*_framed.#{extensions}"), File::FNM_CASEFOLD).count > 0
 
+        UI.important("Framed screenshots are detected! 🖼 Non-framed screenshot files may be skipped. 🏃") if prefer_framed
+
         language = File.basename(lng_folder)
         files.each do |file_path|
-          if file_path.downcase.include?("_framed.")
-            # That's cool
-          else
-            if file_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
+          is_framed = file_path.downcase.include?("_framed.")
+          is_watch = file_path.downcase.include?("watch")
+
+          if prefer_framed && !is_framed && !is_watch
+            UI.important("🏃 Skipping screenshot file: #{file_path}")
+            next
           end
 
           screenshots << AppScreenshot.new(file_path, language)

data/lib/deliver/version.rb

@@ -1,4 +1,4 @@
 module Deliver
-  VERSION = "1.10.5"
+  VERSION = "1.11.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.10.5
+  version: 1.11.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-16 00:00:00.000000000 Z
+date: 2016-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane_core
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.37.0
+        version: 0.41.2
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.37.0
+        version: 0.41.2
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -56,7 +56,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.24.1
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.24.1
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -140,6 +140,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: rspec_junit_formatter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -290,7 +304,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Upload screenshots, metadata and your app to the App Store using a single