xccache 0.0.1.rc14991851613 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd5e1c42ab55e9d384b998ec94ca4dfe10c1b71cddde74f1b5a45fe8df9e99c5
-  data.tar.gz: a516b16ec060985d2bc705eb030b259b2858a96d110fa3ca1e046f89fb3c43f7
+  metadata.gz: 4201459bc9efce46e4eee06f18117749de0003131e383d3726ca082abbc6686f
+  data.tar.gz: c39f19dc60040641aaa518b192449ec86feee2b4e22c056de528904c04437a4a
 SHA512:
-  metadata.gz: 4b1ff0db0ed02e89266e8cd99262a09c53dcac4a2854f48e35f27e56f5b341e5272b63f8afbcffd28241a112ea50c4116793577535a4e8643e693b234bcb7a64
-  data.tar.gz: 9d57cf95ec5327a3688e0d437c67022fff096182fa9680a5418d75e5e3199bfb14063af67c2d3a4d0e4d8b4ac09f11faf976c5a713addc31b52500c6953336fe
+  metadata.gz: 114d1169b34312b251857b5bd93346d7e23ce266c1c05b6df9e9301d472e3995ee3fb8f200a086e3066e2688507a43ad43c3cf584b8505f8c7e2af91d7bc9710
+  data.tar.gz: 74bf01cc687ae222fc6a9cc4b2e75ac67faec16dd503f6ca4420d09824720a87f4afbe5ff26340b2abfa289fc72321d99026c2261a95e9cc22c17f34dc713f63

data/lib/xccache/core/hash.rb

@@ -1,12 +1,12 @@
 class Hash
-  def deep_merge(other, uniq_block: nil, &block)
-    dup.deep_merge!(other, uniq_block: uniq_block, &block)
+  def deep_merge(other, uniq_block: nil, sort_block: nil, &block)
+    dup.deep_merge!(other, uniq_block: uniq_block, sort_block: sort_block, &block)
   end
 
-  def deep_merge!(other, uniq_block: nil, &block)
+  def deep_merge!(other, uniq_block: nil, sort_block: nil, &block)
     merge!(other) do |key, this_val, other_val|
       result = if this_val.is_a?(Hash) && other_val.is_a?(Hash)
-                 this_val.deep_merge(other_val, uniq_block: uniq_block, &block)
+                 this_val.deep_merge(other_val, uniq_block: uniq_block, sort_block: sort_block, &block)
                elsif this_val.is_a?(Array) && other_val.is_a?(Array)
                  this_val + other_val
                elsif block_given?
@@ -14,8 +14,11 @@ class Hash
                else
                  other_val
                end
-      next result if uniq_block.nil? || !result.is_a?(Array)
-      result.reverse.uniq(&uniq_block).reverse # prefer updates
+
+      # uniq by block, prefer updates
+      result = result.reverse.uniq(&uniq_block).reverse if uniq_block && result.is_a?(Array)
+      result = result.sort_by(&sort_block) if sort_block && result.is_a?(Array)
+      result
     end
   end
 end

data/lib/xccache/core/lockfile.rb

@@ -2,6 +2,33 @@ require "xccache/core/syntax/json"
 
 module XCCache
   class Lockfile < JSONRepresentable
+    class Pkg < Hash
+      def self.from_h(h)
+        Pkg.new.merge(h)
+      end
+
+      def key
+        @key ||= ["repositoryURL", "path_from_root", "relative_path"].find { |x| key?(x) }
+      end
+
+      def id
+        self[key]
+      end
+
+      def local?
+        key != "repositoryURL"
+      end
+
+      def slug
+        @slug ||= File.basename(id, ".*")
+      end
+
+      def relative_path_from_dir(dir)
+        return id if key == "relative_path"
+        (Pathname.pwd / id).relative_path_from(dir) if key == "path_from_root"
+      end
+    end
+
     def hash_for_project(project)
       raw[project.display_name] ||= {}
     end
@@ -11,22 +38,31 @@ module XCCache
     end
 
     def deep_merge!(hash)
-      keys = ["repositoryURL", "path_from_root", "relative_path"]
-      raw.deep_merge!(hash, uniq_block: proc do |h|
-        h.is_a?(Hash) && (k = keys.find { |k| h.key?(k) }) ? h[k] : h
-      end)
+      raw.deep_merge!(
+        hash,
+        uniq_block: proc { |h| h.is_a?(Hash) ? Pkg.from_h(h).id || h : h },
+        sort_block: proc { |x| x.to_s.downcase },
+      )
+      # After deep_merge, clear property cache
+      (instance_variables - %i[@path @raw]).each do |ivar|
+        remove_instance_variable(ivar)
+      end
     end
 
     def pkgs
-      @pkgs ||= raw.values.flat_map { |h| h["packages"] || [] }
+      @pkgs ||= raw.values.flat_map { |h| h["packages"] || [] }.map { |h| Pkg.from_h(h) }
     end
 
     def local_pkgs
-      @local_pkgs ||= pkgs.select { |h| h.key?("relative_path") || h.key?("path") }
+      @local_pkgs ||= pkgs.select(&:local?).uniq
     end
 
     def local_pkg_slugs
-      @local_pkg_slugs ||= local_pkgs.map { |h| File.basename(h["relative_path"] || h["path"]) }.uniq
+      @local_pkg_slugs ||= local_pkgs.map(&:slug).uniq
+    end
+
+    def known_product_dependencies
+      raw.empty? ? [] : product_dependencies.reject { |d| File.dirname(d) == "__unknown__" }
     end
 
     def product_dependencies
@@ -36,5 +72,20 @@ module XCCache
     def targets_data
       @targets_data ||= product_dependencies_by_targets.transform_keys { |k| "#{k}.xccache" }
     end
+
+    def verify!
+      known_slugs = pkgs.map(&:slug)
+      unknown = product_dependencies.reject { |d| known_slugs.include?(File.dirname(d)) }
+      return if unknown.empty?
+
+      UI.error! <<~DESC
+        Unknown product dependencies at #{path}:
+
+        #{unknown.sort.map { |d| "  • #{d}" }.join("\n")}
+
+        Refer to this doc for how to resolve this issue:
+          https://github.com/trinhngocthuyen/xccache/blob/main/docs/troubleshooting.md#unknown-product-dependencies
+      DESC
+    end
   end
 end

data/lib/xccache/core/log.rb

@@ -43,6 +43,11 @@ module XCCache
         UI.puts("[ERROR] #{message}".red)
       end
 
+      def error!(message)
+        error(message)
+        raise GeneralError, message
+      end
+
       def puts(message)
         $stdout.puts("#{' ' * self.indent}#{message}")
       end

data/lib/xccache/installer/use.rb

@@ -19,7 +19,7 @@ module XCCache
         project.add_xccache_pkg unless project.has_xccache_pkg?
         project.targets.each do |target|
           target.add_xccache_product_dependency unless target.has_xccache_product_dependency?
-          target.remove_pkg_product_dependencies { |d| !d.pkg.xccache_pkg? }
+          target.remove_pkg_product_dependencies { |d| d.pkg.nil? || !d.pkg.xccache_pkg? }
         end
         project.remove_pkgs(&:non_xccache_pkg?) unless config.keep_pkgs_in_project?
       end

data/lib/xccache/installer.rb

@@ -14,6 +14,7 @@ module XCCache
     end
 
     def perform_install
+      verify_projects!
       UI.message("Using cache dir: #{config.spm_cache_dir}")
       config.in_installation = true
       if @umbrella_pkg.nil?
@@ -33,10 +34,14 @@ module XCCache
 
     def sync_lockfile
       UI.info("Syncing lockfile")
+      known_dependencies = lockfile.known_product_dependencies
       update_projects do |project|
-        lockfile.deep_merge!(project.display_name => lockfile_hash_for_project(project))
+        lockfile.deep_merge!(
+          project.display_name => lockfile_hash_for_project(project, known_dependencies)
+        )
       end
       lockfile.save
+      lockfile.verify!
     end
 
     def lockfile
@@ -53,7 +58,6 @@ module XCCache
     end
 
     def update_projects
-      verify_projects!
       projects.each do |project|
         yield project if block_given?
         project.save
@@ -62,10 +66,15 @@ module XCCache
 
     private
 
-    def lockfile_hash_for_project(project)
+    def lockfile_hash_for_project(project, known_dependencies)
       deps_by_targets = project.targets.to_h do |target|
