xccache 0.0.1a2 → 0.0.1a3

data/lib/xccache/spm/xcframework/xcframework.rb

@@ -0,0 +1,56 @@
+require "xccache/spm/build"
+
+module XCCache
+  module SPM
+    class XCFramework < Buildable
+      attr_reader :slices
+
+      def initialize(options = {})
+        super
+        @slices ||= @sdks.map do |sdk|
+          FrameworkSlice.new(
+            **options,
+            sdks: [sdk],
+            path: Dir.prepare(tmpdir / sdk.triple / "#{module_name}.framework"),
+          )
+        end
+      end
+
+      def build(merge_slices: false, **_options)
+        tmp_new_path = tmpdir / "new.xcframework"
+        tmp_existing_path = tmpdir / "existing.framework"
+
+        slices.each(&:build)
+        UI.section("Creating #{name}.xcframework from slices") do
+          create_xcframework(from: slices.map(&:path), to: tmp_new_path)
+        end
+
+        path.copy(to: tmp_existing_path) if path.exist? && merge_slices
+        path.rmtree if path.exist?
+
+        if merge_slices && tmp_existing_path.exist?
+          UI.section("Merging #{name}.xcframework with existing slices") do
+            framework_paths =
+              [tmp_new_path, tmp_existing_path]
+              .flat_map { |p| p.glob("*/*.framework") }
+              .uniq { |p| p.parent.basename.to_s } # uniq by id (ex. ios-arm64), preferred new ones
+            create_xcframework(from: framework_paths, to: path)
+          end
+        else
+          path.parent.mkpath
+          tmp_new_path.copy(to: path)
+        end
+        UI.info("-> XCFramework: #{path.to_s.dark}")
+      end
+
+      def create_xcframework(options = {})
+        cmd = ["xcodebuild", "-create-xcframework"]
+        cmd << "-allow-internal-distribution" unless library_evolution?
+        cmd << "-output" << options[:to]
+        options[:from].each { |p| cmd << "-framework" << p }
+        cmd << "> /dev/null" # Only care about errors
+        Sh.run(cmd)
+      end
+    end
+  end
+end

data/lib/xccache/spm/xcframework.rb

@@ -0,0 +1,2 @@
+require_relative "build"
+Dir["#{__dir__}/#{File.basename(__FILE__, '.rb')}/*.rb"].sort.each { |f| require f }

data/lib/xccache/storage/base.rb

@@ -0,0 +1,26 @@
+module XCCache
+  class Storage
+    include Config::Mixin
+
+    def initialize(options = {}); end
+
+    def pull
+      print_warnings
+    end
+
+    def push
+      print_warnings
+    end
+
+    private
+
+    def print_warnings
+      UI.warn <<~DESC
+        Do nothing as remote cache is not set up yet.
+
+        To set it up, specify `remote` in `xccache.yml`.
+        See: https://github.com/trinhngocthuyen/xccache/blob/main/docs/configuration.md#remote
+      DESC
+    end
+  end
+end

data/lib/xccache/storage/git.rb

@@ -0,0 +1,46 @@
+require_relative "base"
+
+module XCCache
+  class GitStorage < Storage
+    attr_reader :branch
+
+    def initialize(options = {})
+      super
+      if (@remote = options[:remote])
+        @remote = File.expand_path(@remote) unless ["http", "https", "git"].include?(URI.parse(@remote).scheme)
+        ensure_remote
+      end
+      @branch = options[:branch]
+    end
+
+    def pull
+      git.fetch("--depth 1 origin #{branch}")
+      git.switch("--detach FETCH_HEAD", capture: true)
+      git.clean("-dfx", capture: true)
+      # Re-create local branch so that it has the latest from remote
+      git.branch("-D #{branch} || true", capture: true)
+      git.checkout("-b #{branch}", capture: true)
+    end
+
+    def push
+      return UI.info("No changes to push, cache repo is clean".magenta) if git.clean?
+
+      git.add(".")
+      git.commit("-m \"Update cache at #{Time.new}\"")
+      git.push("origin #{branch}")
+    end
+
+    private
+
+    def git
+      @git ||= Git.new(config.spm_repo_dir)
+    end
+
+    def ensure_remote
+      existing = git.remote("get-url origin || true", capture: true, log_cmd: false)[0].strip
+      return if @remote == existing
+      return git.remote("add origin #{@remote}") if existing.empty?
+      git.remote("set-url origin #{@remote}")
+    end
+  end
+end

data/lib/xccache/storage/s3.rb

@@ -0,0 +1,53 @@
+require_relative "base"
+
+module XCCache
+  class S3Storage < Storage
+    def initialize(options = {})
+      super
+      @uri = options[:uri]
+      @creds_path = Pathname(options[:creds_path] || "~/.xccache/s3.creds.json").expand_path
+      creds = JSONRepresentable.new(@creds_path)
+      @access_key_id = creds["access_key_id"]
+      @secret_access_key = creds["secret_access_key"]
+    end
+
+    def pull
+      s3_sync(src: @uri, dst: config.spm_repo_dir)
+    end
+
+    def push
+      s3_sync(src: config.spm_repo_dir, dst: @uri)
+    end
+
+    private
+
+    def s3_sync(src: nil, dst: nil)
+      validate!
+      UI.info("Syncing cache from #{src.to_s.bold} to #{dst.to_s.bold}...")
+      env = {
+        "AWS_ACCESS_KEY_ID" => @access_key_id,
+        "AWS_SECRET_ACCESS_KEY" => @secret_access_key,
+      }
+      cmd = ["aws", "s3", "sync"]
+      cmd << "--exact-timestamps" << "--delete"
+      cmd << "--include" << "*.xcframework"
+      cmd << "--include" << "*.macro"
+      cmd << src << dst
+      Sh.run(cmd, env: env)
+    end
+
+    def validate!
+      if File.which("awsss").nil?
+        raise GeneralError, "awscli is not installed. Please install it via brew: `brew install awscli`"
+      end
+      return unless @access_key_id.nil? || @secret_access_key.nil?
+      raise GeneralError, <<~DESC
+        Please ensure the credentials json at #{@creds_path}. Example:
+        {
+          "access_key_id": <ACCESS_KEY_ID>,
+          "secret_access_key": <SECRET_ACCESS_KEY>
+        }
+      DESC
+    end
+  end
+end

data/lib/xccache/storage.rb

@@ -0,0 +1 @@
+Dir["#{__dir__}/#{File.basename(__FILE__, '.rb')}/*.rb"].sort.each { |f| require f }

data/lib/xccache/swift/sdk.rb

@@ -8,6 +8,7 @@ module XCCache
       NAME_TO_TRIPLE = {
         :iphonesimulator => "arm64-apple-ios-simulator",
         :iphoneos => "arm64-apple-ios",
+        :macosx => "arm64-apple-macosx",
       }.freeze
 
       def initialize(name)
@@ -18,13 +19,31 @@ module XCCache
         name
       end
 
-      def triple
-        NAME_TO_TRIPLE[name.to_sym]
+      def triple(without_vendor: false)
+        res = NAME_TO_TRIPLE[name.to_sym]
+        res = res.sub("-apple", "") if without_vendor
+        res
       end
 
       def sdk_path
+        # rubocop:disable Layout/LineLength
+        # /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk
+        # rubocop:enable Layout/LineLength
         @sdk_path ||= Pathname(Sh.capture_output("xcrun --sdk #{name} --show-sdk-path")).realpath
       end
+
+      def sdk_platform_developer_path
+        @sdk_platform_developer_path ||= sdk_path.parent.parent # iPhoneSimulator.platform/Developer
+      end
+
+      def swiftc_args
+        developer_library_frameworks_path = sdk_platform_developer_path / "Library" / "Frameworks"
+        developer_usr_lib_path = sdk_platform_developer_path / "usr" / "lib"
+        [
+          "-F#{developer_library_frameworks_path}",
+          "-I#{developer_usr_lib_path}",
+        ]
+      end
     end
   end
 end

data/lib/xccache/xcodeproj/build_configuration.rb

@@ -0,0 +1,20 @@
+require "xcodeproj"
+
+module Xcodeproj
+  class Project
+    module Object
+      class XCBuildConfiguration
+        def base_configuration_xcconfig
+          path = base_configuration_xcconfig_path
+          Config.new(path) if path
+        end
+
+        def base_configuration_xcconfig_path
+          return base_configuration_reference.real_path if base_configuration_reference
+          return unless base_configuration_reference_anchor && base_configuration_reference_relative_path
+          project.dir / base_configuration_reference_anchor.path / base_configuration_reference_relative_path
+        end
+      end
+    end
+  end
+end

data/lib/xccache/xcodeproj/config.rb

@@ -0,0 +1,9 @@
+require "xcodeproj"
+
+module Xcodeproj
+  class Config
+    def path
+      @filepath
+    end
+  end
+end

data/lib/xccache/xcodeproj/file_system_synchronized_root_group.rb

@@ -0,0 +1,17 @@
+require "xcodeproj"
+
+module Xcodeproj
+  class Project
+    module Object
+      class PBXFileSystemSynchronizedRootGroup
+        attribute :name, String
+
+        def display_name
+          return name if name
+          return File.basename(path) if path
+          super
+        end
+      end
+    end
+  end
+end

data/lib/xccache/xcodeproj/group.rb

@@ -0,0 +1,26 @@
+require "xcodeproj"
+
+module Xcodeproj
+  class Project
+    module Object
+      class PBXGroup
+        def synced_groups
+          children.grep(PBXFileSystemSynchronizedRootGroup)
+        end
+
+        def ensure_synced_group(name: nil, path: nil)
+          synced_groups.find { |g| g.name == name } || new_synced_group(name: name, path: path)
+        end
+
+        def new_synced_group(name: nil, path: nil)
+          path = path.relative_path_from(project.dir) unless path.relative?
+          synced_group = project.new(PBXFileSystemSynchronizedRootGroup)
+          synced_group.path = path.to_s
+          synced_group.name = name || path.basename.to_s
+          self << synced_group
+          synced_group
+        end
+      end
+    end
+  end
+end

data/lib/xccache/xcodeproj/pkg.rb

@@ -20,6 +20,10 @@ module Xcodeproj
           local? && id == "xccache/packages/umbrella"
         end
 
+        def non_xccache_pkg?
+          !xccache_pkg?
+        end
+
         def create_pkg_product_dependency_ref(product)
           ref = project.new(XCSwiftPackageProductDependency)
           ref.package = self
@@ -53,7 +57,7 @@ module Xcodeproj
         end
 
         def absolute_path
-          path.nil? ? project.path.parent / relative_path : path
+          path.nil? ? project.dir / relative_path : path
         end
       end
 

data/lib/xccache/xcodeproj/project.rb

@@ -12,10 +12,18 @@ module Xcodeproj
       @relative_path ||= path.relative_path_from(Pathname(".").expand_path)
     end
 
+    def dir
+      path.parent
+    end
+
     def pkgs
       root_object.package_references
     end
 
+    def xccache_pkg
+      pkgs.find(&:xccache_pkg?)
+    end
+
     def non_xccache_pkgs
       pkgs.reject(&:xccache_pkg?)
     end
@@ -36,7 +44,8 @@ module Xcodeproj
       Log.message("Add package #{hash[key].bold} to project #{display_name.bold}")
       cls = is_local ? XCLocalSwiftPackageReference : XCRemoteSwiftPackageReference
       ref = new(cls)
-      hash.each { |k, v| ref.send("#{k}=", v) }
+      custom_keys = ["path_from_root"]
+      hash.each { |k, v| ref.send("#{k}=", v) unless custom_keys.include?(k) }
       root_object.package_references << ref
       ref
     end
@@ -46,6 +55,13 @@ module Xcodeproj
       add_pkg("relative_path" => sandbox_path.relative_path_from(path.parent).to_s)
     end
 
+    def remove_pkgs(&block)
+      pkgs.select(&block).each do |pkg|
+        XCCache::UI.info("(-) Remove #{pkg.display_name.red} from package refs of project #{display_name.bold}")
+        pkg.remove_from_project
+      end
+    end
+
     def get_target(name)
       targets.find { |t| t.name == name }
     end
@@ -54,6 +70,10 @@ module Xcodeproj
       pkgs.find { |p| p.slug == name }
     end
 
+    def xccache_config_group
+      self["xccache.config"] || new_group("xccache.config")
+    end
+
     private
 
     def pkg_key_in_hash(hash)

data/lib/xccache/xcodeproj/target.rb

@@ -7,15 +7,15 @@ module Xcodeproj
         alias pkg_product_dependencies package_product_dependencies
 
         def non_xccache_pkg_product_dependencies
-          pkg_product_dependencies.reject { |d| d.pkg.xccache_pkg? }
+          pkg_product_dependencies.reject { |d| d.pkg&.xccache_pkg? }
         end
 
         def has_xccache_product_dependency?
-          pkg_product_dependencies.any? { |d| d.pkg.xccache_pkg? }
+          pkg_product_dependencies.any? { |d| d.pkg&.xccache_pkg? }
         end
 
         def has_pkg_product_dependency?(name)
-          pkg_product_dependencies.any? { |d| "#{d.pkg.slug}/#{d.name}" == name }
+          pkg_product_dependencies.any? { |d| d.full_name == name }
         end
 
         def add_pkg_product_dependency(name)
@@ -41,6 +41,8 @@ module Xcodeproj
             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
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xccache
 version: !ruby/object:Gem::Version
-  version: 0.0.1a2
+  version: 0.0.1a3
 platform: ruby
 authors:
 - Thuyen Trinh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-29 00:00:00.000000000 Z
+date: 2025-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: xcodeproj
+  name: parallel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: xcodeproj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.26.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.26.0
 description: A Ruby gem
 email:
 - trinhngocthuyen@gmail.com
@@ -58,9 +72,13 @@ files:
 - lib/xccache/assets/templates/umbrella.Package.swift.template
 - lib/xccache/cache/cachemap.rb
 - lib/xccache/command.rb
+- lib/xccache/command/base.rb
 - lib/xccache/command/build.rb
 - lib/xccache/command/pkg.rb
 - lib/xccache/command/pkg/build.rb
+- lib/xccache/command/remote.rb
+- lib/xccache/command/remote/pull.rb
+- lib/xccache/command/remote/push.rb
 - lib/xccache/command/rollback.rb
 - lib/xccache/command/use.rb
 - lib/xccache/core.rb
@@ -71,26 +89,30 @@ files:
 - lib/xccache/core/hash.rb
 - lib/xccache/core/lockfile.rb
 - lib/xccache/core/log.rb
+- lib/xccache/core/parallel.rb
 - lib/xccache/core/sh.rb
 - lib/xccache/core/syntax.rb
 - lib/xccache/core/syntax/hash.rb
 - lib/xccache/core/syntax/json.rb
+- lib/xccache/core/syntax/plist.rb
 - lib/xccache/core/syntax/yml.rb
 - lib/xccache/core/system.rb
-- lib/xccache/framework/slice.rb
-- lib/xccache/framework/xcframework.rb
 - lib/xccache/installer.rb
 - lib/xccache/installer/build.rb
 - lib/xccache/installer/rollback.rb
 - lib/xccache/installer/use.rb
 - lib/xccache/main.rb
 - lib/xccache/spm.rb
+- lib/xccache/spm/build.rb
 - lib/xccache/spm/desc.rb
 - lib/xccache/spm/desc/base.rb
 - lib/xccache/spm/desc/dep.rb
 - lib/xccache/spm/desc/desc.rb
 - lib/xccache/spm/desc/product.rb
 - lib/xccache/spm/desc/target.rb
+- lib/xccache/spm/desc/target/binary.rb
+- lib/xccache/spm/desc/target/macro.rb
+- lib/xccache/spm/macro.rb
 - lib/xccache/spm/mixin.rb
 - lib/xccache/spm/pkg.rb
 - lib/xccache/spm/pkg/base.rb
@@ -100,10 +122,23 @@ files:
 - lib/xccache/spm/pkg/umbrella/descs.rb
 - lib/xccache/spm/pkg/umbrella/manifest.rb
 - lib/xccache/spm/pkg/umbrella/viz.rb
+- lib/xccache/spm/pkg/umbrella/xcconfigs.rb
+- lib/xccache/spm/xcframework.rb
+- lib/xccache/spm/xcframework/metadata.rb
+- lib/xccache/spm/xcframework/slice.rb
+- lib/xccache/spm/xcframework/xcframework.rb
+- lib/xccache/storage.rb
+- lib/xccache/storage/base.rb
+- lib/xccache/storage/git.rb
+- lib/xccache/storage/s3.rb
 - lib/xccache/swift/sdk.rb
 - lib/xccache/swift/swiftc.rb
 - lib/xccache/utils/template.rb
 - lib/xccache/xcodeproj.rb
+- lib/xccache/xcodeproj/build_configuration.rb
+- lib/xccache/xcodeproj/config.rb
+- lib/xccache/xcodeproj/file_system_synchronized_root_group.rb
+- lib/xccache/xcodeproj/group.rb
 - lib/xccache/xcodeproj/pkg.rb
 - lib/xccache/xcodeproj/pkg_product_dependency.rb
 - lib/xccache/xcodeproj/project.rb

data/lib/xccache/framework/xcframework.rb

@@ -1,51 +0,0 @@
-module XCCache
-  class Framework
-    class XCFramework
-      attr_reader :name, :module_name, :pkg_dir, :pkg_desc, :config, :sdks, :path
-
-      def initialize(options = {})
-        @name = options[:name]
-        @module_name = @name.c99extidentifier
-        @pkg_dir = options[:pkg_dir]
-        @pkg_desc = options[:pkg_desc]
-        @config = options[:config]
-        @sdks = options[:sdks]
-        @path = options[:path]
-      end
-
-      def create
-        slices.each(&:build)
-        UI.section("Creating #{name}.xcframework from slices") do
-          path.rmtree if path.exist?
-
-          cmd = ["xcodebuild", "-create-xcframework"]
-          cmd << "-output" << path
-          slices.each { |slice| cmd << "-framework" << slice.path }
-          Sh.run(cmd)
-        end
-        tmpdir.rmtree
-
-        # TODO: Should we dispose tmpdir here as well?
-      end
-
-      def tmpdir
-        @tmpdir ||= Dir.create_tmpdir
-      end
-
-      def slices
-        @slices ||= sdks.map do |s|
-          sdk = Swift::Sdk.new(s)
-          Framework::Slice.new(
-            name: name,
-            pkg_dir: pkg_dir,
-            pkg_desc: pkg_desc,
-            sdk: sdk,
-            config: config,
-            path: Dir.prepare(tmpdir / sdk.triple / "#{module_name}.framework"),
-            tmpdir: tmpdir,
-          )
-        end
-      end
-    end
-  end
-end