fastlane 2.60.0.beta.20170928010003 → 2.60.0.beta.20170929010003

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a117dfadb97e085078b4d4e3ba30f5ee7798cd7c
-  data.tar.gz: bf439ccb3619b512a582552e6d416eb38f51c28d
+  metadata.gz: 7e2b625eec3f6079e6ea051b4aeec19b62bd46c0
+  data.tar.gz: 201f2ed13b94513815409ff0dfddf46b345b5ac2
 SHA512:
-  metadata.gz: 0d2c4f64c34ea4009750ed2527695ef0d4084ad898b9caaf518f406798c801ab5dc5635172755aac205bbe3b3d37b2991fd4e0f7142665b9780b76ab7b13eb57
-  data.tar.gz: 412909c21d02b981eed2189b1db21b59158ad081a66ac7ee13b2685e08e95238c79dfbdcb8c1e0d8da215facfc51c330e8938400c2b24101d3965d5cd964e9ae
+  metadata.gz: 40844f37dac26559d5249499421b8c75190d070b5f9c961500ad4f8dca1f1d3356887b4abe8789bd7428f2c20b12e26deaedad87c78e5527557953f9d0d5bce1
+  data.tar.gz: 3c75a122cb56b8d1453b7b39f20e2b837aca7ff0d50ca29248780bb70c2cbba868cbdcb00fe14bb7310265485b8b24d85cdeaae7ec628833dbbb0509df1e5dd8

data/fastlane/lib/fastlane/actions/update_fastlane.rb

@@ -24,7 +24,8 @@ module Fastlane
         updater.options[:prerelease] = true if options[:nightly]
         cleaner = Gem::CommandManager.instance[:cleanup]
 
-        sudo_needed = !File.writable?(Gem.dir)
+        gem_dir = ENV['GEM_HOME'] || Gem.dir
+        sudo_needed = !File.writable?(gem_dir)
 
         if sudo_needed
           UI.important("It seems that your Gem directory is not writable by your current User.")

data/fastlane/lib/fastlane/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
-  VERSION = '2.60.0.beta.20170928010003'.freeze
+  VERSION = '2.60.0.beta.20170929010003'.freeze
   DESCRIPTION = "The easiest way to automate beta deployments and releases for your iOS and Android apps".freeze
   MINIMUM_XCODE_RELEASE = "7.0".freeze
 end

data/gym/lib/gym/code_signing_mapping.rb

@@ -69,7 +69,7 @@ module Gym
     # We do some `gsub`bing, because we can't really know the profile type, so we'll just look at the name and see if it includes
     # the export method (which it usually does, but with different notations)
     def app_identifier_contains?(str, contains)
-      return str.to_s.gsub("-", "").gsub(" ", "").downcase.include?(contains.to_s.gsub("-", "").gsub(" ", "").downcase)
+      return str.to_s.gsub("-", "").gsub(" ", "").gsub("InHouse", "enterprise").downcase.include?(contains.to_s.gsub("-", "").gsub(" ", "").downcase)
     end
 
     # Array of paths to all project files
@@ -104,6 +104,21 @@ module Gym
       return (!build_settings["TEST_TARGET_NAME"].nil? || !build_settings["TEST_HOST"].nil?)
     end
 
+    def same_platform?(sdkroot)
+      destination = Gym.config[:destination].dup
+      destination.slice!("generic/platform=")
+      destination_sdkroot = []
+      case destination
+      when "macosx"
+        destination_sdkroot = ["macosx"]
+      when "iOS"
+        destination_sdkroot = ["iphoneos", "watchos"]
+      when "tvOS"
+        destination_sdkroot = ["appletvos"]
+      end
+      return destination_sdkroot.include?(sdkroot)
+    end
+
     def detect_project_profile_mapping
       provisioning_profile_mapping = {}
       specified_configuration = Gym.config[:configuration] || Gym.project.default_build_settings(key: "CONFIGURATION")
@@ -122,6 +137,8 @@ module Gym
             target.build_configuration_list.build_configurations.each do |build_configuration|
               current = build_configuration.build_settings
               next if test_target?(current)
+              sdkroot = build_configuration.resolve_build_setting("SDKROOT")
+              next unless same_platform?(sdkroot)
               next unless specified_configuration == build_configuration.name
 
               bundle_identifier = build_configuration.resolve_build_setting("PRODUCT_BUNDLE_IDENTIFIER")

data/gym/lib/gym/detect_values.rb

@@ -14,8 +14,6 @@ module Gym
       FastlaneCore::Project.detect_projects(config)
       Gym.project = FastlaneCore::Project.new(config)
 
-      detect_selected_provisioning_profiles
-
       # Go into the project's folder, as there might be a Gymfile there
       Dir.chdir(File.expand_path("..", Gym.project.path)) do
         config.load_configuration_file(Gym.gymfile_name)
@@ -23,6 +21,7 @@ module Gym
 
       detect_scheme
       detect_platform # we can only do that *after* we have the scheme
+      detect_selected_provisioning_profiles # we can only do that *aftet* we have the platform
       detect_configuration
       detect_toolchain
 
@@ -37,10 +36,9 @@ module Gym
       day = Time.now.strftime("%F") # e.g. 2015-08-07
       archive_path = File.expand_path("~/Library/Developer/Xcode/Archives/#{day}/")
 
-      path = xcode_preference_plist_path
-      return archive_path unless File.exist?(path.to_s) # this file only exists when you edit the Xcode preferences to set custom values
+      return archive_path unless has_xcode_preferences_plist?
 
-      custom_archive_path = xcode_preferences_dictionary(path)['IDECustomDistributionArchivesLocation']
+      custom_archive_path = xcode_preferences_dictionary['IDECustomDistributionArchivesLocation']
       return archive_path if custom_archive_path.to_s.length == 0
 
       return File.join(custom_archive_path, day)
@@ -48,11 +46,16 @@ module Gym
 
     # Helper Methods
 
+    # this file only exists when you edit the Xcode preferences to set custom values
+    def self.has_xcode_preferences_plist?
+      File.exist?(xcode_preference_plist_path)
+    end
+
     def self.xcode_preference_plist_path
       File.expand_path("~/Library/Preferences/com.apple.dt.Xcode.plist")
     end
 
-    def self.xcode_preferences_dictionary(path)
+    def self.xcode_preferences_dictionary(path = xcode_preference_plist_path)
       CFPropertyList.native_types(CFPropertyList::List.new(file: path).value)
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.60.0.beta.20170928010003
+  version: 2.60.0.beta.20170929010003
 platform: ruby
 authors:
 - Felix Krause
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-28 00:00:00.000000000 Z
+date: 2017-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-notifier