gonative-cli 1.5.6 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fd3e16aa80e616a08e2147bd78206d961a233543ed0631d9aab97626a9a3bc8
-  data.tar.gz: 6e573e449b23effca005802f1344aaa3815c37dee6f1b460e8d46339d6b9680d
+  metadata.gz: 35dc9f759236d6b1ac5b65b11b0bb90577d288cc1b160298762adab4d782ccba
+  data.tar.gz: 4db543701fb3d94aaec48058e789ef111264dd5ce2cbba27af8e6a02f5a779e5
 SHA512:
-  metadata.gz: 61949fbb4482552258e9ff94781a2cdc01882a2d24282f7e99d24a4d01ee2e53db558b6d6df6679563f4151f737e57c54b3221c8149c9f87a6bf8b8dee699363
-  data.tar.gz: 2702d5787c740d1eb5af9137710e0797fb677542a9830f1b0da179573169a9ef481d7f000a1d845998440698076bcd3f6a8654585b29e7498babae2302998d5f
+  metadata.gz: 2df712fbb8e67d33e10006997cbf6a91a9be077fcc05caed72f6a818a26f3bd6f6cf112727ce9cd7fd5423c4dc0c154c8b5e0a6d66aaf29f23222a4a3bd1a558
+  data.tar.gz: 336b11316a7647516d16c1c5c302f0b508420682a864d45ddd9b5ba789d542e5f7799a5f6093b0f1bf7fe7c33aa743b7c289ec45b3697b854ac41bb8911f722b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gonative-cli (1.5.6)
+    gonative-cli (2.0.0)
       activesupport (~> 6.0)
       aws-sdk-s3 (~> 1)
       cocoapods (~> 1.10)
@@ -14,9 +14,8 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.5)
-      rexml
-    activesupport (6.1.7)
+    CFPropertyList (3.0.8)
+    activesupport (6.1.7.10)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -29,22 +28,27 @@ GEM
       json (>= 1.5.1)
     ast (2.4.2)
     atomos (0.1.3)
-    aws-eventstream (1.3.0)
-    aws-partitions (1.1014.0)
-    aws-sdk-core (3.214.0)
+    aws-eventstream (1.4.0)
+    aws-partitions (1.1231.0)
+    aws-sdk-core (3.244.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
+      base64
+      bigdecimal
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.96.0)
-      aws-sdk-core (~> 3, >= 3.210.0)
+      logger
+    aws-sdk-kms (1.123.0)
+      aws-sdk-core (~> 3, >= 3.244.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.174.0)
-      aws-sdk-core (~> 3, >= 3.210.0)
+    aws-sdk-s3 (1.217.0)
+      aws-sdk-core (~> 3, >= 3.244.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
-    aws-sigv4 (1.10.1)
+    aws-sigv4 (1.12.1)
       aws-eventstream (~> 1, >= 1.0.2)
+    base64 (0.3.0)
+    bigdecimal (4.0.1)
     byebug (11.1.3)
     claide (1.1.0)
     cocoapods (1.15.2)
@@ -89,28 +93,36 @@ GEM
     colorize (0.8.1)
     concurrent-ruby (1.3.4)
     diff-lcs (1.4.4)
+    drb (2.2.3)
     dry-cli (0.7.0)
     escape (0.0.4)
-    ethon (0.15.0)
+    ethon (0.18.0)
       ffi (>= 1.15.0)
-    ffi (1.15.5)
+      logger
+    ffi (1.17.2-arm64-darwin)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
-    httpclient (2.8.3)
-    i18n (1.14.6)
+    httpclient (2.9.0)
+      mutex_m
+    i18n (1.14.8)
       concurrent-ruby (~> 1.0)
     jmespath (1.6.2)
-    json (2.7.2)
+    json (2.19.3)
+    logger (1.7.0)
     method_source (1.0.0)
-    minitest (5.25.1)
+    minitest (6.0.2)
+      drb (~> 2.0)
+      prism (~> 1.5)
     molinillo (0.8.0)
+    mutex_m (0.3.0)
     nanaimo (0.3.0)
     nap (1.1.0)
     netrc (0.11.0)
     parallel (1.20.1)
     parser (3.0.2.0)
       ast (~> 2.4.1)
+    prism (1.9.0)
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -151,19 +163,19 @@ GEM
       rubocop-ast (>= 0.4.0)
     ruby-macho (2.5.1)
     ruby-progressbar (1.11.0)
-    typhoeus (1.4.0)
+    typhoeus (1.4.1)
       ethon (>= 0.9.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.0.0)
-    xcodeproj (1.23.0)
+    xcodeproj (1.24.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
       nanaimo (~> 0.3.0)
       rexml (~> 3.2.4)
-    zeitwerk (2.6.18)
+    zeitwerk (2.7.5)
 
 PLATFORMS
   arm64-darwin-21

data/lib/gonative/commands/ios/build.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module GoNative
+  module Commands
+    module IOS
+      class Build < Base
+        desc 'Build a framework without releasing'
+
+        option :debug, type: :boolean, default: false, desc: 'Keep build directory for debugging'
+        option :archs, default: 'x86_64,arm64', desc: 'Comma-separated list of architectures to build'
+
+        def call(debug:, archs:, **)
+          Plugins::IOS::Verify.call
+          Plugins::IOS::BuildFramework.call(archs, debug)
+        end
+      end
+    end
+  end
+end

data/lib/gonative/commands/ios/publish.rb

@@ -5,17 +5,32 @@ module GoNative
     module IOS
       class Publish < Base
         autoload :FileUtils, 'fileutils'
-        desc 'Verify, build and release a new version'
+        desc 'Verify, build and release a new version to the SPM registry'
 
-        argument :podspec, required: true, desc: 'Podspec name'
+        argument :version, required: false, desc: 'Version to publish (reads from VERSION file if omitted)'
         option :skip_build, type: :boolean, default: false
         option :debug, type: :boolean, default: false
         option :archs, default: 'x86_64,arm64'
+        option :scope, default: 'median', desc: 'Package scope for the registry'
+        option :registry, default: 'https://packages.median.co', desc: 'SPM registry URL'
 
-        def call(podspec:, skip_build:, debug:, archs:, **)
+        def call(version: nil, skip_build:, debug:, archs:, scope:, registry:, **)
+          version ||= read_version_file
           Plugins::IOS::Verify.call
-          Plugins::IOS::BuildFramework.call(podspec, archs, debug) unless skip_build
-          Plugins::IOS::Release.call(podspec)
+          Plugins::IOS::BuildFramework.call(archs, debug) unless skip_build
+          Plugins::IOS::Release.call(version, scope: scope, registry_url: registry)
+        end
+
+        private
+
+        def read_version_file
+          path = File.join(Dir.pwd, 'VERSION')
+          unless File.exist?(path)
+            raise Error, 'No version specified and no VERSION file found'
+          end
+          File.read(path).strip.tap do |v|
+            raise Error, 'VERSION file is empty' if v.empty?
+          end
         end
       end
     end

data/lib/gonative/commands/ios/version.rb

@@ -4,12 +4,10 @@ module GoNative
   module Commands
     module IOS
       class Version < Base
-        desc 'Get version of a Podspec file'
+        desc 'Get version from VERSION file'
 
-        argument :podspec, required: true, desc: 'Podspec name'
-
-        def call(podspec:, **)
-          Plugins::IOS::Version.call(podspec)
+        def call(**)
+          Plugins::IOS::Version.call
         end
       end
     end

data/lib/gonative/commands.rb

@@ -6,6 +6,7 @@ module GoNative
 
     register 'version', Version, aliases: %w[--version -v]
     register 'ios create', IOS::Create
+    register 'ios build', IOS::Build
     register 'ios publish', IOS::Publish
     register 'ios extract-extensions', IOS::ExtractExtensions
     register 'ios embed-extensions', IOS::EmbedExtensions

data/lib/gonative/plugins/ios/build_framework.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 require 'cocoapods'
+require 'shellwords'
+require 'pathname'
 require 'xcodeproj'
-require 'active_support/core_ext/string/inflections'
-require 'aws-sdk-s3'
 
 module GoNative
   module Plugins
@@ -13,160 +13,266 @@ module GoNative
 
         extend DSL::Serviceable
 
-        BUILD_TEMPLATE_DIRECTORY_PATH = File.expand_path(File.join(__dir__, '../../../..', 'templates', 'build', 'ios'))
+        attr_reader :archs, :persist_build_dir, :project_root
 
-        attr_reader :plugin_name, :archs, :persist_build_dir
-
-        def initialize(podspec, archs, persist_build_dir)
-          raise Error, 'No podspec exists.' unless File.exist?(podspec)
-
-          @plugin_name = File.basename(podspec, '.podspec')
+        def initialize(archs, persist_build_dir, project_root = FileUtils.pwd)
           @archs = archs.gsub(',', ' ')
           @persist_build_dir = persist_build_dir
+          @project_root = File.expand_path(project_root)
         end
 
         def call
-          created_build_dir = cd_build_dir
-          setup_build_dir if created_build_dir
-          build_framework!
-          move_framework_file
-          zip!
-          upload_to_s3
+          original_dir = FileUtils.pwd
+
+          raise Error, "No Project.swift found in #{project_root}" unless tuist_project?
+
+          build_framework_with_tuist!
         ensure
-          FileUtils.cd('..')
-          FileUtils.rm_rf('build') unless persist_build_dir
-        end
-
-        def cd_build_dir
-          build_dir = File.join(FileUtils.pwd, 'build')
-          return false if File.exist?(build_dir)
-
-          FileUtils.mkdir(build_dir)
-          FileUtils.cd(build_dir)
-          true
-        end
-
-        def setup_build_dir
-          create_framework_proj
-          move_template_files!
-          run_pod_install
-          chmod_frameworks_script!
-        end
-
-        def create_framework_proj
-          proj = Xcodeproj::Project.new(FileUtils.pwd)
-          target = proj.new_target(:framework,
-                                   plugin_name.to_s,
-                                   :ios,
-                                   deployment_target)
-          main_group = proj.new_group(plugin_name, plugin_name)
-          add_classes(target, main_group)
-          add_frameworks(target, main_group)
-          add_headers(target, main_group)
-          target.build_configurations.each do |config|
-            config.build_settings['INFOPLIST_FILE'] = 'Info.plist'
-            config.build_settings['MARKETING_VERSION'] = spec.version
-            config.build_settings['MODULEMAP_FILE'] = "#{plugin_name}.modulemap"
-            config.build_settings['PRODUCT_BUNDLE_IDENTIFIER'] = "org.cocoapods.#{plugin_name}"
-            config.build_settings['DEBUG_INFORMATION_FORMAT'] = 'dwarf-with-dsym'
-          end
-          proj.save("#{plugin_name}.xcodeproj")
+          FileUtils.cd(original_dir) if original_dir && File.directory?(original_dir)
+          cleanup_build_dir unless persist_build_dir
+
         end
 
-        def add_classes(target, group)
-          classes_group = group.new_group('Classes', 'Classes')
-          references = Dir.glob("../#{plugin_name}/Classes/**/*.{m,swift}").map do |file|
-            classes_group.new_file("../../#{file}")
-          end
-          target.add_file_references(references)
+        def build_framework_with_tuist!
+          FileUtils.cd(project_root)
+          FileUtils.mkdir_p(File.join('.build', 'Frameworks'))
+          generate_module_artifacts!
+          generate_tuist_project!
+          patch_generated_project!
+          archive_framework!
+          move_xcframework_to_frameworks!
         end
 
-        def add_frameworks(target, group)
-          frameworks_group = group.new_group('Frameworks', 'Frameworks')
-          references = Dir.glob("../#{plugin_name}/Frameworks/*.{framework,xcframework}").map do |file|
-            frameworks_group.new_file("../../#{file}")
+        def move_xcframework_to_frameworks!
+          Utils::UI.info 'Moving xcframework to Frameworks directory'
+          source = File.join(project_root, '.build', 'Frameworks', "#{plugin_name}.xcframework")
+          dest_dir = frameworks_dir
+          FileUtils.mkdir_p(dest_dir)
+          dest = File.join(dest_dir, "#{plugin_name}.xcframework")
+          FileUtils.rm_rf(dest) if File.exist?(dest)
+          FileUtils.cp_r(source, dest)
+        end
+
+        def frameworks_dir
+          File.join(project_root, 'Frameworks')
+        end
+
+        def tuist_project?
+          File.exist?(File.join(project_root, 'Project.swift'))
+        end
+
+        def plugin_name
+          @plugin_name ||= begin
+            project_definition = File.read(File.join(project_root, 'Project.swift'))
+            match = project_definition.match(/name:\s*"([^"]+)"/)
+            raise Error, "Could not determine project name from #{File.join(project_root, 'Project.swift')}" unless match
+
+            match[1]
           end
-          return unless references.length
+        end
 
-          references.each { |ref| target.frameworks_build_phase.add_file_reference(ref) }
+        def generate_module_artifacts!
+          Utils::UI.info 'Generating umbrella header and module map'
+          File.write(umbrella_header_path, umbrella_header_contents)
+          File.write(modulemap_path, modulemap_contents)
         end
 
-        def add_headers(target, group)
-          headers_group = group.new_group('Headers', 'Headers')
-          references = Dir.glob("../#{plugin_name}/Classes/**/*.h").map do |file|
-            headers_group.new_file("../../#{file}")
+        def generate_tuist_project!
+          Utils::UI.info 'Generating project with Tuist'
+          return if system('tuist generate --no-open')
+
+          raise Error, 'Error generating Tuist project'
+        end
+
+        def patch_generated_project!
+          Utils::UI.info 'Patching generated Xcode project'
+          project = Xcodeproj::Project.open(xcodeproj_path)
+
+          project.build_configurations.each do |config|
+            patch_build_settings!(config)
           end
-          header_files = target.add_file_references(references)
-          header_files << target.headers_build_phase.add_file_reference(group.new_file("../#{plugin_name}-umbrella.h"))
-          header_files.each do |header|
-            header.settings = { 'ATTRIBUTES' => ['Public'] }
+
+          project.targets.select { |target| target.name == plugin_name }.each do |target|
+            ensure_public_umbrella_header!(project, target)
+            target.build_configurations.each do |config|
+              patch_build_settings!(config)
+            end
+          end
+
+          project.save
+        end
+
+        def patch_build_settings!(config)
+          config.build_settings.delete('SWIFT_OBJC_BRIDGING_HEADER')
+          config.build_settings['BUILD_LIBRARY_FOR_DISTRIBUTION'] = 'YES'
+          config.build_settings['MODULEMAP_FILE'] = modulemap_project_setting_path
+        end
+
+        def ensure_public_umbrella_header!(project, target)
+          relative_header_path = File.basename(umbrella_header_path)
+          file_reference = project.files.find { |file| file.path == relative_header_path } ||
+            project.main_group.new_file(relative_header_path)
+
+          build_file = target.headers_build_phase.files_references.find { |file| file.path == relative_header_path }
+          build_file ||= target.headers_build_phase.add_file_reference(file_reference, true)
+          build_file.settings = { 'ATTRIBUTES' => ['Public'] }
+        end
+
+        def archive_framework!
+          FileUtils.rm_rf(simulator_archive_path)
+          FileUtils.rm_rf(device_archive_path)
+
+          return if system(archive_commands)
+
+          raise Error, 'Error building framework with Tuist. Please run the generated archive commands manually to inspect the failure'
+        end
+
+        def archive_commands
+          [
+            xcodebuild_archive_command(
+              destination: "generic/platform=iOS Simulator",
+              archive_path: simulator_archive_path,
+              sdk: "iphonesimulator",
+              archs_override: true
+            ),
+            xcodebuild_archive_command(
+              destination: "generic/platform=iOS",
+              archive_path: device_archive_path,
+              sdk: "iphoneos"
+            ),
+            create_xcframework_command,
+            %(rm -rf #{Shellwords.escape(simulator_archive_path)} #{Shellwords.escape(device_archive_path)})
+          ].join(' && ')
+        end
+
+        def create_xcframework_command
+          %(xcodebuild -create-xcframework -framework #{Shellwords.escape(simulator_framework_path)} -debug-symbols #{Shellwords.escape(simulator_dsym_path)} -framework #{Shellwords.escape(device_framework_path)} -debug-symbols #{Shellwords.escape(device_dsym_path)} -output #{Shellwords.escape(xcframework_output_path)})
+        end
+
+        def xcodebuild_archive_command(destination:, archive_path:, sdk:, archs_override: false)
+          command = [
+            "xcodebuild",
+            "-workspace #{Shellwords.escape(tuist_workspace_path)}",
+            "archive",
+          ]
+
+          if archs_override
+            command << "ONLY_ACTIVE_ARCH=NO"
+            command << "ARCHS=#{Shellwords.escape(archs)}"
           end
+
+          command.concat(
+            [
+              "-scheme #{Shellwords.escape(plugin_name)}",
+              %( -destination "#{destination}").strip,
+              "-archivePath #{Shellwords.escape(archive_path)}",
+              "-sdk #{Shellwords.escape(sdk)}",
+              "SKIP_INSTALL=NO",
+            ]
+          )
+
+          command.join(" ")
         end
 
-        def move_template_files!
-          plugin_dependencies = spec.dependencies.map do |d|
-            ["pod '#{d.name}'", "'#{d.requirement}'"].compact.join(', ')
-          end * "\n\t"
-          FileUtils.cp_r("#{BUILD_TEMPLATE_DIRECTORY_PATH}/.", '.')
-          headers = Dir.glob("../#{plugin_name}/Classes/**/*.h").map { |f| "#import \"#{File.basename(f)}\"" } * "\n"
-          Utils::TemplateInflator.new(plugin_name: plugin_name,
-                                      plugin_dependencies: plugin_dependencies,
-                                      plugin_headers: headers,
-                                      archs: archs,
-                                      deployment_target: deployment_target).call
+        def tuist_workspace_path
+          "#{plugin_name}.xcworkspace"
         end
 
-        def run_pod_install
-          system 'pod install'
+        def simulator_archive_path
+          File.join('.build', 'Frameworks', 'simulator.xcarchive')
         end
 
-        def chmod_frameworks_script!
-          FileUtils.chmod 0755, 'create-framework.sh'
+        def device_archive_path
+          File.join('.build', 'Frameworks', 'iOS.xcarchive')
         end
 
-        def build_framework!
-          Utils::UI.info 'Building framework'
-          return if system('sh create-framework.sh >/dev/null 2>/dev/null')
+        def xcframework_output_path
+          File.join('.build', 'Frameworks', "#{plugin_name}.xcframework")
+        end
 
-          raise Error, 'Error building framework. Please run the create-framework file manually to fix any errors'
+        def simulator_framework_path
+          File.expand_path(File.join(simulator_archive_path, 'Products', 'Library', 'Frameworks', "#{plugin_name}.framework"), project_root)
         end
 
-        def move_framework_file
-          FileUtils.mv("Frameworks/#{plugin_name}.xcframework", "../#{plugin_name}/Frameworks")
+        def device_framework_path
+          File.expand_path(File.join(device_archive_path, 'Products', 'Library', 'Frameworks', "#{plugin_name}.framework"), project_root)
         end
 
-        def zip!
-          FileUtils.cd('..')
-          included_paths = %w[Frameworks Resources LICENSE Info.plist Classes/Dummy.swift Extensions]
-          included_paths = included_paths.map { |path| "#{plugin_name}/#{path}" }
-          system "zip -r build/#{zip_file_name} " + included_paths.join(' ')
-          FileUtils.cd('build')
+        def simulator_dsym_path
+          File.expand_path(File.join(simulator_archive_path, 'dSYMs', "#{plugin_name}.framework.dSYM"), project_root)
         end
 
-        def zip_file_name
-          "#{plugin_name}-v#{spec.version}.zip"
+        def device_dsym_path
+          File.expand_path(File.join(device_archive_path, 'dSYMs', "#{plugin_name}.framework.dSYM"), project_root)
         end
 
-        def upload_to_s3
-          s3 = Aws::S3::Client.new(
-            region: ENV['S3_REGION'],
-            access_key_id: ENV['ACCESS_KEY_ID'],
-            secret_access_key: ENV['SECRET_ACCESS_KEY']
-          )
+        def cleanup_build_dir
+          FileUtils.rm_rf(File.join(project_root, '.build'))
+          FileUtils.rm_rf(File.join(project_root, "#{plugin_name}.xcodeproj"))
+          FileUtils.rm_rf(File.join(project_root, "#{plugin_name}.xcworkspace"))
+          FileUtils.rm_f(File.join(project_root, "#{plugin_name}.modulemap"))
+          FileUtils.rm_f(File.join(project_root, "#{plugin_name}-umbrella.h"))
+        end
 
-          s3.put_object(
-            bucket: ENV['S3_BUCKET'],
-            key: "#{plugin_name}/#{zip_file_name}",
-            body: File.open(zip_file_name, 'rb')
-          )
+        def xcodeproj_path
+          File.join(project_root, "#{plugin_name}.xcodeproj")
         end
 
-        def deployment_target
-          spec.deployment_target('ios') || '15.5'
+        def modulemap_path
+          File.join(project_root, "#{plugin_name}.modulemap")
         end
 
-        def spec
-          @spec ||= Pod::Specification.from_file("../#{plugin_name}.podspec")
+        def umbrella_header_path
+          File.join(project_root, "#{plugin_name}-umbrella.h")
+        end
+
+        def modulemap_project_setting_path
+          "$(PROJECT_DIR)/#{File.basename(modulemap_path)}"
+        end
+
+        def classes_root_path
+          File.join(project_root, 'Classes')
+        end
+
+        def header_import_paths
+          Dir.glob(File.join(classes_root_path, '**', '*.h')).sort.filter_map do |header_path|
+            basename = File.basename(header_path)
+            next if basename == "#{plugin_name}-Bridging-Header.h"
+
+            basename
+          end
+        end
+
+        def umbrella_header_contents
+          <<~HEADER
+            #ifdef __OBJC__
+            #import <UIKit/UIKit.h>
+            #else
+            #ifndef FOUNDATION_EXPORT
+            #if defined(__cplusplus)
+            #define FOUNDATION_EXPORT extern "C"
+            #else
+            #define FOUNDATION_EXPORT extern
+            #endif
+            #endif
+            #endif
+
+            #{header_import_paths.map { |path| %(#import "#{path}") }.join("\n")}
+
+            FOUNDATION_EXPORT double #{plugin_name}VersionNumber;
+            FOUNDATION_EXPORT const unsigned char #{plugin_name}VersionString[];
+          HEADER
+        end
+
+        def modulemap_contents
+          <<~MODULEMAP
+            framework module #{plugin_name} {
+              umbrella header "#{File.basename(umbrella_header_path)}"
+
+              export *
+              module * { export * }
+            }
+          MODULEMAP
         end
       end
     end

data/lib/gonative/plugins/ios/create.rb

@@ -24,8 +24,11 @@ module GoNative
 
         def call
           assert_not_exists!
-          cp_template_files!
-          Utils::TemplateInflator.new(plugin_name: plugin_name).call
+          FileUtils.mkdir(plugin_name)
+          FileUtils.cd(plugin_name) do
+            cp_template_files!
+            Utils::TemplateInflator.new(plugin_name: plugin_name).call
+          end
         end
 
         def assert_not_exists!