fastlane_core 0.43.3 → 0.43.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dec70f9af0189cb95d059bf6235e5fdb06bdd566
-  data.tar.gz: 42c1c4810eec48f3485a90d68297f8904d7788b5
+  metadata.gz: 7667300e797c5d36feb9772963169a2510da304c
+  data.tar.gz: ed5483513d6fa906e37df906b11ddbe5b8340da1
 SHA512:
-  metadata.gz: d15cbd14e8e175e139caa99dcc27b2ce1513bf2fd3f479f6c994c8df6fee287a6b944c82d20d1e57ce5f8b183cf6b3d05f8d73af783073189bd649afea255e45
-  data.tar.gz: eff76516a1a921b4edbdeb7ea5f9ab0ec4508f10dd555957b79a8ce48bdd401590f5f72bd23f178c5d3a3deb0104026228065049a1aa754255c920259e988ca7
+  metadata.gz: 087fc94a72ac099d3a739df725578e13f34e0b084d5cd5cf68704c46f368a9fc2d4b7c243ef033707e859f8acfe2b75e18236462c3b43660e5d97dcec9e6f76a
+  data.tar.gz: b0184628d18f8553fb264f807ffff7a2b9a757dab3931f713f81254b7f6367e7414ca228fe270ffbc554d9f2c242de1ae53b9178db7dc2d4214684900cf660aa

data/lib/fastlane_core/update_checker/update_checker.rb

@@ -69,7 +69,7 @@ module FastlaneCore
       params = {}
       params["ci"] = "1" if Helper.is_ci?
 
-      project_hash = p_hash
+      project_hash = p_hash(ARGV, gem_name)
       params["p_hash"] = project_hash if project_hash
 
       url += "?" + URI.encode_www_form(params) if params.count > 0
@@ -90,12 +90,11 @@ module FastlaneCore
     end
 
     # (optional) Returns the app identifier for the current tool
-    def self.ios_app_identifier
-      # ARGV example:
-      # ["-a", "com.krausefx.app", "--team_id", "5AA97AAHK2"]
-      ARGV.each_with_index do |current, index|
+    def self.ios_app_identifier(args)
+      # args example: ["-a", "com.krausefx.app", "--team_id", "5AA97AAHK2"]
+      args.each_with_index do |current, index|
         if current == "-a" || current == "--app_identifier"
-          return ARGV[index + 1] if ARGV.count > index
+          return args[index + 1] if args.count > index
         end
       end
 
@@ -103,26 +102,53 @@ module FastlaneCore
         return ENV["#{current}_APP_IDENTIFIER"] if ENV["#{current}_APP_IDENTIFIER"]
       end
 
-      return nil
+      return CredentialsManager::AppfileConfig.try_fetch_value(:app_identifier)
     rescue
       nil # we don't want this method to cause a crash
     end
 
+    # (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
+    #   screengrab -a com.test.app should return com.test.app
+    def self.android_app_identifier(args, gem_name)
+      app_identifier = nil
+      # args example: ["-a", "com.krausefx.app"]
+      args.each_with_index do |current, index|
+        if android_app_identifier_arg?(gem_name, current)
+          app_identifier = args[index + 1] if args.count > index
+          break
+        end
+      end
+
+      app_identifier ||= ENV["SUPPLY_PACKAGE_NAME"] if ENV["SUPPLY_PACKAGE_NAME"]
+      app_identifier ||= ENV["SCREENGRAB_APP_PACKAGE_NAME"] if ENV["SCREENGRAB_APP_PACKAGE_NAME"]
+      app_identifier ||= CredentialsManager::AppfileConfig.try_fetch_value(:package_name)
+
+      # Add Android prefix to prevent collisions if there is an iOS app with the same identifier
+      app_identifier ? "android_project_#{app_identifier}" : nil
+    rescue
+      nil # we don't want this method to cause a crash
+    end
+
+    def self.android_app_identifier_arg?(gem_name, arg)
+      return arg == "--package_name" ||
+             arg == "--app_package_name" ||
+            (arg == '-p' && gem_name == 'supply') ||
+            (arg == '-a' && gem_name == 'screengrab')
+    end
+
     # To not count the same projects multiple time for the number of launches
     # More information: https://github.com/fastlane/refresher
     # Use the `FASTLANE_OPT_OUT_USAGE` variable to opt out
     # The resulting value is e.g. ce12f8371df11ef6097a83bdf2303e4357d6f5040acc4f76019489fa5deeae0d
-    def self.p_hash
+    def self.p_hash(args, gem_name)
       return nil if ENV["FASTLANE_OPT_OUT_USAGE"]
       require 'credentials_manager'
 
-      value = nil
-      value ||= self.ios_app_identifier
-      value ||= CredentialsManager::AppfileConfig.try_fetch_value(:app_identifier)
-      unless value
-        value = CredentialsManager::AppfileConfig.try_fetch_value(:package_name)
-        value = "android_project_#{value}" if value # if the iOS and Android app share the same app identifier
-      end
+      # check if this is an android project first because some of the same params exist for iOS and Android tools
+      value = android_app_identifier(args, gem_name) || ios_app_identifier(args)
 
       if value
         return Digest::SHA256.hexdigest("p#{value}fastlan3_SAlt") # hashed + salted the bundle identifier

data/lib/fastlane_core/version.rb

@@ -1,3 +1,3 @@
 module FastlaneCore
-  VERSION = "0.43.3".freeze
+  VERSION = "0.43.4".freeze
 end

metadata

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