-        deps = target.non_xccache_pkg_product_dependencies.select(&:pkg).map { |d| "#{d.pkg.slug}/#{d.product_name}" }
-        [target.name, deps]
+        deps = target.non_xccache_pkg_product_dependencies.map do |dep|
+          next dep.full_name unless dep.pkg.nil?
+          known = known_dependencies.find { |x| File.basename(x) == dep.product_name }
+          UI.warn("-> Assuming #{known} for #{dep.full_name}".dark) if known
+          known || dep.full_name
+        end
+        [target.name, deps.sort]
       end
       {
         "packages" => project.non_xccache_pkgs.map(&:to_h),

data/lib/xccache/xcodeproj/pkg.rb

@@ -50,9 +50,7 @@ module Xcodeproj
 
         def to_h
           {
-            "relative_path" => relative_path,
-            "path" => path,
-            "path_from_root" => absolute_path.relative_path_from(Pathname(".").expand_path).to_s,
+            "path_from_root" => absolute_path.relative_path_from(Pathname.pwd).to_s,
           }
         end
 

data/lib/xccache/xcodeproj/pkg_product_dependency.rb

@@ -5,13 +5,26 @@ module Xcodeproj
     module Object
       class XCSwiftPackageProductDependency
         def full_name
-          "#{pkg.slug}/#{product_name}"
+          @full_name ||= "#{pkg&.slug || '__unknown__'}/#{product_name}"
         end
 
         def pkg
-          return package unless package.nil?
+          return package if package
+          return if @warned_missing_pkg
+          @warned_missing_pkg = true
+          XCCache::UI.warn("Missing pkg of product dependency #{uuid}: #{to_hash}")
+        end
 
-          Log.warn("Missing pkg for #{inspect}")
+        def remove_alongside_related
+          target = referrers.find { |x| x.is_a?(PBXNativeTarget) }
+          XCCache::UI.info(
+            "(-) Remove #{product_name.red} from product dependencies of target #{target.display_name.bold}"
+          )
+          target.dependencies.each { |x| x.remove_from_project if x.product_ref == self }
+          target.build_phases.each do |phase|
+            phase.files.select { |f| f.remove_from_project if f.product_ref == self }
+          end
+          remove_from_project
         end
       end
     end

data/lib/xccache/xcodeproj/project.rb

@@ -29,8 +29,8 @@ module Xcodeproj
     end
 
     def has_pkg?(hash)
-      id = hash[pkg_key_in_hash(hash)]
-      pkgs.any? { |p| p.id == id }
+      pkg_hash = XCCache::Lockfile::Pkg.from_h(hash)
+      pkgs.any? { |p| p.id == pkg_hash.id }
     end
 
     def has_xccache_pkg?
@@ -38,14 +38,14 @@ module Xcodeproj
     end
 
     def add_pkg(hash)
-      key = pkg_key_in_hash(hash)
-      is_local = ["relative_path", "path"].include?(key)
+      pkg_hash = XCCache::Lockfile::Pkg.from_h(hash)
+      pkg_hash["relative_path"] = pkg_hash.relative_path_from_dir(dir).to_s if pkg_hash.key == "path_from_root"
 
-      Log.message("Add package #{hash[key].bold} to project #{display_name.bold}")
-      cls = is_local ? XCLocalSwiftPackageReference : XCRemoteSwiftPackageReference
+      Log.message("Add package #{pkg_hash.id.bold} to project #{display_name.bold}")
+      cls = pkg_hash.local? ? XCLocalSwiftPackageReference : XCRemoteSwiftPackageReference
       ref = new(cls)
       custom_keys = ["path_from_root"]
-      hash.each { |k, v| ref.send("#{k}=", v) unless custom_keys.include?(k) }
+      pkg_hash.each { |k, v| ref.send("#{k}=", v) unless custom_keys.include?(k) }
       root_object.package_references << ref
       ref
     end
@@ -73,11 +73,5 @@ module Xcodeproj
     def xccache_config_group
       self["xccache.config"] || new_group("xccache.config")
     end
-
-    private
-
-    def pkg_key_in_hash(hash)
-      ["repositoryURL", "relative_path", "path"].find { |k| hash.key?(k) }
-    end
   end
 end

data/lib/xccache/xcodeproj/target.rb

@@ -30,21 +30,11 @@ module Xcodeproj
         end
 
         def remove_xccache_product_dependencies
-          remove_pkg_product_dependencies { |d| d.pkg.xccache_pkg? }
+          remove_pkg_product_dependencies { |d| d.pkg&.xccache_pkg? }
         end
 
         def remove_pkg_product_dependencies(&block)
-          package_product_dependencies.select(&block).each do |d|
-            XCCache::UI.info(
-              "(-) Remove #{d.product_name.red} from product dependencies of target #{display_name.bold}"
-            )
-            build_phases.each do |phase|
-              phase.files.select { |f| f.remove_from_project if f.product_ref == d }
-            end
-            # Remove it from target dependencies
-            dependencies.each { |x| x.remove_from_project if x.product_ref == d }
-            d.remove_from_project
-          end
+          package_product_dependencies.select(&block).each(&:remove_alongside_related)
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xccache
 version: !ruby/object:Gem::Version
-  version: 0.0.1.rc14991851613
+  version: 0.0.2
 platform: ruby
 authors:
 - Thuyen Trinh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-13 00:00:00.000000000 Z
+date: 2025-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -161,9 +161,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.2.33
 signing_key: