fastlane 2.124.0.beta.20190525200111 → 2.124.0.beta.20190526200015

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a464691cf02d07359a5eac3a1299aa93c26d14c7
-  data.tar.gz: 4598377045732f46e631fe8e12cd695ebc28aab0
+  metadata.gz: d04c10e35793561326bc8281c1fa8db42df855f6
+  data.tar.gz: 82e2d423fad919004f417a343b315403726b80be
 SHA512:
-  metadata.gz: 27ff3477d38ba1d40b1f502700c93841261a9a456b9c43c812f91d6da82896c68331ca5f648bbc00ab19be5ac56cd4121ac52508f45cdfc55693af08bd76d217
-  data.tar.gz: 0f00032043a7d87fbcb4557a02b21ec7fdf129dd22c6c69042c23a1cf699bdabbf2037ac5e4c48b41d40d41626a2201d28cce72e4ee3fdc7f71a870efb51780b
+  metadata.gz: 0dfa9191fa30742a0046c4dc6e0cafb7f2e3775a78f1cd08c745f379d6e405bdccc37e79ec1bbe8eaffe09a014d0a8634a273338b0b32fdeff34988d07209bb6
+  data.tar.gz: 74b252dd3e079268e1d8b6e1f39977005837a96feaa414c5dbe689c271db1fcc34a3e4cd38c4c4e51fb590c2808c19d6f3ec021e6f8c4ebcb0cc2929e0a56542

data/fastlane/lib/fastlane/actions/create_keychain.rb

@@ -52,20 +52,37 @@ module Fastlane
         commands << Fastlane::Actions.sh(command, log: false)
 
         if params[:add_to_search_list]
-          keychains = Action.sh("security list-keychains -d user").shellsplit
-          keychains << File.expand_path(keychain_path)
-          commands << Fastlane::Actions.sh("security list-keychains -s #{keychains.shelljoin}", log: false)
+          keychains = list_keychains
+          expanded_path = resolved_keychain_path(keychain_path)
+          if keychains.include?(expanded_path)
+            UI.important("Found keychain '#{expanded_path}' in list-keychains, adding to search list skipped")
+          else
+            keychains << expanded_path
+            commands << Fastlane::Actions.sh("security list-keychains -s #{keychains.shelljoin}", log: false)
+          end
         end
 
         commands
       end
 
+      def self.list_keychains
+        Action.sh("security list-keychains -d user").shellsplit
+      end
+
       def self.exists?(keychain_path)
+        !resolved_keychain_path(keychain_path).nil?
+      end
+
+      # returns the expanded and resolved path for the keychain, or nil if not found
+      def self.resolved_keychain_path(keychain_path)
         keychain_path = File.expand_path(keychain_path)
 
         # Creating Keychains using the security
         # CLI appends `-db` to the file name.
-        File.exist?("#{keychain_path}-db") || File.exist?(keychain_path)
+        ["#{keychain_path}-db", keychain_path].each do |path|
+          return path if File.exist?(path)
+        end
+        nil
       end
 
       def self.description

data/fastlane/lib/fastlane/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
-  VERSION = '2.124.0.beta.20190525200111'.freeze
+  VERSION = '2.124.0.beta.20190526200015'.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/supply/lib/supply/client.rb

@@ -120,7 +120,7 @@ module Supply
           private_key: key.to_s,
           client_email: params[:issuer]
         }
-        service_account_json = StringIO.new(MultiJson.dump(cred_json))
+        service_account_json = StringIO.new(JSON.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")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.124.0.beta.20190525200111
+  version: 2.124.0.beta.20190526200015
 platform: ruby
 authors:
 - Helmut Januschka
@@ -27,7 +27,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-25 00:00:00.000000000 Z
+date: 2019-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-notifier
@@ -441,20 +441,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.5.1
-- !ruby/object:Gem::Dependency
-  name: multi_json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: multi_xml
   requirement: !ruby/object:Gem::Requirement
@@ -1707,24 +1693,24 @@ metadata:
 post_install_message: 
 rdoc_options: []
 require_paths:
-- deliver/lib
+- credentials_manager/lib
 - gym/lib
-- sigh/lib
-- produce/lib
-- screengrab/lib
-- frameit/lib
-- fastlane/lib
 - precheck/lib
-- snapshot/lib
-- credentials_manager/lib
-- pem/lib
-- spaceship/lib
 - scan/lib
-- supply/lib
 - cert/lib
-- pilot/lib
+- fastlane/lib
 - fastlane_core/lib
+- deliver/lib
+- pilot/lib
+- screengrab/lib
+- supply/lib
+- pem/lib
+- spaceship/lib
+- produce/lib
 - match/lib
+- snapshot/lib
+- frameit/lib
+- sigh/lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="