fastlane_core 0.56.0 → 0.57.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fb5e016f26ea8c79ccfce1e6348b0308cd4f45c
-  data.tar.gz: 540455c5f8de62f7f0751ca80d33f0327ae8a595
+  metadata.gz: dc2a968c27a615a4297d0f237179a993c0cff197
+  data.tar.gz: 41dfae26455a772ffc135daf191036578b4806f5
 SHA512:
-  metadata.gz: 03ba2421a8f5fa500423c5499ea8404557f6496d3a2a61b78c62b90cd522835e41ea1a9cb82005b76c41cd7aa8f0d449c48668ec97152480dda570453d1b58c3
-  data.tar.gz: 02feeb63c90f44d28dc6f5caba4231ff3ffdce0035f6208e543cbe2e01a228699d2aa033f50e46c32f43292349f404c338631b68677e4cf77a5657d00802f12f
+  metadata.gz: c94e21d69029ca79435960f5d8e5eb05b9e0ba95804acdc1a72510943f8309103cc84fd32de37e639213122ed61195b422b31090ee0f427e0bdf6bdb9436eed4
+  data.tar.gz: e411703427f991b513ae3599ecfc30946a76067af340c46f624b8b5ab7172df723f2a58a1c5c8821a1765caf00ff2c4b927d9ca14faaea038f361a70a44c177d

data/lib/fastlane_core/helper.rb

@@ -41,9 +41,9 @@ module FastlaneCore
 
     # Do we run from a bundled fastlane, which contains Ruby and OpenSSL?
     # Usually this means the fastlane directory is ~/.fastlane/bin/
-    # We set this value via the environment variable `SELF_CONTAINED`
+    # We set this value via the environment variable `FASTLANE_SELF_CONTAINED`
     def self.contained_fastlane?
-      ENV["SELF_CONTAINED"].to_s == "true"
+      ENV["FASTLANE_SELF_CONTAINED"].to_s == "true"
     end
 
     # @return [boolean] true if building in a known CI environment
@@ -151,6 +151,32 @@ module FastlaneCore
       return File.join(self.itms_path, 'bin', 'iTMSTransporter')
     end
 
+    def self.keychain_path(name)
+      # Existing code expects that a keychain name will be expanded into a default path to Libary/Keychains
+      # in the user's home directory. However, this will not allow the user to pass an absolute path
+      # for the keychain value
+      #
+      # So, if the passed value can't be resolved as a file in Library/Keychains, just use it as-is
+      # as the keychain path.
+      #
+      # We need to expand each path because File.exist? won't handle directories including ~ properly
+      #
+      # We also try to append `-db` at the end of the file path, as with Sierra the default Keychain name
+      # has changed for some users: https://github.com/fastlane/fastlane/issues/5649
+      #
+
+      keychain_paths = [
+        File.join(Dir.home, 'Library', 'Keychains', name),
+        File.join(Dir.home, 'Library', 'Keychains', "#{name}-db"),
+        name,
+        "#{name}-db"
+      ].map { |path| File.expand_path(path) }
+
+      keychain_path = keychain_paths.find { |path| File.exist?(path) }
+      UI.user_error!("Could not locate the provided keychain. Tried:\n\t#{keychain_paths.join("\n\t")}") unless keychain_path
+      keychain_path
+    end
+
     # @return the full path to the iTMSTransporter executable
     def self.itms_path
       return ENV["FASTLANE_ITUNES_TRANSPORTER_PATH"] if ENV["FASTLANE_ITUNES_TRANSPORTER_PATH"]

data/lib/fastlane_core/project.rb

@@ -173,21 +173,27 @@ module FastlaneCore
     end
 
     def mac?
-      # Some projects have different values... we have to look for all of them
-      return true if build_settings(key: "PLATFORM_NAME") == "macosx"
-      return true if build_settings(key: "PLATFORM_DISPLAY_NAME") == "macOS"
-      return true if build_settings(key: "PLATFORM_DISPLAY_NAME") == "OS X"
-      false
+      supported_platforms.include?(:macOS)
     end
 
     def tvos?
-      return true if build_settings(key: "PLATFORM_NAME").to_s.include? "appletv"
-      return true if build_settings(key: "PLATFORM_DISPLAY_NAME").to_s.include? "tvOS"
-      false
+      supported_platforms.include?(:tvOS)
     end
 
     def ios?
-      !mac? && !tvos?
+      supported_platforms.include?(:iOS)
+    end
+
+    def supported_platforms
+      supported_platforms = build_settings(key: "SUPPORTED_PLATFORMS").split
+      supported_platforms.map do |platform|
+        case platform
+        when "macosx" then :macOS
+        when "iphonesimulator", "iphoneos" then :iOS
+        when "watchsimulator", "watchos" then :watchOS
+        when "appletvsimulator", "appletvos" then :tvOS
+        end
+      end.uniq.compact
     end
 
     def xcodebuild_parameters
@@ -195,6 +201,7 @@ module FastlaneCore
       proj << "-workspace #{options[:workspace].shellescape}" if options[:workspace]
       proj << "-scheme #{options[:scheme].shellescape}" if options[:scheme]
       proj << "-project #{options[:project].shellescape}" if options[:project]
+      proj << "-configuration #{options[:configuration].shellescape}" if options[:configuration]
 
       return proj
     end

data/lib/fastlane_core/version.rb

@@ -1,3 +1,3 @@
 module FastlaneCore
-  VERSION = "0.56.0".freeze
+  VERSION = "0.57.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane_core
 version: !ruby/object:Gem::Version
-  version: 0.56.0
+  version: 0.57.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-16 00:00:00.000000000 Z
+date: 2016-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -434,7 +434,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Contains all shared code/dependencies of the fastlane.tools