cocoapods-spm 0.0.4 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d90d3841df89cb8d7eb74c8ad184992ae08ec0ed58581827bae94fecdbb9d71
-  data.tar.gz: 90220d0a9b57102775d8819e972098f5d43a8ddb367e091f1963fe24fead0232
+  metadata.gz: b31c9b35087187bc68aa7537abeb5fec4fb45e496c767382b8b8300ebadebf30
+  data.tar.gz: fa9dcb1a770f7aeb42db04739bc81ae9ff52c9e0fffe0368e7769f36e1b99977
 SHA512:
-  metadata.gz: e67677e877f86e94e159630506ab0638429f374cb2aeed940630db7c0b05450ac40cc23fc21868caeef91be9c2c5feed11b61d4e1d2d2f23383da6329d3a1f7c
-  data.tar.gz: cb91b35ceff530f2b475ab25a5a645cc4e9622401de79064cf0841403135c83aa440265803b7c9520931dd37d18745be7a9dcda7f030a6cfdc36000d79f30279
+  metadata.gz: e644e4b8ba131f6eac0694ee25548e85f0782fadc794d68c944a18c969671f175aa14baaa0928b31cbbdbea0a8b3e14cd8ca01fb78022d8b4db1a66f676758e7
+  data.tar.gz: ea77387bf7c1e8ecb35fc00693450d0456b3535490561c4012397ab347127381719038d3ce6de88b529ba3966645d40d9d42adc8e5481763006f731f0c4e82d2

data/lib/cocoapods-spm/def/spm_package.rb

@@ -8,11 +8,28 @@ module Pod
 
       def initialize(name, options = {})
         @name = name
-        @options = options
-        @requirement = requirement_from(options)
-        @url = options[:url]
-        @relative_path = options[:relative_path]
+        @_options = options
+        @relative_path = nil
+        @linkage = nil
+        @url = nil
+        @requirement = nil
+        parse_options(options)
+      end
+
+      def parse_options(options)
+        @url = options[:url] || options[:git]
         @linkage = options[:linkage]
+        @relative_path = relative_path_from(options)
+        @requirement = requirement_from(options)
+      end
+
+      def relative_path_from(options)
+        if (relative_path = options[:relative_path])
+          relative_path
+        elsif (path = options[:path])
+          path = Pathname(path).expand_path
+          path.relative_path_from(File.absolute_path("Pods")).to_s
+        end
       end
 
       def inspect
@@ -24,7 +41,7 @@ module Pod
       end
 
       def to_dependencies
-        if (products = @options[:products])
+        if (products = @_options[:products])
           products.map { |product| Dependency.new(@name, product: product, pkg: self) }
         else
           [Dependency.new(@name, pkg: self)]
@@ -47,16 +64,16 @@ module Pod
       private
 
       def requirement_from(options)
-        if options[:requirement]
-          options[:requirement]
-        elsif (version = options.delete(:version))
+        return if @relative_path
+
+        if (requirement = options[:requirement])
+          requirement
+        elsif (version = options.delete(:version) || options.delete(:tag))
           { :kind => "exactVersion", :version => version }
         elsif (branch = options.delete(:branch))
           { :kind => "branch", :branch => branch }
         elsif (revision = options.delete(:commit))
           { :kind => "revision", :revision => revision }
-        elsif options[:relative_path]
-          nil
         else
           raise "Missing requirement for SPM package: #{name}"
         end

data/lib/cocoapods-spm/executables.rb

@@ -0,0 +1,9 @@
+module Pod
+  module SPM
+    module Executables
+      extend Executable
+
+      executable :swift
+    end
+  end
+end

data/lib/cocoapods-spm/hooks/base.rb

@@ -45,8 +45,9 @@ module Pod
           require f
           id = File.basename(f, ".*")
           cls_name = "Pod::SPM::Hook::#{id.camelize}"
-          UI.message "Running hook: #{cls_name}"
-          cls_name.constantize.new(context, options).run
+          UI.message "- Running hook: #{cls_name}" do
+            cls_name.constantize.new(context, options).run
+          end
         end
       end
 
@@ -61,6 +62,9 @@ module Pod
           hash = update.call(target, setting, config)
           setting.xcconfig.merge!(hash)
           setting.generate.merge!(hash)
+          Installer::Xcode::PodsProjectGenerator::TargetInstallerHelper.update_changed_file(
+            setting, target.xcconfig_path(config)
+          )
         end
 
         pod_targets.each do |target|

data/lib/cocoapods-spm/hooks/{pre_integrate → post_integrate}/update_settings.rb

@@ -32,7 +32,7 @@ module Pod
         end
 
         def update_other_swift_flags
-          return unless spm_config.macros
+          return if spm_config.all_macros.empty?
 
           # For prebuilt macros
           perform_settings_update(
@@ -43,7 +43,7 @@ module Pod
         end
 
         def update_linker_flags
-          return unless @spm_analyzer.spm_pkgs
+          return if @spm_analyzer.spm_pkgs.empty?
 
           # For packages to work in the main target
           perform_settings_update(
@@ -65,7 +65,7 @@ module Pod
         end
 
         def update_swift_include_paths
-          return unless @spm_analyzer.spm_pkgs
+          return if @spm_analyzer.spm_pkgs.empty?
 
           # For macro packages
           perform_settings_update(

data/lib/cocoapods-spm/installer/analyzer.rb

@@ -1,11 +1,13 @@
+require "cocoapods-spm/installer/validator"
+
 module Pod
   class Installer
     class SPMAnalyzer
       attr_reader :spm_pkgs, :spm_dependencies_by_target
 
-      def initialize(podfile, umbrella_targets)
+      def initialize(podfile, aggregate_targets)
         @podfile = podfile
-        @umbrella_targets = umbrella_targets
+        @aggregate_targets = aggregate_targets
         @spm_pkgs = []
         @spm_dependencies_by_target = {}
       end
@@ -13,6 +15,7 @@ module Pod
       def analyze
         analyze_spm_pkgs
         analyze_spm_dependencies_by_target
+        validate!
       end
 
       def spm_dependencies_for(target)
@@ -27,19 +30,19 @@ module Pod
 
       def analyze_spm_dependencies_by_target
         analyze_dependencies_for_targets
-        analyze_dependencies_for_umbrella_targets
+        analyze_dependencies_for_aggregate_targets
         @spm_dependencies_by_target.values.flatten.each { |d| d.pkg = spm_pkg_for(d.name) }
       end
 
       def analyze_dependencies_for_targets
-        specs = @umbrella_targets.flat_map(&:specs).uniq
+        specs = @aggregate_targets.flat_map(&:specs).uniq
         specs.each do |spec|
           @spm_dependencies_by_target[spec.name] = spec.spm_dependencies
         end
       end
 
-      def analyze_dependencies_for_umbrella_targets
-        @umbrella_targets.each do |target|
+      def analyze_dependencies_for_aggregate_targets
+        @aggregate_targets.each do |target|
           spm_dependencies = target.specs.flat_map(&:spm_dependencies)
           @spm_dependencies_by_target[target.to_s] = merge_spm_dependencies(spm_dependencies)
         end
@@ -64,6 +67,11 @@ module Pod
         @_spm_pkgs_by_name ||= @spm_pkgs.to_h { |pkg| [pkg.name, pkg] }
         @_spm_pkgs_by_name[name]
       end
+
+      def validate!
+        validator = SPMValidator.new(@aggregate_targets, @spm_pkgs, @spm_dependencies_by_target)
+        validator.validate!
+      end
     end
   end
 end

data/lib/cocoapods-spm/installer/validator.rb

@@ -0,0 +1,32 @@
+module Pod
+  class Installer
+    class SPMValidator
+      def initialize(aggregate_targets, spm_pkgs, spm_dependencies_by_target)
+        @aggregate_targets = aggregate_targets
+        @spm_pkgs = spm_pkgs
+        @spm_dependencies_by_target = spm_dependencies_by_target
+      end
+
+      def validate!
+        verify_no_missing_pkgs
+      end
+
+      private
+
+      def dependents_of_pkg(name)
+        @specs ||= @aggregate_targets.flat_map(&:specs).uniq
+        @specs.select { |s| s.spm_dependencies.any? { |d| d.name == name } }.map(&:name)
+      end
+
+      def verify_no_missing_pkgs
+        missing_pkgs = @spm_dependencies_by_target.values.flatten.select { |d| d.pkg.nil? }.map(&:name).uniq
+        return if missing_pkgs.empty?
+
+        messages = ["The following packages were not declared in Podfile:"]
+        messages += missing_pkgs.map { |pkg| "  • #{pkg}: used by #{dependents_of_pkg(pkg).join(', ')}" }
+        messages << "Use the `spm_pkg` method to declare those packages in Podfile."
+        raise Informative, messages.join("\n")
+      end
+    end
+  end
+end

data/lib/cocoapods-spm/macro/prebuilder.rb

@@ -4,6 +4,7 @@ module Pod
   module SPM
     class MacroPrebuilder
       include Config::Mixin
+      include Executables
 
       attr_reader :name
 
@@ -36,12 +37,13 @@ module Pod
         raise "Package.swift not exist in #{macro_downloaded_dir}" \
           unless (macro_downloaded_dir / "Package.swift").exist?
 
-        cmd =
-          "cd #{macro_downloaded_dir} " \
-          "&& swift package dump-package " \
-          "> #{metadata_path.relative_path_from(macro_downloaded_dir)}"
-        `#{cmd}`
-        @metadata = Metadata.from_file(metadata_path)
+        UI.message "Generating metadata at: #{metadata_path}" do
+          raw = Dir.chdir(macro_downloaded_dir) do
+            swift! ["package", "dump-package"]
+          end
+          metadata_path.write(raw)
+          @metadata = Metadata.from_s(raw)
+        end
       end
 
       def prebuild_macro_impl
@@ -51,8 +53,12 @@ module Pod
         impl_module_name = @metadata.macro_impl_name
         return if spm_config.dont_prebuild_macros_if_exist? && (macro_prebuilt_dir / config / impl_module_name).exist?
 
-        UI.puts "Building macro implementation: #{impl_module_name} (#{config})...".green
-        `cd #{macro_downloaded_dir} && swift build -c #{config}`
+        UI.section "Building macro implementation: #{impl_module_name} (#{config})...".green do
+          Dir.chdir(macro_downloaded_dir) do
+            swift! ["build", "-c", config, "--product", impl_module_name]
+          end
+        end
+
         (macro_prebuilt_dir / config).mkpath
         FileUtils.copy_entry(
           macro_downloaded_dir / ".build" / config / impl_module_name,

data/lib/cocoapods-spm/main.rb

@@ -1,3 +1,6 @@
+require "cocoapods-spm/config"
+require "cocoapods-spm/metadata"
+require "cocoapods-spm/executables"
 require "cocoapods-spm/def/target_definition"
 require "cocoapods-spm/def/podfile"
 require "cocoapods-spm/def/spec"

data/lib/cocoapods-spm/metadata.rb

@@ -9,8 +9,12 @@ module Pod
         @raw = raw
       end
 
+      def self.from_s(str)
+        new(JSON.parse(str))
+      end
+
       def self.from_file(path)
-        new(JSON.parse(File.read(path)))
+        from_s(File.read(path))
       end
 
       def self.for_pod(name)

data/lib/cocoapods-spm/patch/installer.rb

@@ -55,7 +55,6 @@ module Pod
     end
 
     def resolve_spm_dependencies
-      # TODO: convert aggregate_targets to umbrella_targets?
       UI.section "Analyzing SPM dependencies" do
         @spm_analyzer ||= Pod::Installer::SPMAnalyzer.new(podfile, aggregate_targets)
         @spm_analyzer.analyze

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-spm
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.1
 platform: ruby
 authors:
 - Thuyen Trinh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-26 00:00:00.000000000 Z
+date: 2024-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -42,11 +42,13 @@ files:
 - lib/cocoapods-spm/def/spm_package.rb
 - lib/cocoapods-spm/def/target_definition.rb
 - lib/cocoapods-spm/def/xcodeproj.rb
+- lib/cocoapods-spm/executables.rb
 - lib/cocoapods-spm/hooks/base.rb
 - lib/cocoapods-spm/hooks/post_integrate/add_spm_pkgs.rb
 - lib/cocoapods-spm/hooks/post_integrate/update_embed_frameworks_script.rb
-- lib/cocoapods-spm/hooks/pre_integrate/update_settings.rb
+- lib/cocoapods-spm/hooks/post_integrate/update_settings.rb
 - lib/cocoapods-spm/installer/analyzer.rb
+- lib/cocoapods-spm/installer/validator.rb
 - lib/cocoapods-spm/macro/fetcher.rb
 - lib/cocoapods-spm/macro/pod_installer.rb
 - lib/cocoapods-spm/macro/prebuilder.rb
@@ -74,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.33
 signing_key: 
 specification_version: 4
 summary: CocoaPods plugin to add SPM dependencies to CocoaPods targets