fastlane 2.117.0.beta.20190218200024 → 2.117.0.beta.20190219200042

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31414b6c832d116b909e570b6f6faad4176a3325
-  data.tar.gz: 4b1a32857a14184f3b4e15119841615c24bd837d
+  metadata.gz: de7affcfda093c1572ac2416c8e9c06510b0cae8
+  data.tar.gz: b22849e73ef30dc31e4dd5f2d24383041e3179c3
 SHA512:
-  metadata.gz: 6e1d37be2b97176c135a3b8ea59400154a657fbd37a71e283f30c5149af96f52eb699cd75fcfe3b2e2cd51fc00cb7f725e7bd714772a39756add2a0cf79b5f43
-  data.tar.gz: 88992eeb7dd611d8587cd0bb7b64e66061c5cd00da078c301dc3b6c627863bf577f1816b28589c78ac1291cb1d86bd8a0d2e634a116fa59f785f122a33bef9ea
+  metadata.gz: 5fc379cc5370ea5a669f5e98d84bf2c4da3befad996743837d917d9c0b7475bf921e85bd83a045d6782c5ac6041e8edad4bcbed802e91785ba1758d087338d53
+  data.tar.gz: a28d03cdd26cea8e7112275432e3f2c2c11a178406ae04ab6c41974331a097b261437d795a343f2ee3c746c4307bdb00ef2e0d20e564236c082107e02394545e

data/fastlane/lib/fastlane/actions/modify_services.rb

@@ -4,16 +4,14 @@ module Fastlane
       def self.run(params)
         require 'produce'
 
-        return if Helper.test?
-
         Produce.config = params
 
         Dir.chdir(FastlaneCore::FastlaneFolder.path || Dir.pwd) do
           require 'produce/service'
           services = params[:services]
 
-          enabled_services = services.reject { |k, v| v == 'off' }
-          disabled_services = services.select { |k, v| v == 'off' }
+          enabled_services = services.select { |_k, v| v == true || v.to_s == 'on' }.map { |k, v| [k, 'on'] }.to_h
+          disabled_services = services.reject { |_k, v| v == true || v.to_s == 'on' }.map { |k, v| [k, 'off'] }.to_h
 
           enabled_services_object = self.service_object
           enabled_services.each do |k, v|
@@ -72,7 +70,7 @@ module Fastlane
 
       def self.allowed_services_description
         return Produce::DeveloperCenter::ALLOWED_SERVICES.map do |k, v|
-          "#{k}: (#{v.join('|')})"
+          "#{k}: (#{v.join('|')})(:on|:off)(true|false)"
         end.join(", ")
       end
 
@@ -158,9 +156,12 @@ module Fastlane
             app_identifier: "com.someorg.app",
             services: {
               push_notification: "on",
-              associated_domains: "off"
-            }
-          )'
+              associated_domains: "off",
+              wallet: :on,
+              apple_pay: :off,
+              data_protection: true,
+              multipath: false
+            })'
         ]
       end
 

data/fastlane/lib/fastlane/actions/prompt.rb

@@ -17,7 +17,8 @@ module Fastlane
           UI.important("Submit inputs using \"#{params[:multi_line_end_keyword]}\"")
           user_input = ""
           loop do
-            line = STDIN.gets
+            line = STDIN.gets # returns `nil` if called at end of file
+            break unless line
             end_tag_index = line.index(end_tag)
             if end_tag_index.nil?
               user_input << line

data/fastlane/lib/fastlane/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
-  VERSION = '2.117.0.beta.20190218200024'.freeze
+  VERSION = '2.117.0.beta.20190219200042'.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/pilot/lib/pilot/options.rb

@@ -51,12 +51,12 @@ module Pilot
                                      short_option: "-w",
                                      optional: true,
                                      env_name: "PILOT_CHANGELOG",
-                                     description: "Provide the 'what's new' text when uploading a new build"),
+                                     description: "Provide the 'What to Test' text when uploading a new build. `skip_waiting_for_build_processing: false` is required to set the changelog"),
         FastlaneCore::ConfigItem.new(key: :beta_app_description,
                                      short_option: "-d",
                                      optional: true,
                                      env_name: "PILOT_BETA_APP_DESCRIPTION",
-                                     description: "Provide the beta app description when uploading a new build"),
+                                     description: "Provide the 'Beta App Description' when uploading a new build"),
         FastlaneCore::ConfigItem.new(key: :beta_app_feedback_email,
                                      short_option: "-n",
                                      optional: true,

data/supply/lib/supply/client.rb

@@ -13,13 +13,24 @@ module Supply
     attr_accessor :client
 
     def self.make_from_config(params: nil)
-      unless params[:json_key] || params[:json_key_data]
-        UI.important("To not be asked about this value, you can specify it using 'json_key'")
-        json_key_path = UI.input("The service account json file used to authenticate with Google: ")
-        json_key_path = File.expand_path(json_key_path)
+      params ||= Supply.config
+      service_account_data = self.service_account_authentication(params: params)
+      return self.new(service_account_json: service_account_data, params: params)
+    end
 
-        UI.user_error!("Could not find service account json file at path '#{json_key_path}'") unless File.exist?(json_key_path)
-        params[:json_key] = json_key_path
+    # Supply authentication file
+    def self.service_account_authentication(params: nil)
+      unless params[:json_key] || params[:json_key_data]
+        if UI.interactive?
+          UI.important("To not be asked about this value, you can specify it using 'json_key'")
+          json_key_path = UI.input("The service account json file used to authenticate with Google: ")
+          json_key_path = File.expand_path(json_key_path)
+
+          UI.user_error!("Could not find service account json file at path '#{json_key_path}'") unless File.exist?(json_key_path)
+          params[:json_key] = json_key_path
+        else
+          UI.user_error!("Could not load Google authentication. Make sure it has been added as an environment variable in 'json_key' or 'json_key_data'")
+        end
       end
 
       if params[:json_key]
@@ -28,7 +39,7 @@ module Supply
         service_account_json = StringIO.new(params[:json_key_data])
       end
 
-      return self.new(service_account_json: service_account_json, params: params)
+      service_account_json
     end
 
     # Initializes the service and its auth_client using the specified information
@@ -86,40 +97,22 @@ module Supply
     # @!group Login
     #####################################################
 
-    # instantiate a client given the supplied configuration
-    def self.make_from_config(params: nil)
-      if params.nil?
-        params = Supply.config
-      end
-
-      # first consider deprecated params
-      unless params[:json_key] || params[:json_key_data] || (params[:key] && params[:issuer])
-        UI.important("To not be asked about this value, you can specify it using 'json_key'")
-        params[:json_key] = UI.input("The service account json file used to authenticate with Google: ")
-      end
-
-      super(params: params)
-    end
-
-    # Initializes the client and its auth_client using the specified information
-    # @param service_account_json: The raw service account Json data
-    # @param path_to_key: The path to your p12 file (@deprecated)
-    # @param issuer: Email address for oauth (@deprecated)
-    def initialize(path_to_key: nil, issuer: nil, service_account_json: nil, params: nil)
-      if service_account_json
-        key_io = service_account_json
-      else
-        # deprecated
+    def self.service_account_authentication(params: nil)
+      if params[:json_key] || params[:json_key_data]
+        super(params: params)
+      elsif params[:key] && params[:issuer]
         require 'google/api_client/auth/key_utils'
-        key = Google::APIClient::KeyUtils.load_from_pkcs12(File.expand_path(path_to_key), 'notasecret')
+        UI.important("This type of authentication is deprecated. Please consider using JSON authentication instead")
+        key = Google::APIClient::KeyUtils.load_from_pkcs12(File.expand_path(params[:key]), 'notasecret')
         cred_json = {
           private_key: key.to_s,
-          client_email: issuer
+          client_email: params[:issuer]
         }
-        key_io = StringIO.new(MultiJson.dump(cred_json))
+        service_account_json = StringIO.new(MultiJson.dump(cred_json))
+        service_account_json
+      else
+        UI.user_error!("No authentication parameters were specified. These must be provided in order to authenticate with Google")
       end
-
-      super(service_account_json: key_io, params: params)
     end
 
     #####################################################

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.117.0.beta.20190218200024
+  version: 2.117.0.beta.20190219200042
 platform: ruby
 authors:
 - Olivier Halligon
@@ -27,7 +27,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-18 00:00:00.000000000 Z
+date: 2019-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-notifier
@@ -1687,24 +1687,24 @@ metadata:
 post_install_message: 
 rdoc_options: []
 require_paths:
-- spaceship/lib
+- sigh/lib
+- precheck/lib
+- pilot/lib
 - credentials_manager/lib
-- pem/lib
-- scan/lib
-- screengrab/lib
-- gym/lib
-- snapshot/lib
 - fastlane_core/lib
 - cert/lib
+- produce/lib
+- scan/lib
+- gym/lib
+- pem/lib
+- screengrab/lib
 - match/lib
+- spaceship/lib
+- fastlane/lib
+- snapshot/lib
 - frameit/lib
 - deliver/lib
-- fastlane/lib
 - supply/lib
-- pilot/lib
-- produce/lib
-- sigh/lib
-- precheck/lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="