fastlane-plugin-shorebird 0.2.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ce08cc5837ec5f3081731726d4c695f6dc6f32ba0758a8fbf699e0682ded09a
-  data.tar.gz: 9cdb3863b127508f37e06c5a822a10e4a5d53de7a61119dec786e69b5afa4ad2
+  metadata.gz: 3598208825af69bed26dcbc75b64a7ece57ee3e1a4c885a834520e515f6123b6
+  data.tar.gz: dabb3fe9f66621470cae27a1ac0d64e6ca76b1c08a22920838e1e88ae924eb31
 SHA512:
-  metadata.gz: 3ece6e4e48c54e892d5ffc1fb150f0734dc2746a32277cd27b5ab2b021c4bf47fd27eaea0b2b276c641c24a706a5d180a8e3daadc5f5c628958a49b8bc102092
-  data.tar.gz: af71067070f017aa5e12854f89395e7da4677e8ce99a49c49030e74022cfc3ccb1cf369ee3ea63af9e39d24d18570e918180cdfb2e2911ff2ab1106a7b40e50b
+  metadata.gz: 44b9996afb7fa9b27d57541846dbfe723311f3557cdcc23613c1306217fd1cb3cb1fd798c3b5516a1af83a8cfa5997cae89254160d46be9fb04434900e94d5ca
+  data.tar.gz: 34113a2a2371db314f16c5ecdfd57c84244397d2a451fe90ac6029aa3b8747687b278ec7735731af895cf17a8f866622d5d21ebc6339e8f328406a34c2aee4d5

data/lib/fastlane/plugin/shorebird/actions/shorebird_release_action.rb

@@ -1,24 +1,66 @@
 require 'fastlane/action'
 require_relative '../helper/shorebird_helper'
+require 'gym'
+require 'plist'
+require 'tempfile'
 
 module Fastlane
   module Actions
     class ShorebirdReleaseAction < Action
       def self.run(params)
         platform = params[:platform]
-        Fastlane::Actions.sh("shorebird release #{platform} #{params[:args]}".strip)
+        params[:args] ||= ""
 
         if platform == "ios"
-          # Get the most recently-created IPA file
-          ipa_file = Dir.glob('../build/ios/ipa/*.ipa')
-                        .sort_by! { |f| File.stat(f).ctime }
-                        .reverse!
-                        .first
-          puts("Setting IPA_OUTPUT_PATH to #{ipa_file}")
-          lane_context[SharedValues::IPA_OUTPUT_PATH] = ipa_file
+          if export_options_plist_in_args?(params)
+            # If the user is already providing an export options plist, warn
+            UI.deprecated("--export-options-plist should not be passed in the args parameter. Please use the export_options parameter instead.")
+          else
+            provisioning_profile_mapping = Fastlane::Actions.lane_context[SharedValues::MATCH_PROVISIONING_PROFILE_MAPPING]
+            export_options_plist_path = Helper::ExportOptionsPlist.generate_export_options_plist(params[:export_options], provisioning_profile_mapping)
+            optional_space = (params[:args].end_with?(" ") || params[:args].empty?) ? "" : " "
+            params[:args] = params[:args] + "#{optional_space}--export-options-plist #{export_options_plist_path}"
+          end
+        end
+
+        command = "shorebird release #{platform} #{params[:args]}".strip
+        Fastlane::Actions.sh(command)
+
+        if platform == "ios"
+          lane_context[SharedValues::IPA_OUTPUT_PATH] = most_recent_ipa_file
         end
       end
 
+      def self.most_recent_ipa_file
+        Dir.glob(ipa_path_pattern)
+           .sort_by! { |f| File.stat(f).mtime }
+           .reverse!
+           .first
+      end
+
+      # Traverses up the directory tree until it finds a pubspec.yaml file.
+      # If no parent directory contains a pubspec.yaml file, we assume we are
+      # not in a Flutter project and raise an error.
+      def self.project_root
+        current_dir = Dir.pwd
+        current_dir = File.expand_path('..', current_dir) until File.exist?(File.join(current_dir, 'pubspec.yaml')) || (current_dir == '/')
+        # If we've reached the root directory, we've failed to find a pubspec.yaml file.
+        if current_dir == '/'
+          raise "Could not find pubspec.yaml in the directory tree"
+        end
+
+        current_dir
+      end
+
+      # .ipa path relative to the project root
+      def self.ipa_path_pattern
+        File.join(project_root, 'build/ios/ipa', '*.ipa')
+      end
+
+      def self.export_options_plist_in_args?(params)
+        params[:args].include?("--export-options-plist")
+      end
+
       def self.description
         "Create a Shorebird release"
       end
@@ -45,6 +87,14 @@ module Fastlane
             optional: true,
             type: String,
             default_value: ""
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :export_options,
+            description: "Path to an export options plist or a hash with export options. Use 'xcodebuild -help' to print the full set of available options",
+            optional: true,
+            type: Hash,
+            skip_type_validation: true,
+            default_value: {}
           )
         ]
       end

data/lib/fastlane/plugin/shorebird/helper/export_options_plist.rb

@@ -0,0 +1,45 @@
+module Fastlane
+  module Helper
+    class ExportOptionsPlist
+      # Generates an export options plist for use with Shorebird.
+      # In addition to handling data produced by match, it also updates the
+      # export options to ensure that the build number is not managed by Xcode
+      # and that the release method is set to app-store.
+      #
+      # @param export_options [Hash, String] The export options to use. If a hash, it will be used directly. If a string, it will be parsed as a plist file.
+      # @param provisioning_profile_mapping [Hash] The provisioning profile mapping from match. If provided, the provisioning profiles will be added to the export options plist.
+      # @return [String] The path to the generated export options plist.
+      def self.generate_export_options_plist(export_options, provisioning_profile_mapping = nil)
+        export_options_hash = {}
+        if export_options.kind_of?(Hash)
+          export_options_hash = export_options
+          export_options_hash[:method] ||= "app-store"
+          if provisioning_profile_mapping
+            # If match has provided provisioning profiles, put them in the export options plist
+            export_options_hash[:provisioningProfiles] = provisioning_profile_mapping
+            export_options_hash[:signingStyle] = 'manual'
+          end
+        elsif export_options.kind_of?(String)
+          export_options_path = File.expand_path(export_options)
+          unless File.exist?(export_options_path)
+            raise "export_options path #{export_options_path} does not exist"
+          end
+
+          export_options_hash = Plist.parse_xml(export_options_path)
+        end
+
+        # If manageAppVersionAndBuildNumber is not false, Shorebird won't
+        # work. If set to true (or not provided), Xcode will change the build
+        # number *after* the release is created, causing the app to be
+        # unpatchable.
+        export_options_hash[:manageAppVersionAndBuildNumber] = false
+        export_options_hash.compact!
+
+        tmp_path = Dir.mktmpdir('shorebird')
+        plist_path = File.join(tmp_path, "ExportOptions.plist")
+        File.write(plist_path, export_options_hash.to_plist)
+        plist_path
+      end
+    end
+  end
+end

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

@@ -1,5 +1,5 @@
 module Fastlane
   module Shorebird
-    VERSION = "0.2.0"
+    VERSION = "0.4.0"
   end
 end

metadata

@@ -1,16 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-shorebird
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Shorebird
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-30 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies: []
-description:
 email: contact@shorebird.dev
 executables: []
 extensions: []
@@ -21,6 +19,7 @@ files:
 - lib/fastlane/plugin/shorebird.rb
 - lib/fastlane/plugin/shorebird/actions/shorebird_patch_action.rb
 - lib/fastlane/plugin/shorebird/actions/shorebird_release_action.rb
+- lib/fastlane/plugin/shorebird/helper/export_options_plist.rb
 - lib/fastlane/plugin/shorebird/helper/shorebird_helper.rb
 - lib/fastlane/plugin/shorebird/version.rb
 homepage: https://github.com/shorebirdtech/fastlane-plugin-shorebird
@@ -28,7 +27,6 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -43,8 +41,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Create Shorebird releases and patches
 test_files: []