fastlane-plugin-firebase_app_distribution 0.2.0 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c1f9a3bb79927dc10b2ed68e66ad0c8b9593ef5a31a6cc50d91ed635eb6443a
-  data.tar.gz: bfadb919bccb7bb7b1b7d943cd92b0709f3f8d432e8508efc2ac56bb8969c809
+  metadata.gz: ed04551803fc7a5edd8e0d43b48ff6e84e55565f3219422619e78ef96f2e6654
+  data.tar.gz: bd070b167f9fa4f72e13f3250524af46b75861ee9096e2a73b8e5441c5889fa8
 SHA512:
-  metadata.gz: 55f7b6245940db7d3141ac707d52646d5dc369d7a9d4a2add36e1e5efe11365e0ef3aaa13cbab59cb51f8696320d186570bd5c3e38f5856fc8a801246b3f93da
-  data.tar.gz: dc02fa663afe0cfeba8b71f2de2bc91feed18cf2ca3b0134567d80729d529c9dab9573831e0c23100e96f00c2447b1af95dc688860b514ea6080fd3e303ed438
+  metadata.gz: 123bec0fbac40f216c10a4e05aab1e43644286972f2ab436ed91686a1e5404779b3d9f7dbd8ecfe208264f702f51982cfea60d3607e1090795941d2d0b65e23c
+  data.tar.gz: d4f509e5a09b916486f0d10802c2ff53fc1efb803e476f27f71bfade12ee5b6a46b0aa0992099582531c93de423712ccaf6a8b1276f22145701eef4158cbd95b

data/lib/fastlane/plugin/firebase_app_distribution/actions/firebase_app_distribution_action.rb

@@ -20,23 +20,14 @@ module Fastlane
 
       def self.run(params)
         params.values # to validate all inputs before looking for the ipa/apk
+
+        app_id = app_id_from_params(params)
+        platform = lane_platform || platform_from_app_id(app_id)
+        binary_path = binary_path_from_platform(platform, params[:ipa_path], params[:apk_path])
+
         auth_token = fetch_auth_token(params[:service_credentials_file], params[:firebase_cli_token])
-        binary_path = params[:ipa_path] || params[:apk_path]
-        platform = lane_platform || platform_from_path(binary_path)
         fad_api_client = Client::FirebaseAppDistributionApiClient.new(auth_token, platform)
 
-        if params[:app] # Set app_id if it is specified as a parameter
-          app_id = params[:app]
-        elsif platform == :ios
-          archive_path = Actions.lane_context[SharedValues::XCODEBUILD_ARCHIVE]
-          if archive_path
-            app_id = get_ios_app_id_from_archive(archive_path)
-          end
-        end
-
-        if app_id.nil?
-          UI.crash!(ErrorMessage::MISSING_APP_ID)
-        end
         release_id = fad_api_client.upload(app_id, binary_path, platform.to_s)
         if release_id.nil?
           return
@@ -66,20 +57,50 @@ module Fastlane
         "Release your beta builds with Firebase App Distribution"
       end
 
+      def self.app_id_from_params(params)
+        if params[:app]
+          app_id = params[:app]
+        elsif xcode_archive_path
+          plist_path = params[:googleservice_info_plist_path]
+          app_id = get_ios_app_id_from_archive_plist(xcode_archive_path, plist_path)
+        end
+        if app_id.nil?
+          UI.crash!(ErrorMessage::MISSING_APP_ID)
+        end
+        app_id
+      end
+
+      def self.xcode_archive_path
+        # prevents issues on cross-platform build environments where an XCode build happens within
+        # the same lane
+        return nil if lane_platform == :android
+
+        Actions.lane_context[SharedValues::XCODEBUILD_ARCHIVE]
+      end
+
       def self.lane_platform
         Actions.lane_context[Actions::SharedValues::PLATFORM_NAME]
       end
 
-      def self.platform_from_path(binary_path)
-        return nil unless binary_path
-        case binary_path.split('.').last
-        when 'ipa'
+      def self.platform_from_app_id(app_id)
+        if app_id.include?(':ios:')
           :ios
-        when 'apk'
+        elsif app_id.include?(':android:')
           :android
         end
       end
 
+      def self.binary_path_from_platform(platform, ipa_path, apk_path)
+        case platform
+        when :ios
+          ipa_path
+        when :android
+          apk_path
+        else
+          ipa_path || apk_path
+        end
+      end
+
       def self.available_options
         if lane_platform == :ios || lane_platform.nil?
           ipa_path_default = Dir["*.ipa"].sort_by { |x| File.mtime(x) }.last
