xccache 0.0.1.rc14987908371 → 0.0.1.rc14991851613

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0bde9f30b45d9bb5fa1d57f746027a52966b3dbd8e346df12ea7192352b4771
-  data.tar.gz: 9c00c24e25538a0a7e57d0fb5b523562529f2bef84a5e0dd3db2dcc48b5a2d06
+  metadata.gz: fd5e1c42ab55e9d384b998ec94ca4dfe10c1b71cddde74f1b5a45fe8df9e99c5
+  data.tar.gz: a516b16ec060985d2bc705eb030b259b2858a96d110fa3ca1e046f89fb3c43f7
 SHA512:
-  metadata.gz: 66ede00254ddaf3471eaf2626a8f69548bdaf3afaa5b2fa25ced9b410212b7b63e96dfd2f1252f70b81f894cf39fa2dbe0e04938e37f834ccdce4c4cd08022bb
-  data.tar.gz: bc0a0ebf9d586e20c8a8af039d3481afa301543d5b4d717f365861e5bbd4cabc644dd6bbf512c1264abff8c833866fb970cc76885a22ea4c96378f99f30c2571
+  metadata.gz: 4b1ff0db0ed02e89266e8cd99262a09c53dcac4a2854f48e35f27e56f5b341e5272b63f8afbcffd28241a112ea50c4116793577535a4e8643e693b234bcb7a64
+  data.tar.gz: 9d57cf95ec5327a3688e0d437c67022fff096182fa9680a5418d75e5e3199bfb14063af67c2d3a4d0e4d8b4ac09f11faf976c5a713addc31b52500c6953336fe

data/lib/xccache/assets/templates/umbrella.Package.swift.template

@@ -40,7 +40,6 @@ enum XCCache {
   @MainActor
   struct Config {
     static let pkgDir = URL(filePath: #filePath).deletingLastPathComponent()
-    static let repoDir = URL.homeDirectory.appending(path: ".xccache/default")
     // NOTE: Do NOT change `binariesDir` to `static let`
     // Somehow, incremental resolution doesnt work causing the `binaryExist` wrongly cached
     static var binariesDir: URL { pkgDir.appending(path: "binaries") }

data/lib/xccache/command/base.rb

@@ -4,7 +4,7 @@ module XCCache
   class Command
     class Options
       SDK = ["--sdk=foo,bar", "SDKs (iphonesimulator, iphoneos, etc.)"].freeze
-      CONFIG = ["--config=foo", "Configuration (debug, release)"].freeze
+      CONFIG = ["--config=foo", "Configuration (debug, release) (default: debug)"].freeze
       SKIP_RESOLVING_DEPENDENCIES = [
         "--skip-resolving-dependencies", "Skip resolving package dependencies",
       ].freeze
@@ -18,11 +18,11 @@ module XCCache
       ].freeze
 
       def self.install_options
-        [SDK, SKIP_RESOLVING_DEPENDENCIES]
+        [SDK, CONFIG, SKIP_RESOLVING_DEPENDENCIES]
       end
 
       def self.build_options
-        install_options + [CONFIG, MERGE_SLICES, LIBRARY_EVOLUTION]
+        install_options + [MERGE_SLICES, LIBRARY_EVOLUTION]
       end
     end
   end

data/lib/xccache/command/cache/clean.rb

@@ -0,0 +1,32 @@
+module XCCache
+  class Command
+    class Cache < Command
+      class Clean < Cache
+        self.summary = "Cleaning/purging cache"
+        self.arguments = [CLAide::Argument.new("TARGET", false, true)]
+        def self.options
+          [
+            ["--all", "Whether to remove all cache (default: false)"],
+            ["--dry", "Dry run - don't remove cache, just show what shall be removed (default: false)"],
+          ].concat(super)
+        end
+
+        def initialize(argv)
+          super
+          @all = argv.flag?("all")
+          @dry = argv.flag?("dry")
+          @targets = argv.arguments!
+        end
+
+        def run
+          to_remove = @targets.flat_map { |t| config.spm_cache_dir.glob("#{t}/*") }
+          to_remove = config.spm_cache_dir.glob("*/*") if @all
+          to_remove.each do |p|
+            UI.info("Removing #{p.basename.to_s.yellow}")
+            p.rmtree unless @dry
+          end
+        end
+      end
+    end
+  end
+end

data/lib/xccache/command/cache/list.rb

@@ -0,0 +1,21 @@
+module XCCache
+  class Command
+    class Cache < Command
+      class List < Cache
+        self.summary = "Listing cache"
+
+        def run
+          target_paths = config.spm_cache_dir.glob("*")
+          target_paths.each do |target_path|
+            next if (paths = target_path.glob("*")).empty?
+            descs = paths.map { |p| "  #{p.basename.to_s.green}" }
+            UI.info <<~DESC
+              #{target_path.basename.to_s.cyan}:
+              #{descs.join('\n')}
+            DESC
+          end
+        end
+      end
+    end
+  end
+end

data/lib/xccache/command/cache.rb

@@ -0,0 +1,12 @@
+require_relative "base"
+require "xccache/command/cache/clean"
+require "xccache/command/cache/list"
+
+module XCCache
+  class Command
+    class Cache < Command
+      self.abstract_command = true
+      self.summary = "Working with cache (list, clean, etc.)"
+    end
+  end
+end

data/lib/xccache/command/remote.rb

@@ -10,6 +10,7 @@ module XCCache
       self.summary = "Working with remote cache"
       def self.options
         [
+          Options::CONFIG,
           ["--branch=foo", "Cache branch (if using git) (default: main)"],
         ].concat(super)
       end

data/lib/xccache/command.rb

@@ -16,13 +16,14 @@ module XCCache
     def initialize(argv)
       super
       config.verbose = verbose unless verbose.nil?
+      config.install_config = argv.option("config", "debug")
       @install_options = {
         :sdks => str_to_sdks(argv.option("sdk")),
+        :config => config.install_config,
         :skip_resolving_dependencies => argv.flag?("skip-resolving-dependencies"),
       }
       @build_options = {
         **@install_options,
-        :config => argv.option("config"),
         :recursive => argv.flag?("recursive"),
         :merge_slices => argv.flag?("merge-slices", true),
         :library_evolution => argv.flag?("library-evolution"),

data/lib/xccache/core/config.rb

@@ -20,6 +20,12 @@ module XCCache
     attr_accessor :in_installation
     alias in_installation? in_installation
 
+    attr_writer :install_config
+
+    def install_config
+      @install_config || "debug"
+    end
+
     def sandbox
       @sandbox = Dir.prepare("xccache").expand_path
     end
@@ -36,8 +42,8 @@ module XCCache
       @spm_xcconfig_dir ||= Dir.prepare(spm_sandbox / "xcconfigs")
     end
 
-    def spm_repo_dir
-      @spm_repo_dir ||= Dir.prepare(Pathname("~/.xccache/default").expand_path)
+    def spm_cache_dir
+      @spm_cache_dir ||= Dir.prepare(Pathname("~/.xccache/#{install_config}").expand_path)
     end
 
     def spm_binaries_dir
@@ -79,7 +85,7 @@ module XCCache
     end
 
     def remote_config
-      raw["remote"] || {}
+      pick_per_install_config(raw["remote"] || {})
     end
 
     def ignore_list
@@ -106,5 +112,11 @@ module XCCache
     def default_sdk
       raw["default_sdk"] || "iphonesimulator"
     end
+
+    private
+
+    def pick_per_install_config(hash)
+      hash[install_config] || hash["default"] || {}
+    end
   end
 end

data/lib/xccache/installer/build.rb

@@ -12,7 +12,7 @@ module XCCache
         perform_install do
           umbrella_pkg.build(
             targets: @targets,
-            out_dir: config.spm_repo_dir,
+            out_dir: config.spm_cache_dir,
             checksum: true,
             **@build_options,
           )

data/lib/xccache/installer.rb

@@ -14,8 +14,8 @@ module XCCache
     end
 
     def perform_install
+      UI.message("Using cache dir: #{config.spm_cache_dir}")
       config.in_installation = true
-      verify_projects!
       if @umbrella_pkg.nil?
         sync_lockfile
         umbrella_pkg.prepare(**@install_options)
@@ -53,6 +53,7 @@ module XCCache
     end
 
     def update_projects
+      verify_projects!
       projects.each do |project|
         yield project if block_given?
         project.save

data/lib/xccache/spm/pkg/umbrella/cachemap.rb

@@ -91,7 +91,7 @@ module XCCache
         def binary_path(name, checksum: nil, in_repo: false)
           suffix = checksum.nil? ? "" : "-#{checksum}"
           ext = File.extname(name) == ".macro" ? ".macro" : ".xcframework"
-          binaries_dir = in_repo ? config.spm_repo_dir : config.spm_binaries_dir
+          binaries_dir = in_repo ? config.spm_cache_dir : config.spm_binaries_dir
           p = binaries_dir / File.basename(name, ".*")
           p / "#{p.basename}#{suffix}#{ext}"
         end

data/lib/xccache/storage/git.rb

@@ -34,7 +34,7 @@ module XCCache
     private
 
     def git
-      @git ||= Git.new(config.spm_repo_dir)
+      @git ||= Git.new(config.spm_cache_dir)
     end
 
     def ensure_remote

data/lib/xccache/storage/s3.rb

@@ -12,11 +12,11 @@ module XCCache
     end
 
     def pull
-      s3_sync(src: @uri, dst: config.spm_repo_dir)
+      s3_sync(src: @uri, dst: config.spm_cache_dir)
     end
 
     def push
-      s3_sync(src: config.spm_repo_dir, dst: @uri)
+      s3_sync(src: config.spm_cache_dir, dst: @uri)
     end
 
     private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xccache
 version: !ruby/object:Gem::Version
-  version: 0.0.1.rc14987908371
+  version: 0.0.1.rc14991851613
 platform: ruby
 authors:
 - Thuyen Trinh
@@ -74,6 +74,9 @@ files:
 - lib/xccache/command.rb
 - lib/xccache/command/base.rb
 - lib/xccache/command/build.rb
+- lib/xccache/command/cache.rb
+- lib/xccache/command/cache/clean.rb
+- lib/xccache/command/cache/list.rb
 - lib/xccache/command/pkg.rb
 - lib/xccache/command/pkg/build.rb
 - lib/xccache/command/remote.rb