fastlane 2.116.0.beta.20190131200016 → 2.116.0.beta.20190201200019

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14a8f56d226c291ee5d34ca5bb64a53b68bac250
-  data.tar.gz: 4e3b8d9e80c5adc44dff26815c0bc6944b6db3aa
+  metadata.gz: 3b190bb3cbf57f3c6c4fbff2c712c71e3c143391
+  data.tar.gz: 62fda1dafe44885e078babe3f05b14ff1af34857
 SHA512:
-  metadata.gz: 8726254d699ce0e015964994c1bb2d56796a827af3727fee399fee1563769854ff33993c0e747d671f3b8bbe8b90d4a794ace0f6e7443e2ccebdfe8a0341e3dd
-  data.tar.gz: d3055facc4583dd12fa9f8b524c8d6963db198930541384fa757b5ecfb929c888772767a0a1818e6f445309a61db4706a194e702ec471fcd1f34d12b17eedd44
+  metadata.gz: f56a55288d182c8ecd46962902884385c989e764bbd58b2de3a367fd3ad67d19a66cb93253b843e312ce5e83b006ade76caf72cf777cd21c4de2e3175a943b3a
+  data.tar.gz: 7887b15558375bd3a0de91f542fd69aa5689808e723f22ee233d22bb7c125e96f8f9b6526980326a438a405f834cfc0f0a7114956a5782d99bf1d7cadd14c9d5

data/fastlane/lib/fastlane/actions/docs/frame_screenshots.md

@@ -87,7 +87,7 @@ To download the latest frames
 fastlane frameit download_frames
 ```
 
-When using _frameit_ without titles on top, the screenshots will have the full resolution, which means they can't be uploaded to the App Store directly. They are supposed to be used for websites, print media and emails. Check out the section below to use the screenshots for the App Store.
+Note: When using _frameit_ without titles on top, the screenshots will have the full resolution, which means they can't be uploaded to the App Store directly. They are supposed to be used for websites, print media and emails. Check out the section below to use the screenshots for the App Store.
 
 ## Advanced Usage (optional)
 
@@ -100,7 +100,7 @@ A working example can be found in the [fastlane examples](https://github.com/fas
 ### `Framefile.json`
 
 The Framefile allows to define general and screenshot specific information.
-It has the following JSON structure:
+It has the following general JSON structure:
 
 ```json
 {
@@ -120,7 +120,7 @@ The general parameters are defined in the `default` key and can be:
 
 | Key | Description | Default value |
 |-----|-------------|---------------|
-| `background` | The background that should be used for the framed screenshot. Specify the (relative) path to the image file (e.g. *.jpg). This parameter is mandatory. | NA |
+| `background` | The background that should be used for the framed screenshot. Specify the (relative) path to the image file (e.g. `*.jpg`). This parameter is mandatory. | NA |
 | `keyword` | An object that contains up to 3 keys to describe the optional keyword. See [table](#keyword-and-title-parameters) below. | NA |
 | `title` | An object that contains up to 3 keys to describe the mandatory title. See [table](#keyword-and-title-parameters) below. | NA |
 | `stack_title` | Specifies whether _frameit_ should display the keyword above the title when both keyword and title are defined. If it is false, the title and keyword will be displayed side by side when both keyword and title are defined. | `false` |
@@ -129,6 +129,7 @@ The general parameters are defined in the `default` key and can be:
 | `padding` | The content of the framed screenshot will be resized to match the specified `padding` around all edges. The vertical padding is also applied between the text and the top or bottom (depending on `title_below_image`) of the device frame. <p> There are 3 different options of specyfying the padding: <p> 1. Default: An integer value that defines both horizontal and vertical padding in pixels. <br> 2. A string that defines (different) padding values in pixels for horizontal and vertical padding. The syntax is `"<horizontal>x<vertical>"`, e.g. `"30x60"`. <br> 3. A string that defines (different) padding values in percentage for horizontal and vertical padding. The syntax is `"<horizontal>%x<vertical>%"`, e.g. `"5%x10%"`. <br> **Note:** The percentage is calculated from the smallest image dimension (height or width). <p> A combination of option 2 and 3 is possible, e.g. `"5%x40"`. | `50` |
 | `interline_spacing` | Specifies whether _frameit_ should add or subtract this many pixels between the individual lines of text. This only applies to a multi-line `title` and/or `keyword` to expand or squash together the individual lines of text. | `0` |
 | `font_scale_factor` | Specifies whether _frameit_ should increase or decrease the font size of the text. | `0.1` |
+| `frame` | Overrides the color of the frame to be used. (Valid values are `BLACK, `WHITE`, `GOLD` and `ROSE_GOLD`) | NA |
 
 ### Specific parameters
 
@@ -140,6 +141,7 @@ These are defined in the `data` key. This is an array with the following keys fo
 | `filter` | This is mandatory to link the individual configuration to the screenshot, based on part of the file name. <p>Example:<br>If a screenshot is named `iPhone 8-Brainstorming.png` you can use value `Brainstorming` for `filter`.  If there are more than one `filter` matching an entry, they will all be applied in order (which means that the last one has the highest precedence). All other keys from that array element will only be applied on this specific screenshot. |
 | `keyword` | Similar use as in `default`, except that parameter `text` can be used here because it is screenshot specific. |
 | `title` | Similar use as in `default`, except that parameter `text` can be used here because it is screenshot specific. |
+| `frame` | Overrides the color of the frame to be used. (Valid values are `BLACK, `WHITE`, `GOLD` and `ROSE_GOLD`) | NA |
 
 ### <a name="keyword-and-title-parameters"></a>Framefile `keyword` and `title` parameters
 
@@ -168,7 +170,8 @@ The `keyword` and `title` parameters are both used in `default` and `data`. They
     "padding": 50,
     "show_complete_frame": false,
     "stack_title" : false,
-    "title_below_image": true
+    "title_below_image": true,
+    "frame": "WHITE"
   },
 
   "data": [
@@ -182,7 +185,8 @@ The `keyword` and `title` parameters are both used in `default` and `data`. They
       "filter": "Organizing",
       "keyword": {
         "color": "#feb909"
-      }
+      },
+      "frame": "ROSE_GOLD"
     },
     {
       "filter": "Sharing",
@@ -215,6 +219,48 @@ The `keyword.strings` and `title.strings` are standard `.strings` file you alrea
 - These `.strings` files **MUST** be utf-8 (UTF-8) or utf-16 encoded (UTF-16 BE with BOM). They also must begin with an empty line. If you are having trouble see [issue #1740](https://github.com/fastlane/fastlane/issues/1740)
 - You **MUST** provide a background if you want titles. _frameit_ will not add the tiles if a background is not specified.
 
+### Screenshot orientation
+
+By default _frameit_ adds a frame to your screenshot based on an orientation you took it. For a portrait (vertical orientation) it is going to add portrait frame and for a landscape (horizontal orientation) - landscape left (= [Home button on the left side](https://developer.apple.com/documentation/uikit/uiinterfaceorientation/landscapeleft)).
+
+One way to override the default behavior is editing the file name by adding `force_landscaperight` to the end.
+
+### `force_orientation_block`
+
+If the default behavior doesn't fit your needs and you don't want or can't rename your screenshots, you can customize _frameit_'s orientation behavior by setting a `force_orientation_block` parameter. The valid values are: `:landscape_left` (home button on the left side), `:landscape_right` (home button on the right side), `:portrait` (home button on the bottom), `nil` (home button on the right side).
+
+### Examples
+
+```ruby
+# It matches the filename to the framed device orientation
+frameit(
+  path: "./fastlane/screenshots",
+  force_orientation_block: proc do |filename|
+    case filename
+      when "iPad Pro (12.9-inch)-01LoginScreen" 
+        :landscape_right
+      when "iPhone 6 Plus-01LoginScreen"
+        :portrait
+      # and so on
+    end
+  end
+)
+```
+
+```ruby
+# It frames the screenshots in landscape right whenever the filename contains `landscape` word
+frameit(
+  silver: true,
+  path: "./fastlane/screenshots",
+  force_orientation_block: proc do |filename|
+    f = filename.downcase
+    if f.include?("landscape")
+      :landscape_right
+    end
+  end
+)
+```
+
 # Mac
 
 With _frameit_ it's possible to also frame macOS Application screenshots. You have to provide the following:
@@ -260,14 +306,6 @@ Check out [_snapshot_](https://docs.fastlane.tools/actions/snapshot/) to automat
 
 Use [_deliver_](https://docs.fastlane.tools/actions/deliver/) to upload iOS screenshots to App Store Connect, or [_supply_](https://docs.fastlane.tools/actions/supply/) to upload Android screenshots to Play Store completely automatically 🚀
 
-## Alternative location to store device_frames
-
-Device frames can also be stored in a ```./fastlane/screenshots/devices_frames``` directory if you prefer rather than in the ```~/.frameit/device_frames``` directory. If doing so please be aware that Apple's images are copyrighted and should not be redistributed as part of a repository so you may want to include them in your .gitignore file.
-
-## White background of frames
-
-Some stock images provided by Apple still have a white background instead of a transparent one. You'll have to edit the Photoshop file to remove the white background, delete the generated `.png` file and run `fastlane frameit` again.
-
 ## Use a clean status bar
 
 You can use [SimulatorStatusMagic](https://github.com/shinydevelopment/SimulatorStatusMagic) to clean up the status bar.

data/fastlane/lib/fastlane/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
-  VERSION = '2.116.0.beta.20190131200016'.freeze
+  VERSION = '2.116.0.beta.20190201200019'.freeze
   DESCRIPTION = "The easiest way to automate beta deployments and releases for your iOS and Android apps".freeze
   MINIMUM_XCODE_RELEASE = "7.0".freeze
   RUBOCOP_REQUIREMENT = '0.49.1'.freeze

data/spaceship/lib/spaceship/client.rb

@@ -595,6 +595,22 @@ module Spaceship
       ENV["FASTLANE_SESSION"] || ENV["SPACESHIP_SESSION"]
     end
 
+    # Get contract messages from App Store Connect's "olympus" endpoint
+    def fetch_program_license_agreement_messages
+      all_messages = []
+
+      messages_request = request(:get, "https://olympus.itunes.apple.com/v1/contractMessages")
+      body = messages_request.body
+      if body
+        body = JSON.parse(body) if body.kind_of?(String)
+        body.map do |messages|
+          all_messages.push(messages["message"])
+        end
+      end
+
+      return all_messages
+    end
+
     #####################################################
     # @!group Helpers
     #####################################################

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.116.0.beta.20190131200016
+  version: 2.116.0.beta.20190201200019
 platform: ruby
 authors:
 - Matthew Ellis
@@ -27,7 +27,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-31 00:00:00.000000000 Z
+date: 2019-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-notifier
@@ -1691,19 +1691,19 @@ require_paths:
 - match/lib
 - produce/lib
 - sigh/lib
-- credentials_manager/lib
+- scan/lib
 - cert/lib
-- screengrab/lib
-- spaceship/lib
 - pilot/lib
+- spaceship/lib
 - pem/lib
-- deliver/lib
 - frameit/lib
-- scan/lib
-- snapshot/lib
-- fastlane_core/lib
 - fastlane/lib
+- deliver/lib
 - supply/lib
+- screengrab/lib
+- snapshot/lib
+- fastlane_core/lib
+- credentials_manager/lib
 - precheck/lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements: