fastlane 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: acbb31b6b342da9f2a15a22936808c0c93d68762
-  data.tar.gz: 21bd81ba701a4b11a2bf71d8cc8b41a20f4be78c
+  metadata.gz: 077c46f59f353134e4211ee252c92882a510b55c
+  data.tar.gz: 5cb94ef40a8470ae61fa22e069ea06242e8047af
 SHA512:
-  metadata.gz: 43b2ba4ba3613e9324522c76a6a081639d4ddb46d1a00d95c01c2a809e2d84c43525d09533102e7197fd4a4dedb288f40c1a90dcc5393def55ab3a15619d1317
-  data.tar.gz: e372a9675ae45e33aa649f620116ee257313679d692673ecc073f88fa134fdb382a787a4e430065a3a2d05847851532e2602b22d3db587c34795703ffb62e901
+  metadata.gz: 6f8bc8bb4fef49caa02096fabb87146c606296cd6b5f58019a0431a3529eb1539640be800c399dcaa231565ccaf9bb988161c2e23f84dff10f6f00816d9aee19
+  data.tar.gz: c605fb60e551e0840e83a084a25790cb38eb6916cb902d7fbfbf917e810d3258c9dac2555d25047d5a833782b1d2985d8a7c259a454e0d9a8a8205f432216a86

data/credentials_manager/lib/credentials_manager/appfile_config.rb

@@ -122,6 +122,10 @@ module CredentialsManager
       setter(:json_key_file, *args, &block)
     end
 
+    def json_key_data_raw(*args, &block)
+      setter(:json_key_data_raw, *args, &block)
+    end
+
     def issuer(*args, &block)
       puts "Appfile: DEPRECATED issuer: use json_key_file instead".red
       setter(:issuer, *args, &block)

data/deliver/lib/deliver/html_generator.rb

@@ -16,7 +16,7 @@ module Deliver
         UI.crash!("Could not render HTML page")
       end
       UI.important("Verifying the upload via the HTML file can be disabled by either adding")
-      UI.important("`force true` to your Deliverfile or using `deliver --force`")
+      UI.important("`force true` to your Deliverfile or using `fastlane deliver --force`")
 
       system("open '#{html_path}'")
       okay = UI.confirm("Does the Preview on path '#{html_path}' look okay for you?")

data/fastlane/lib/fastlane/environment_printer.rb

@@ -68,7 +68,7 @@ module Fastlane
           if Gem::Version.new(installed_version) == Gem::Version.new(latest_version)
             update_status = "✅ Up-To-Date"
           else
-            update_status = "🚫 Update availaible"
+            update_status = "🚫 Update available"
           end
         rescue
           update_status = "💥 Check failed"
@@ -112,7 +112,7 @@ module Fastlane
           if Gem::Version.new(current_gem.version) == Gem::Version.new(latest_version)
             update_status = "✅ Up-To-Date"
           else
-            update_status = "🚫 Update availaible"
+            update_status = "🚫 Update available"
           end
         rescue
           update_status = "💥 Check failed"

data/fastlane/lib/fastlane/fastlane_require.rb

@@ -45,7 +45,7 @@ module Fastlane
         # See https://github.com/fastlane/fastlane/issues/6951
         fork do
           begin
-            exit(1) unless require name
+            require name
           rescue LoadError
             exit(1)
           end

data/fastlane/lib/fastlane/version.rb

@@ -1,4 +1,4 @@
 module Fastlane
-  VERSION = '2.5.0'.freeze
+  VERSION = '2.6.0'.freeze
   DESCRIPTION = "The easiest way to automate beta deployments and releases for your iOS and Android apps".freeze
 end

data/fastlane_core/lib/fastlane_core/update_checker/update_checker.rb

@@ -155,7 +155,7 @@ module FastlaneCore
     # (optional) Returns the app identifier for the current tool
     # supply and screengrab use different param names and env variable patterns so we have to special case here
     # example:
-    #   supply --skip_upload_screenshots -a beta -p com.test.app should return com.test.app
+    #   fastlane supply --skip_upload_screenshots -a beta -p com.test.app should return com.test.app
     #   screengrab -a com.test.app should return com.test.app
     def self.android_app_identifier(args, gem_name)
       app_identifier = nil

data/frameit/lib/frameit/commands_generator.rb

@@ -27,7 +27,7 @@ module Frameit
       default_command :run
 
       command :run do |c|
-        c.syntax = 'frameit black'
+        c.syntax = 'fastlane frameit black'
         c.description = "Adds a black frame around all screenshots"
 
         c.action do |args, options|
@@ -37,7 +37,7 @@ module Frameit
       end
 
       command :silver do |c|
-        c.syntax = 'frameit silver'
+        c.syntax = 'fastlane frameit silver'
         c.description = "Adds a silver frame around all screenshots"
 
         c.action do |args, options|
@@ -47,7 +47,7 @@ module Frameit
       end
 
       command :gold do |c|
-        c.syntax = 'frameit gold'
+        c.syntax = 'fastlane frameit gold'
         c.description = "Adds a gold frame around all screenshots"
 
         c.action do |args, options|
@@ -57,7 +57,7 @@ module Frameit
       end
 
       command :rose_gold do |c|
-        c.syntax = 'frameit rose_gold'
+        c.syntax = 'fastlane frameit rose_gold'
         c.description = "Adds a rose gold frame around all screenshots"
 
         c.action do |args, options|
@@ -67,7 +67,7 @@ module Frameit
       end
 
       command :setup do |c|
-        c.syntax = 'frameit setup'
+        c.syntax = 'fastlane frameit setup'
         c.description = "Downloads and sets up the latest device frames"
 
         c.action do |args, options|
@@ -76,7 +76,7 @@ module Frameit
       end
 
       command :download_frames do |c|
-        c.syntax = 'frameit download_frames'
+        c.syntax = 'fastlane frameit download_frames'
         c.description = "Downloads and sets up the latest device frames"
 
         c.action do |args, options|

data/frameit/lib/frameit/editor.rb

@@ -22,8 +22,6 @@ module Frameit
         @image = complex_framing
       else
         # easy mode from 1.0 - no title or background
-        width = offset['width']
-        image.resize width # resize the image to fit the frame
         put_into_frame # put it in the frame
       end
 

data/frameit/lib/frameit/frame_downloader.rb

@@ -1,6 +1,5 @@
 module Frameit
   class FrameDownloader
-    FRAME_PATH = '.frameit/devices_frames_2'
     HOST_URL = "https://fastlane.github.io/frameit-frames"
 
     def download_frames
@@ -9,11 +8,10 @@ module Frameit
       require 'json'
       require 'fileutils'
 
-      UI.message("Downloading device frames...")
+      UI.message("Downloading device frames to '#{templates_path}'")
       FileUtils.mkdir_p(templates_path)
 
       frames_version = download_file("version.txt")
-      File.write(File.join(templates_path, "version.txt"), frames_version)
       UI.important("Using frame version '#{frames_version}', you can optionally lock that version in your Framefile.json using `device_frame_version`")
 
       files = JSON.parse(download_file("files.json"))
@@ -23,15 +21,26 @@ module Frameit
       end
       File.write(File.join(templates_path, "offsets.json"), download_file("offsets.json"))
 
+      # Write the version.txt at the very end to properly resume downloads
+      # if it's interrupted
+      File.write(File.join(templates_path, "version.txt"), frames_version)
+
       UI.success("Successfully downloaded all required image assets")
     end
 
     def frames_exist?(version: "latest")
-      Dir["#{templates_path}/*.png"].count > 0 && File.read(File.join(templates_path, "version.txt")).to_i > 0
+      version_path = File.join(templates_path, "version.txt")
+      version = File.read(version_path) if File.exist?(version_path)
+      Dir["#{templates_path}/*.png"].count > 0 && version.to_i > 0
     end
 
     def self.templates_path
-      File.join(ENV['HOME'], FRAME_PATH, Frameit.frames_version)
+      # Previously ~/.frameit/device_frames_2/x
+      legacy_path = File.join(ENV['HOME'], ".frameit/devices_frames_2", Frameit.frames_version)
+      return legacy_path if File.directory?(legacy_path)
+
+      # New path, being ~/.fastlane/frameit/x
+      return File.join(FastlaneCore.fastlane_user_dir, "frameit", Frameit.frames_version)
     end
 
     def templates_path

data/frameit/lib/frameit/template_finder.rb

@@ -19,12 +19,12 @@ module Frameit
           # Unfortunately not every device type is available in rose gold or gold
           # This is why we can't have nice things #yatusabes
           # fallback to a white iPhone, which looks similar
-          UI.important("Unfortunatey device type '#{screenshot.device_name}' is not available in #{screenshot.color}, falling back to silver...")
+          UI.important("Unfortunately device type '#{screenshot.device_name}' is not available in #{screenshot.color}, falling back to silver...")
           screenshot.color = Frameit::Color::SILVER
           return self.get_template(screenshot)
         else
           UI.error("Couldn't find template for screenshot type '#{filename}'")
-          UI.error("Please run `frameit download_frames` to download the latest frames")
+          UI.error("Please run `fastlane frameit download_frames` to download the latest frames")
         end
         return filename if Helper.test?
         return nil

data/gym/lib/assets/GymfileTemplate

@@ -2,7 +2,7 @@
 # https://github.com/fastlane/fastlane/tree/master/gym#gymfile
 
 # In general, you can use the options available
-# gym --help
+# fastlane gym --help
 
 # Remove the # in front of the line to enable the option
 

data/gym/lib/gym/xcodebuild_fixes/swift_fix.rb

@@ -45,7 +45,7 @@ module Gym
                 UI.important("try adding the following parameter to your gym call:")
                 UI.success("gym(toolchain: :swift_2_3)")
                 UI.message("or")
-                UI.success("gym --toolchain swift_2_3")
+                UI.success("fastlane gym --toolchain swift_2_3")
               end
 
               UI.user_error!(ex)

data/match/lib/assets/MatchfileTemplate

@@ -5,5 +5,5 @@ type "development" # The default type, can be: appstore, adhoc or development
 # app_identifier ["tools.fastlane.app", "tools.fastlane.app2"]
 # username "user@fastlane.tools" # Your Apple Developer Portal username
 
-# For all available options run `match --help`
+# For all available options run `fastlane match --help`
 # Remove the # in the beginning of the line to enable the other options

data/match/lib/match/spaceship_ensure.rb

@@ -11,7 +11,7 @@ module Match
       if keychain_entry.password(ask_if_missing: false).to_s.length == 0
         UI.important("You can also run `match` in readonly mode to not require any access to the")
         UI.important("Developer Portal. This way you only share the keys and credentials")
-        UI.command("match --readonly")
+        UI.command("fastlane match --readonly")
         UI.important("More information https://github.com/fastlane/fastlane/tree/master/match#access-control")
       end
 

data/pem/README.md

@@ -41,9 +41,7 @@ Tired of manually creating and maintaining your push notification profiles for y
 
 `pem` creates new .pem, .cer, and .p12 files to be uploaded to your push server if a valid push notification profile is needed. `pem` does not cover uploading the file to your server.
 
-To automate iOS Provisioning profiles you can use [sigh](https://github.com/fastlane/fastlane/tree/master/sigh).
-
-Get in contact with the developer on Twitter: [@FastlaneTools](https://twitter.com/FastlaneTools)
+To automate iOS Provisioning profiles you can use [match](https://github.com/fastlane/fastlane/tree/master/match).
 
 -------
 <p align="center">
@@ -62,7 +60,6 @@ Get in contact with the developer on Twitter: [@FastlaneTools](https://twitter.c
 # Features
 Well, it's actually just one: Generate the ```pem``` file for your server.
 
-
 Check out this gif:
 
 ![assets/PEMRecording.gif](assets/PEMRecording.gif)
@@ -87,7 +84,7 @@ This does the following:
 - Downloads the certificate
 - Generates a new ```.pem``` file in the current working directory, which you can upload to your server
 
-```pem``` will never revoke your existing certificates.
+Note that ```pem``` will never revoke your existing certificates. `pem` can't download any of your existing push certificates, as the private key is only available on the machine it was created on. 
 
 If you already have a push certificate enabled, which is active for at least 30 more days, `pem` will not create a new certificate. If you still want to create one, use the `force`:
 

data/pilot/README.md

@@ -248,7 +248,7 @@ fastlane pilot import -c ~/Desktop/testers.csv
 
 If you run into any issues you can use the `verbose` mode to get a more detailed output:
 
-    fastlane pilot --verbose
+    fastlane pilot upload --verbose
 
 ## Firewall Issues
 

data/scan/lib/assets/ScanfileTemplate

@@ -2,7 +2,7 @@
 # https://github.com/fastlane/fastlane/tree/master/scan#scanfile
 
 # In general, you can use the options available
-# scan --help
+# fastlane scan --help
 
 # Remove the # in front of the line to enable the option
 

data/scan/lib/scan/detect_values.rb

@@ -167,7 +167,7 @@ module Scan
     def self.detect_destination
       if Scan.config[:destination]
         UI.important("It's not recommended to set the `destination` value directly")
-        UI.important("Instead use the other options available in `scan --help`")
+        UI.important("Instead use the other options available in `fastlane scan --help`")
         UI.important("Using your value '#{Scan.config[:destination]}' for now")
         UI.important("because I trust you know what you're doing...")
         return

data/screengrab/lib/assets/ScreengrabfileTemplate

@@ -12,4 +12,4 @@ locales ['en-US', 'fr-FR', 'it-IT']
 clear_previous_screenshots true
 
 # For more information about all available options run
-#   screengrab --help
+#   fastlane screengrab --help

data/sigh/lib/sigh/runner.rb

@@ -174,7 +174,7 @@ module Sigh
       end
 
       if certificates.count > 1 and !Sigh.config[:development]
-        UI.important "Found more than one code signing identity. Choosing the first one. Check out `sigh --help` to see all available options."
+        UI.important "Found more than one code signing identity. Choosing the first one. Check out `fastlane sigh --help` to see all available options."
         UI.important "Available Code Signing Identities for current filters:"
         certificates.each do |c|
           str = ["\t- Name:", c.owner_name, "- ID:", c.id + " - Expires", c.expires.strftime("%d/%m/%Y")].join(" ")

data/snapshot/lib/assets/SnapfileTemplate

@@ -33,4 +33,4 @@ languages([
 # launch_arguments(["-favColor red"])
 
 # For more information about all available options run
-# snapshot --help
+# fastlane snapshot --help

data/spaceship/README.md

@@ -110,7 +110,7 @@ This requires you to install `pry` using `sudo gem install pry`. `pry` is not in
 
 ## 2 Step Verification
 
-When your Apple account has 2 factor verification enabled, you'll automatically be asked to verify your identity using your phone. The resulting session will be stored in `~/.spaceship/[email]/cookie`. The session should be valid for about one month, however there is no way to test this without actually waiting for over a month.
+When your Apple account has 2 factor verification enabled, you'll automatically be asked to verify your identity using your phone. The resulting session will be stored in `~/.fastlane/spaceship/[email]/cookie`. The session should be valid for about one month, however there is no way to test this without actually waiting for over a month.
 
 ### Support for CI machines
 

data/spaceship/lib/spaceship/client.rb

@@ -172,9 +172,9 @@ module Spaceship
       if ENV["SPACESHIP_COOKIE_PATH"]
         path = File.expand_path(File.join(ENV["SPACESHIP_COOKIE_PATH"], "spaceship", self.user, "cookie"))
       else
-        ["~/.spaceship", "/var/tmp/spaceship", "#{Dir.tmpdir}/spaceship"].each do |dir|
+        [File.join(FastlaneCore.fastlane_user_dir, "spaceship"), "~/.spaceship", "/var/tmp/spaceship", "#{Dir.tmpdir}/spaceship"].each do |dir|
           dir_parts = File.split(dir)
-          if directory_accessible?(dir_parts.first)
+          if directory_accessible?(File.expand_path(dir_parts.first))
             path = File.expand_path(File.join(dir, self.user, "cookie"))
             break
           end
@@ -362,8 +362,9 @@ module Spaceship
     def with_retry(tries = 5, &_block)
       return yield
     rescue Faraday::Error::ConnectionFailed, Faraday::Error::TimeoutError, AppleTimeoutError, Errno::EPIPE => ex # New Faraday version: Faraday::TimeoutError => ex
-      unless (tries -= 1).zero?
-        logger.warn("Timeout received: '#{ex.message}'.  Retrying after 3 seconds (remaining: #{tries})...")
+      tries -= 1
+      unless tries.zero?
+        logger.warn("Timeout received: '#{ex.message}'. Retrying after 3 seconds (remaining: #{tries})...")
         sleep 3 unless defined? SpecHelper
         retry
       end
@@ -373,6 +374,11 @@ module Spaceship
         msg = "Auth error received: '#{ex.message}'. Login in again then retrying after 3 seconds (remaining: #{tries})..."
         puts msg if $verbose
         logger.warn msg
+
+        if self.class.spaceship_session_env.to_s.length > 0
+          raise UnauthorizedAccessError.new, "Authentication error, you passed an invalid session using the environment variable FASTLANE_SESSION or SPACESHIP_SESSION"
+        end
+
         do_login(self.user, @password)
         sleep 3 unless defined? SpecHelper
         retry

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

@@ -574,14 +574,30 @@ module Spaceship
     # @!group Build Trains
     #####################################################
 
+    # rubocop:disable Metrics/BlockNesting
     # @param (testing_type) internal or external
-    def build_trains(app_id, testing_type, platform: nil)
+    def build_trains(app_id, testing_type, tries = 5, platform: nil)
       raise "app_id is required" unless app_id
       url = "ra/apps/#{app_id}/trains/?testingType=#{testing_type}"
       url += "&platform=#{platform}" unless platform.nil?
       r = request(:get, url)
-      parse_response(r, 'data')
+      return parse_response(r, 'data')
+    rescue Spaceship::Client::UnexpectedResponse => ex
+      # Build trains fail randomly very often
+      # we need to catch those errors and retry
+      # https://github.com/fastlane/fastlane/issues/6419
+      if ex.to_s.include?("ITC.response.error.OPERATION_FAILED")
+        tries -= 1
+        if tries > 0
+          logger.warn("Received temporary server error from iTunes Connect. Retrying the request...")
+          sleep 3 unless defined? SpecHelper
+          retry
+        end
+      end
+
+      raise Spaceship::Client::UnexpectedResponse, "Temporary iTunes Connect error: #{ex}"
     end
+    # rubocop:enable Metrics/BlockNesting
 
     def update_build_trains!(app_id, testing_type, data)
       raise "app_id is required" unless app_id
@@ -1003,7 +1019,7 @@ module Spaceship
       return yield
     rescue Spaceship::TunesClient::ITunesConnectTemporaryError => ex
       unless (tries -= 1).zero?
-        msg = "ITC temporary save error received: '#{ex.message}'. Retrying after 60 seconds (remaining: #{tries})..."
+        msg = "iTunes Connect temporary error received: '#{ex.message}'. Retrying after 60 seconds (remaining: #{tries})..."
         puts msg
         logger.warn msg
         sleep 60 unless defined? SpecHelper # unless FastlaneCore::Helper.is_test?

data/spaceship/lib/spaceship/two_step_client.rb

@@ -87,12 +87,11 @@ module Spaceship
     end
 
     def load_session_from_env
-      yaml_text = ENV["FASTLANE_SESSION"] || ENV["SPACESHIP_SESSION"]
-      return if yaml_text.to_s.length == 0
+      return if self.class.spaceship_session_env.to_s.length == 0
       puts "Loading session from environment variable" if $verbose
 
       file = Tempfile.new('cookie.yml')
-      file.write(yaml_text.gsub("\\n", "\n"))
+      file.write(self.class.spaceship_session_env.gsub("\\n", "\n"))
       file.close
 
       begin
@@ -106,6 +105,12 @@ module Spaceship
       end
     end
 
+    # Fetch the session cookie from the environment
+    # (if exists)
+    def self.spaceship_session_env
+      ENV["FASTLANE_SESSION"] || ENV["SPACESHIP_SESSION"]
+    end
+
     def select_device(r, device_id)
       # Request Token
       r = request(:put) do |req|

data/supply/lib/supply/client.rb

@@ -22,25 +22,30 @@ module Supply
 
     # instantiate a client given the supplied configuration
     def self.make_from_config
-      unless Supply.config[:json_key] || (Supply.config[:key] && Supply.config[:issuer])
+      unless Supply.config[:json_key] || Supply.config[:json_key_data] || (Supply.config[:key] && Supply.config[:issuer])
         UI.important("To not be asked about this value, you can specify it using 'json_key'")
         Supply.config[:json_key] = UI.input("The service account json file used to authenticate with Google: ")
       end
 
+      if Supply.config[:json_key]
+        service_account_json = File.open(File.expand_path(Supply.config[:json_key]))
+      elsif Supply.config[:json_key_data]
+        service_account_json = StringIO.new(Supply.config[:json_key_data])
+      end
+
       return Client.new(path_to_key: Supply.config[:key],
-                        issuer: Supply.config[:issuer],
-                        path_to_service_account_json: Supply.config[:json_key])
+                        issuer: Supply.config[:issuer], service_account_json: service_account_json)
     end
 
     # Initializes the android_publisher and its auth_client using the specified information
-    # @param path_to_service_account_json: The path to your service account Json file
+    # @param service_account_json: The raw service account Json data
     # @param path_to_key: The path to your p12 file (@deprecated)
     # @param issuer: Email addresss for oauth (@deprecated)
-    def initialize(path_to_key: nil, issuer: nil, path_to_service_account_json: nil)
+    def initialize(path_to_key: nil, issuer: nil, service_account_json: nil)
       scope = Androidpublisher::AUTH_ANDROIDPUBLISHER
 
-      if path_to_service_account_json
-        key_io = File.open(File.expand_path(path_to_service_account_json))
+      if service_account_json
+        key_io = service_account_json
       else
         require 'google/api_client/auth/key_utils'
         key = Google::APIClient::KeyUtils.load_from_pkcs12(File.expand_path(path_to_key), 'notasecret')

data/supply/lib/supply/options.rb

@@ -58,13 +58,27 @@ module Supply
         FastlaneCore::ConfigItem.new(key: :json_key,
                                      env_name: "SUPPLY_JSON_KEY",
                                      short_option: "-j",
-                                     conflicting_options: [:issuer, :key],
+                                     conflicting_options: [:issuer, :key, :json_key_data],
                                      optional: true, # this is shouldn't be optional but is until --key and --issuer are completely removed
                                      description: "The service account json file used to authenticate with Google",
                                      default_value: CredentialsManager::AppfileConfig.try_fetch_value(:json_key_file),
                                      verify_block: proc do |value|
                                        UI.user_error! "Could not find service account json file at path '#{File.expand_path(value)}'" unless File.exist?(File.expand_path(value))
                                      end),
+        FastlaneCore::ConfigItem.new(key: :json_key_data,
+                                     env_name: "SUPPLY_JSON_KEY_DATA",
+                                     short_option: "-c",
+                                     conflicting_options: [:issuer, :key, :json_key],
+                                     optional: true,
+                                     description: "The service account json used to authenticate with Google",
+                                     default_value: CredentialsManager::AppfileConfig.try_fetch_value(:json_key_data_raw),
+                                     verify_block: proc do |value|
+                                       begin
+                                         JSON.parse(value)
+                                       rescue JSON::ParserError
+                                         UI.user_error! "Could not parse service account json  JSON::ParseError"
+                                       end
+                                     end),
         FastlaneCore::ConfigItem.new(key: :apk,
                                      env_name: "SUPPLY_APK",
                                      description: "Path to the APK file to upload",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Felix Krause
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-04 00:00:00.000000000 Z
+date: 2017-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-notifier
@@ -312,14 +312,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement