fastlane 2.61.0 → 2.62.0.beta.20171010010004

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b86b8067250cc6c52f7f47a0f7035a1a8d0c6c8
-  data.tar.gz: b1fda36602b3022bcba3034fafdac672772ebbeb
+  metadata.gz: 6603dcc994421f4f5f4cc421abc2aeb3c354071a
+  data.tar.gz: 1bb36fff2ccd821a7420753c9b52017af8b845b4
 SHA512:
-  metadata.gz: eb164f078e32e06a93114d8eb6518dbcdb246fbdbaae57dcd4141df747ffdd0f0869f59e0183b20d01eb6ac24ab1ccddac06e22e4a286ede242b1a19eb0e8b69
-  data.tar.gz: 4be34ef5c10b4289ccf9481b5b01c42712f67aa5c962392198e4f7648b8e7d0abfe12fbf5051215c7cd2a122cf79b8e4de46715a918f9195013433f2da6dbb18
+  metadata.gz: d6fd3bac1fce74d240d5e5f7171ca633ee708e31a9e6dfa9b23a5149fa2d788936b5295e0600f55d0bc983ede708e6b102c19b81c628ef1d26464d69b9d7508d
+  data.tar.gz: c6c9fa27ddea41b0fab403c3d14eff733a41084f444938b6ac16ab53fc7ade71918198e36d1d8430966947c0a5dacb4819a9b08caf6d000e7c21f82c0c77527f

data/fastlane/lib/fastlane/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
-  VERSION = '2.61.0'.freeze
+  VERSION = '2.62.0.beta.20171010010004'.freeze
   DESCRIPTION = "The easiest way to automate beta deployments and releases for your iOS and Android apps".freeze
   MINIMUM_XCODE_RELEASE = "7.0".freeze
 end

data/fastlane_core/lib/fastlane_core/itunes_transporter.rb

@@ -252,7 +252,7 @@ module FastlaneCore
     end
 
     def java_code_option
-      if Helper.xcode_at_least?(9)
+      if Helper.is_mac? && Helper.xcode_at_least?(9)
         return "-jar #{Helper.transporter_java_jar_path.shellescape}"
       else
         return "-classpath #{Helper.transporter_java_jar_path.shellescape} com.apple.transporter.Application"

data/spaceship/lib/spaceship/du/du_client.rb

@@ -38,8 +38,8 @@ module Spaceship
       upload_file(app_version: app_version, upload_file: upload_file, path: '/upload/purple-video', content_provider_id: content_provider_id, sso_token: sso_token_for_video)
     end
 
-    def upload_trailer_preview(app_version, upload_file, content_provider_id, sso_token_for_image)
-      upload_file(app_version: app_version, upload_file: upload_file, path: '/upload/app-screenshot-image', content_provider_id: content_provider_id, sso_token: sso_token_for_image)
+    def upload_trailer_preview(app_version, upload_file, content_provider_id, sso_token_for_image, device)
+      upload_file(app_version: app_version, upload_file: upload_file, path: '/upload/image', content_provider_id: content_provider_id, sso_token: sso_token_for_image, du_validation_rule_set: screenshot_picture_type(device, nil))
     end
 
     private

data/spaceship/lib/spaceship/du/utilities.rb

@@ -66,8 +66,8 @@ module Spaceship
       video_infos = output.split("\n").select { |l| l =~ /Stream.*Video/ }
       raise "Unable to find Stream Video information from ffmpeg output of #{command}" if video_infos.count == 0
       video_info = video_infos[0]
-      res = video_info.match(/.* ([0-9]+)x([0-9]+),.*/)
-      raise "Unable to parse resolution information from #{video_info}" if res.count < 3
+      res = video_info.match(/.* ([0-9]+)x([0-9]+).*/)
+      raise "Unable to parse resolution information from #{video_info}" if res.size < 3
       [res[1].to_i, res[2].to_i]
     end
 

data/spaceship/lib/spaceship/tunes/app_version.rb

@@ -516,30 +516,34 @@ module Spaceship
         setup_screenshots
       end
 
-      # Uploads, removes a trailer video or change its preview image
+      # Uploads, removes a trailer video
       #
       # A preview image for the video is required by ITC and is usually automatically extracted by your browser.
-      # This method will either automatically extract it from the video (using `ffmpeg) or allow you
+      # This method will either automatically extract it from the video (using `ffmpeg`) or allow you
       # to specify it using +preview_image_path+.
-      # If the preview image is specified, ffmpeg` will ot be used. The image resolution will be checked against
+      # If the preview image is specified, `ffmpeg` will not be used. The image resolution will be checked against
       # expectations (which might be different from the trailer resolution.
       #
       # It is recommended to extract the preview image using the spaceship related tools in order to ensure
       # the appropriate format and resolution are used.
       #
-      # Note: if the video is already set, the +trailer_path+ is only used to grab the preview screenshot.
       # Note: to extract its resolution and a screenshot preview, the `ffmpeg` tool will be used
       #
-      # @param icon_path (String): The path to the screenshot. Use nil to remove it
+      # @param trailer_path (String): The path to the trailer. Use nil to remove it
       # @param sort_order (Fixnum): The sort_order, from 1 to 5
       # @param language (String): The language for this screenshot
       # @param device (String): The device for this screenshot
       # @param timestamp (String): The optional timestamp of the screenshot to grab
-      def upload_trailer!(trailer_path, language, device, timestamp = "05.00", preview_image_path = nil)
+      # @param preview_image_path (String): The optional image path for the video preview
+      def upload_trailer!(trailer_path, sort_order, language, device, timestamp = "05.00", preview_image_path = nil)
         raise "No app trailer supported for iphone35" if device == 'iphone35'
+        raise "sort_order must be higher than 0" unless sort_order > 0
+        raise "sort_order must not be > 3" if sort_order > 3
 
-        device_lang_trailer = trailer_data_for_language_and_device(language, device, is_messages)
-        if trailer_path # adding / replacing trailer / replacing preview
+        device_lang_trailers = trailer_data_for_language_and_device(language, device)["value"]
+        existing_sort_orders = device_lang_trailers.map { |s| s["value"]["sortPosition"] }
+
+        if trailer_path # adding / replacing trailer
           raise "Invalid timestamp #{timestamp}" if (timestamp =~ /^[0-9][0-9].[0-9][0-9]$/).nil?
 
           if preview_image_path
@@ -551,33 +555,38 @@ module Spaceship
             video_preview_path = Utilities.grab_video_preview(trailer_path, timestamp, video_preview_resolution)
           end
           video_preview_file = UploadFile.from_path video_preview_path
-          video_preview_data = client.upload_trailer_preview(self, video_preview_file)
-
-          trailer = device_lang_trailer["value"]
-          if trailer.nil? # add trailer
-            upload_file = UploadFile.from_path trailer_path
-            trailer_data = client.upload_trailer(self, upload_file)
-            trailer_data = trailer_data['responses'][0]
-            trailer = {
-                "videoAssetToken" => trailer_data["token"],
-                "descriptionXML" => trailer_data["descriptionDoc"],
-                "contentType" => upload_file.content_type
-            }
-            device_lang_trailer["value"] = trailer
-          end
-          # add / update preview
-          # different format required
+          video_preview_data = client.upload_trailer_preview(self, video_preview_file, device)
+
+          upload_file = UploadFile.from_path trailer_path
+          trailer_data = client.upload_trailer(self, upload_file)
+
           ts = "00:00:#{timestamp}"
           ts[8] = ':'
 
-          trailer.merge!({
-            "pictureAssetToken" => video_preview_data["token"],
-            "previewFrameTimeCode" => ts.to_s,
-            "isPortrait" => Utilities.portrait?(video_preview_path)
-          })
+          new_trailer = {
+            "value" => {
+              "videoAssetToken" => trailer_data["responses"][0]["token"],
+              "descriptionXML" => trailer_data["responses"][0]["descriptionDoc"],
+              "contentType" => upload_file.content_type,
+              "sortPosition" => sort_order,
+              "size" => video_preview_data["length"],
+              "width" => video_preview_data["width"],
+              "height" => video_preview_data["height"],
+              "checksum" => video_preview_data["md5"],
+              "pictureAssetToken" => video_preview_data["token"],
+              "previewFrameTimeCode" => ts.to_s,
+              "isPortrait" => Utilities.portrait?(video_preview_path)
+            }
+          }
+
+          if existing_sort_orders.include?(sort_order) # replace
+            device_lang_trailers[existing_sort_orders.index(sort_order)] = new_trailer
+          else # add
+            device_lang_trailers << new_trailer
+          end
         else # removing trailer
-          raise "cannot remove non existing trailer" if device_lang_trailer["value"].nil?
-          device_lang_trailer["value"] = nil
+          raise "cannot remove trailer with non existing sort_order" unless existing_sort_orders.include?(sort_order)
+          device_lang_trailers.delete_at(existing_sort_orders.index(sort_order))
         end
         setup_trailers
       end
@@ -657,7 +666,7 @@ module Spaceship
       end
 
       def trailer_data_for_language_and_device(language, device)