@@ -100,6 +121,12 @@ module Fastlane
                                        verify_block: proc do |value|
                                          UI.user_error!("firebase_app_distribution: Couldn't find ipa file at path '#{value}'") unless File.exist?(value)
                                        end),
+          FastlaneCore::ConfigItem.new(key: :googleservice_info_plist_path,
+                                       env_name: "GOOGLESERVICE_INFO_PLIST_PATH",
+                                       description: "Path to your GoogleService-Info.plist file, relative to the root of your Xcode project",
+                                       default_value: "GoogleService-Info.plist",
+                                       optional: true,
+                                       type: String),
           # Android Specific
           FastlaneCore::ConfigItem.new(key: :apk_path,
                                        env_name: "FIREBASEAPPDISTRO_APK_PATH",

data/lib/fastlane/plugin/firebase_app_distribution/client/firebase_app_distribution_api_client.rb

@@ -40,6 +40,7 @@ module Fastlane
         begin
           connection.post(enable_access_url(app_id, release_id), payload.to_json) do |request|
             request.headers["Authorization"] = "Bearer " + @auth_token
+            request.headers["Content-Type"] = "application/json"
           end
         rescue Faraday::ResourceNotFound
           UI.user_error!("#{ErrorMessage::INVALID_APP_ID}: #{app_id}")
@@ -67,6 +68,7 @@ module Fastlane
         begin
           connection.post(release_notes_create_url(app_id, release_id), payload.to_json) do |request|
             request.headers["Authorization"] = "Bearer " + @auth_token
+            request.headers["Content-Type"] = "application/json"
           end
         rescue Faraday::ResourceNotFound
           UI.user_error!("#{ErrorMessage::INVALID_APP_ID}: #{app_id}")
@@ -89,7 +91,7 @@ module Fastlane
         if binary_path.nil? || !File.exist?(binary_path)
           UI.crash!("#{ErrorMessage.binary_not_found(@binary_type)}: #{binary_path}")
         end
-        binary_hash = Digest::SHA256.hexdigest(File.open(binary_path).read)
+        binary_hash = Digest::SHA256.hexdigest(read_binary(binary_path))
 
         begin
           response = connection.get(v1_apps_url(app_id)) do |request|
@@ -114,7 +116,7 @@ module Fastlane
       #
       # Throws a user_error if an invalid app id is passed in, or if the binary file does not exist
       def upload_binary(app_id, binary_path, platform)
-        connection.post(binary_upload_url(app_id), File.open(binary_path).read) do |request|
+        connection.post(binary_upload_url(app_id), read_binary(binary_path)) do |request|
           request.headers["Authorization"] = "Bearer " + @auth_token
           request.headers["X-APP-DISTRO-API-CLIENT-ID"] = "fastlane"
           request.headers["X-APP-DISTRO-API-CLIENT-TYPE"] =  platform
@@ -223,6 +225,11 @@ module Fastlane
           conn.adapter(Faraday.default_adapter)
         end
       end
+
+      def read_binary(path)
+        # File must be read in binary mode to work on Windows
+        File.open(path, 'rb').read
+      end
     end
   end
 end

data/lib/fastlane/plugin/firebase_app_distribution/helper/firebase_app_distribution_helper.rb

@@ -28,10 +28,10 @@ module Fastlane
         CFPropertyList.native_types(CFPropertyList::List.new(file: path).value)
       end
 
-      def get_ios_app_id_from_archive(path)
-        app_path = parse_plist("#{path}/Info.plist")["ApplicationProperties"]["ApplicationPath"]
-        UI.shell_error!("can't extract application path from Info.plist at #{path}") if app_path.empty?
-        identifier = parse_plist("#{path}/Products/#{app_path}/GoogleService-Info.plist")["GOOGLE_APP_ID"]
+      def get_ios_app_id_from_archive_plist(archive_path, plist_path)
+        app_path = parse_plist("#{archive_path}/Info.plist")["ApplicationProperties"]["ApplicationPath"]
+        UI.shell_error!("can't extract application path from Info.plist at #{archive_path}") if app_path.empty?
+        identifier = parse_plist("#{archive_path}/Products/#{app_path}/#{plist_path}")["GOOGLE_APP_ID"]
         UI.shell_error!("can't extract GOOGLE_APP_ID") if identifier.empty?
         return identifier
       end

data/lib/fastlane/plugin/firebase_app_distribution/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module FirebaseAppDistribution
-    VERSION = "0.2.0"
+    VERSION = "0.2.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-firebase_app_distribution
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.3
 platform: ruby
 authors:
 - Stefan Natchev
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-02 00:00:00.000000000 Z
+date: 2020-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry