xccache 1.0.0.rc15341775774 → 1.0.1.rc15390855924

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f7b0d46b9a50e667904aedb052da8fa0605932bcd56c518bb308b9802622d74
-  data.tar.gz: 3b98c6610a1f5db2223f93747533a5b8c27f35a163b0e2b6d480a264b7a9ffd0
+  metadata.gz: 49f968905b37c1abaa715789a33a9541f8bacc2b6cb6dc977b111609a64ebcf0
+  data.tar.gz: 27fa86909bc610e202efcf8fef604feca6563c6b88a879363bf021e2345cdc09
 SHA512:
-  metadata.gz: 00d1a9e5103c69e770c96b78012ae25ee9dbfd6dbacfee4d2d5b2962d52a116663dfae34e3b7263ead13928470883c555cf11e1d0b17d8c332939d1d8938a1b1
-  data.tar.gz: efb6d6d67964fe7edd78a08985682101c691d38837f92a322c5e85a395808a88e248db6cce3c01aadc4b9dc8b2f97a4d6340be129c61ef0bd2a8cfe7558b8171
+  metadata.gz: e99517798ad0d7b733f918e7d1863f57b551c481913769bb20c255b1accdcbf781984ed87b3d8257ecd16fe0f49aa14b4abadb77b50e654b8800bfdf1b1e4253
+  data.tar.gz: d283643742be4fef5b01ce53a98f2651ae1fc896a3d00abab3322242bb11ab984a4688064bb674584d3f4a9866ef849e3a274fea0786ac28eca06a3b25c9749c

data/lib/xccache/assets/templates/xccache.yml.template

@@ -0,0 +1,2 @@
+# Check out this doc for details
+# https://github.com/trinhngocthuyen/xccache/blob/main/docs/configuration.md

data/lib/xccache/command/base.rb

@@ -3,7 +3,7 @@ require "xccache/installer"
 module XCCache
   class Command
     class Options
-      SDK = ["--sdk=foo,bar", "SDKs (iphonesimulator, iphoneos, etc.)"].freeze
+      SDK = ["--sdk=foo,bar", "SDKs (iphonesimulator, iphoneos, macos, etc.)"].freeze
       CONFIG = ["--config=foo", "Configuration (debug, release) (default: debug)"].freeze
       MERGE_SLICES = [
         "--merge-slices/--no-merge-slices",

data/lib/xccache/core/config.rb

@@ -23,6 +23,10 @@ module XCCache
 
     attr_writer :install_config
 
+    def ensure_file!
+      Template.new("xccache.yml").render(save_to: path) unless path.exist?
+    end
+
     def install_config
       @install_config || "debug"
     end

data/lib/xccache/core/git.rb

@@ -3,7 +3,7 @@ module XCCache
     attr_reader :root
 
     def initialize(root)
-      @root = Pathname(root)
+      @root = Pathname(root).expand_path
     end
 
     def run(*args, **kwargs)

data/lib/xccache/core/system.rb

@@ -14,8 +14,9 @@ class File
 end
 
 class Dir
-  def self.prepare(dir, clean: false)
+  def self.prepare(dir, clean: false, expand: false)
     dir = Pathname(dir)
+    dir = dir.expand_path if expand
     dir.rmtree if clean && dir.exist?
     dir.mkpath
     dir

data/lib/xccache/installer.rb

@@ -19,6 +19,7 @@ module XCCache
       verify_projects!
       projects.each { |project| migrate_umbrella_to_proxy(project) }
       UI.message("Using cache dir: #{config.spm_cache_dir}")
+      config.ensure_file!
       config.in_installation = true
       sync_lockfile
       proxy_pkg.prepare(@install_options)
@@ -99,7 +100,7 @@ module XCCache
       add_file = proc { |p| group[p.basename.to_s] || group.new_file(p) }
       add_file.call(config.spm_proxy_sandbox / "Package.swift")
       add_file.call(config.lockfile.path)
-      add_file.call(config.path) if config.path.exist?
+      add_file.call(config.path)
       group.ensure_synced_group(name: "local-packages", path: config.spm_local_pkgs_dir)
     end
 

data/lib/xccache/spm/macro.rb

@@ -3,12 +3,9 @@ require_relative "build"
 module XCCache
   module SPM
     class Macro < Buildable
-      attr_reader :macosx_sdk
-
       def initialize(options = {})
         super
         @library_evolution = false # swift-syntax is not compatible with library evolution
-        @macosx_sdk = Swift::Sdk.new(:macosx)
       end
 
       def build(_options = {})
@@ -37,7 +34,7 @@ module XCCache
       end
 
       def products_dir
-        @products_dir ||= pkg_dir / ".build" / macosx_sdk.triple / config
+        @products_dir ||= pkg_dir / ".build" / "arm64-apple-macosx" / config
       end
     end
   end

data/lib/xccache/spm/pkg/proxy_executable.rb

@@ -3,7 +3,8 @@ module XCCache
     class Package
       class Proxy < Package
         class Executable
-          VERSION = "0.0.1rc3".freeze
+          REPO_URL = "https://github.com/trinhngocthuyen/xccache-proxy".freeze
+          VERSION_OR_SHA = "1.0.0rc1".freeze
 
           def run(cmd)
             env = { "FORCE_OUTPUT" => "console", "FORCE_COLOR" => "1" } if Config.instance.ansi?
@@ -21,13 +22,35 @@ module XCCache
             [
               local_bin_path,
               default_bin_path,
-            ].find(&:exist?) || download
+            ].find(&:exist?) || download_or_build_from_source
+          end
+
+          def default_use_downloaded?
+            VERSION_OR_SHA.include?(".")
+          end
+
+          def download_or_build_from_source
+            default_use_downloaded? ? download : build_from_source
+          end
+
+          def build_from_source
+            UI.section("Building xccache-proxy binary from source...".magenta) do
+              dir = Dir.prepare("~/.xccache/xccache-proxy", expand: true)
+              git = Git.new(dir)
+              git.init unless git.init?
+              git.remote("add", "origin", REPO_URL) unless git.remote(capture: true)[0].strip == "origin"
+              git.fetch("origin", VERSION_OR_SHA)
+              git.checkout("-f", "FETCH_HEAD", capture: true)
+
+              Dir.chdir(dir) { Sh.run("make build CONFIGURATION=release") }
+              (dir / ".build" / "release" / "xccache-proxy").copy(to: default_bin_path)
+            end
           end
 
           def download
             UI.section("Downloading xccache-proxy binary from remote...".magenta) do
               Dir.create_tmpdir do |dir|
-                url = "https://github.com/trinhngocthuyen/xccache-proxy/releases/download/#{VERSION}/xccache-proxy.zip"
+                url = "#{REPO_URL}/releases/download/#{VERSION_OR_SHA}/xccache-proxy.zip"
                 default_bin_path.parent.mkpath
                 tmp_path = dir / File.basename(url)
                 Sh.run("curl -fSL -o #{tmp_path} #{url} && unzip -d #{default_bin_path.parent} #{tmp_path}")
@@ -38,7 +61,10 @@ module XCCache
           end
 
           def default_bin_path
-            @default_bin_path ||= LIBEXEC / ".download" / "xccache-proxy-#{VERSION}" / "xccache-proxy"
+            @default_bin_path ||= begin
+              dir = LIBEXEC / (default_use_downloaded? ? ".download" : ".build")
+              dir / "xccache-proxy-#{VERSION_OR_SHA}" / "xccache-proxy"
+            end
           end
 
           def local_bin_path

data/lib/xccache/swift/sdk.rb

@@ -8,11 +8,19 @@ module XCCache
       NAME_TO_TRIPLE = {
         :iphonesimulator => "arm64-apple-ios-simulator",
         :iphoneos => "arm64-apple-ios",
-        :macosx => "arm64-apple-macosx",
+        :macos => "arm64-apple-macos",
+        :watchos => "arm64-apple-watchos",
+        :watchsimulator => "arm64-apple-watchos-simulator",
+        :appletvos => "arm64-apple-tvos",
+        :appletvsimulator => "arm64-apple-tvos-simulator",
+        :xros => "arm64-apple-xros",
+        :xrsimulator => "arm64-apple-xros-simulator",
       }.freeze
 
       def initialize(name)
         @name = name
+        return if NAME_TO_TRIPLE.key?(name.to_sym)
+        raise GeneralError, "Unknown sdk: #{name}. Must be one of #{NAME_TO_TRIPLE.keys}"
       end
 
       def to_s
@@ -25,11 +33,15 @@ module XCCache
         res
       end
 
+      def sdk_name
+        name == "macos" ? "macosx" : name
+      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
+        @sdk_path ||= Pathname(Sh.capture_output("xcrun --sdk #{sdk_name} --show-sdk-path")).realpath
       end
 
       def sdk_platform_developer_path

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xccache
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc15341775774
+  version: 1.0.1.rc15390855924
 platform: ruby
 authors:
 - Thuyen Trinh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-30 00:00:00.000000000 Z
+date: 2025-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -69,6 +69,7 @@ files:
 - lib/xccache/assets/templates/framework.modulemap.template
 - lib/xccache/assets/templates/resource_bundle_accessor.m.template
 - lib/xccache/assets/templates/resource_bundle_accessor.swift.template
+- lib/xccache/assets/templates/xccache.yml.template
 - lib/xccache/cache/cachemap.rb
 - lib/xccache/command.rb
 - lib/xccache/command/base.rb