-        container_data_for_language_and_device("appTrailers", language, device)
+        container_data_for_language_and_device("trailers", language, device)
       end
 
       def container_data_for_language_and_device(data_field, language, device)
@@ -838,15 +847,14 @@ module Spaceship
         result = []
 
         display_families.each do |display_family|
-          trailer_raw = display_family["trailer"]
-          next if trailer_raw.nil?
-          trailer_data = trailer_raw["value"]
-          next if trailer_data.nil?
-          data = {
-            device_type: display_family['name'],
-            language: row["language"]
-          }.merge(trailer_data)
-          result << Tunes::AppTrailer.factory(data)
+          display_family.fetch("trailers", {}).fetch("value", []).each do |trailer|
+            trailer_data = trailer["value"]
+            data = {
+              device_type: display_family['name'],
+              language: row["language"]
+            }.merge(trailer_data)
+            result << Tunes::AppTrailer.factory(data)
+          end
         end
 
         return result

data/spaceship/lib/spaceship/tunes/tunes_client.rb

@@ -672,12 +672,14 @@ module Spaceship
     # Uploads the trailer preview
     # @param app_version (AppVersion): The version of your app
     # @param upload_trailer_preview (UploadFile): The trailer preview to upload
+    # @param device (string): The target device
     # @return [JSON] the response
-    def upload_trailer_preview(app_version, upload_trailer_preview)
+    def upload_trailer_preview(app_version, upload_trailer_preview, device)
       raise "app_version is required" unless app_version
       raise "upload_trailer_preview is required" unless upload_trailer_preview
+      raise "device is required" unless device
 
-      du_client.upload_trailer_preview(app_version, upload_trailer_preview, content_provider_id, sso_token_for_image)
+      du_client.upload_trailer_preview(app_version, upload_trailer_preview, content_provider_id, sso_token_for_image, device)
     end
 
     # Fetches the App Version Reference information from ITC

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.61.0
+  version: 2.62.0.beta.20171010010004
 platform: ruby
 authors:
 - Felix Krause
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-09 00:00:00.000000000 Z
+date: 2017-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-notifier
@@ -828,8 +828,6 @@ files:
 - deliver/lib/deliver/upload_price_tier.rb
 - deliver/lib/deliver/upload_screenshots.rb
 - fastlane/README.md
-- fastlane/lib/.DS_Store
-- fastlane/lib/assets/.DS_Store
 - fastlane/lib/assets/ActionDetails.md.erb
 - fastlane/lib/assets/Actions.md.erb
 - fastlane/lib/assets/AppfileTemplate
@@ -847,10 +845,8 @@ files:
 - fastlane/lib/assets/s3_plist_template.erb
 - fastlane/lib/assets/s3_version_template.erb
 - fastlane/lib/fastlane.rb
-- fastlane/lib/fastlane/.DS_Store
 - fastlane/lib/fastlane/action.rb
 - fastlane/lib/fastlane/action_collector.rb
-- fastlane/lib/fastlane/actions/.DS_Store
 - fastlane/lib/fastlane/actions/README.md
 - fastlane/lib/fastlane/actions/actions_helper.rb
 - fastlane/lib/fastlane/actions/adb.rb
@@ -895,7 +891,6 @@ files:
 - fastlane/lib/fastlane/actions/deliver.rb
 - fastlane/lib/fastlane/actions/deploygate.rb
 - fastlane/lib/fastlane/actions/device_grid/README.md
-- fastlane/lib/fastlane/actions/docs/.DS_Store
 - fastlane/lib/fastlane/actions/docs/assets/FrameitGit.gif
 - fastlane/lib/fastlane/actions/docs/assets/MacExample.png
 - fastlane/lib/fastlane/actions/docs/assets/PEMRecording.gif
@@ -1502,24 +1497,24 @@ metadata:
 post_install_message: 
 rdoc_options: []
 require_paths:
-- cert/lib
-- credentials_manager/lib
-- deliver/lib
+- spaceship/lib
+- scan/lib
+- sigh/lib
+- snapshot/lib
+- screengrab/lib
 - fastlane/lib
-- fastlane_core/lib
-- frameit/lib
+- cert/lib
+- pem/lib
 - gym/lib
+- produce/lib
+- deliver/lib
+- supply/lib
 - match/lib
-- pem/lib
+- frameit/lib
+- credentials_manager/lib
 - pilot/lib
 - precheck/lib
-- produce/lib
-- scan/lib
-- screengrab/lib
-- sigh/lib
-- snapshot/lib
-- spaceship/lib
-- supply/lib
+- fastlane_core/lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -1527,15 +1522,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: The easiest way to automate beta deployments and releases for your iOS and
   Android apps
 test_files: []
-has_rdoc: