caruso 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f7f1e5f2c4af1c26c2592aaa0cd5be588fa105ae3e7c8faf009275e881b2800
-  data.tar.gz: d740248a46af8e1559f7b02fb70b2660ff907b66e1acd7522c4e7a2692255938
+  metadata.gz: e27842f0328ffd84a7b184987157b7bae790284f304d190896ad566250da4de2
+  data.tar.gz: 156462c94584cd858bf0bc30fe83ad71e1796c3022088147eb03dd39e4cc0712
 SHA512:
-  metadata.gz: f77816058f4901d123ba754005869b7e40d8f15be411df9c9fa1c96a261513a4aa420886396aa2cc32f719beaf5876b7ab102c4ee1e9105980402e4c5192a549
-  data.tar.gz: 7d85e8b21768c2978db8b29089920baa39a679163561eeba8ce8e012ad807068ff866d39a37e9411f1dec861232e5c19387c00daf4bb83e6e11673b294df1709
+  metadata.gz: c404d5dbe4128f2c63e8ab01ac39760aa1e131d73eeb80d7c4a5ca23fb47dde2d9f2f90508625d2c60d60903942e622e62bc14adc690fe5c43657acc8ca26e96
+  data.tar.gz: 530cb46037d8b3a67dfe3e8fca939d008b41d6ec580049392779ab047ada81321f4faadc17b00d2a2f77ff847f3bee92704929ec05803a15753fbfcbaf9824d7

data/.rubocop.yml

@@ -60,6 +60,7 @@ Metrics/ClassLength:
     - 'spec/**/*'
     - 'lib/caruso/cli.rb'  # CLI class has many Thor commands
     - 'lib/caruso/fetcher.rb'  # Fetcher handles multiple sources
+    - 'lib/caruso/adapters/hook_adapter.rb'  # Hook translation has many methods
 
 # Prefer descriptive block parameter names
 Lint/UnusedBlockArgument:

data/lib/caruso/adapters/hook_adapter.rb

@@ -7,9 +7,7 @@ require_relative "base"
 module Caruso
   module Adapters
     class HookAdapter < Base
-      # Claude Code events that map to Cursor events.
-      # Each CC event maps to a single Cursor event name.
-      # Matchers are lost in translation (Cursor has no matcher concept).
+      # CC events map to Cursor events; matchers are lost (Cursor has no matcher concept).
       EVENT_MAP = {
         "PreToolUse" => "beforeShellExecution",
         "PostToolUse" => "afterShellExecution",
@@ -17,11 +15,10 @@ module Caruso
         "Stop" => "stop"
       }.freeze
 
-      # PostToolUse with Write|Edit matchers should map to afterFileEdit instead.
-      # We detect this via the matcher pattern.
+      # PostToolUse with Write|Edit matchers maps to afterFileEdit instead.
       FILE_EDIT_MATCHERS = /\A(Write|Edit|Write\|Edit|Edit\|Write|Notebook.*)\z/i
 
-      # Events that have no Cursor equivalent and must be skipped.
+      # Events with no Cursor equivalent.
       UNSUPPORTED_EVENTS = %w[
         SessionStart
         SessionEnd
@@ -31,8 +28,7 @@ module Caruso
         PermissionRequest
       ].freeze
 
-      # After adapt(), contains the translated hook commands keyed by event.
-      # Used by callers to track which hooks were installed for clean uninstall.
+      # Contains translated hook commands keyed by event (for clean uninstall tracking).
       attr_reader :translated_hooks
 
       def adapt
@@ -65,8 +61,6 @@ module Caruso
       private
 
       def find_hooks_file
-        # files array contains the hooks.json path passed in by the Dispatcher.
-        # Also matches .caruso_inline_hooks.json written by Fetcher for inline plugin.json hooks.
         files.find { |f| File.basename(f) =~ /hooks\.json\z/ }
       end
 
@@ -151,9 +145,7 @@ module Caruso
       end
 
       def plugin_root_from_hooks_file(hooks_file)
-        # ${CLAUDE_PLUGIN_ROOT} refers to the plugin root directory.
-        # hooks.json is typically at <plugin_root>/hooks/hooks.json,
-        # so the plugin root is the parent of the hooks/ directory.
+        # Plugin root is parent of hooks/ dir (hooks.json is at <plugin_root>/hooks/hooks.json)
         hooks_dir = File.dirname(hooks_file)
         if File.basename(hooks_dir) == "hooks"
           File.dirname(hooks_dir)
@@ -174,7 +166,11 @@ module Caruso
         command = hook["command"]
         return unless command&.include?("${CLAUDE_PLUGIN_ROOT}")
 
-        relative_path = command.sub("${CLAUDE_PLUGIN_ROOT}/", "")
+        # Extract path after placeholder (handles "python3 ${CLAUDE_PLUGIN_ROOT}/script.py")
+        match = command.match(%r{\$\{CLAUDE_PLUGIN_ROOT\}/([^\s]+)})
+        return unless match
+
+        relative_path = match[1]
         source_path = File.join(plugin_root, relative_path)
         return unless File.exist?(source_path)
 

data/lib/caruso/cli.rb

@@ -29,6 +29,9 @@ module Caruso
       # Read marketplace name from marketplace.json
       marketplace_name = fetcher.extract_marketplace_name
 
+      # Register in the persistent marketplace registry (only after name is known)
+      fetcher.register_marketplace(marketplace_name)
+
       config_manager.add_marketplace(marketplace_name, url, source: source, ref: options[:ref])
 
       puts "Added marketplace '#{marketplace_name}' from #{url}"

data/lib/caruso/fetcher.rb

@@ -72,6 +72,10 @@ module Caruso
       url = source_config["url"] || source_config["repo"]
       url = "https://github.com/#{url}.git" if source_config["source"] == "github" && !url.match?(/\Ahttps?:/)
 
+      # Store these for later registration
+      @clone_url = url
+      @clone_source_type = source_config["source"] || "git"
+
       URI.parse(url).path.split("/").last.sub(".git", "")
       target_path = cache_dir
 
@@ -80,10 +84,6 @@ module Caruso
         FileUtils.mkdir_p(File.dirname(target_path))
         Git.clone(url, target_path)
         checkout_ref if @ref
-
-        # Add to registry
-        source_type = source_config["source"] || "git"
-        @registry.add_marketplace(@marketplace_name, url, target_path, ref: @ref, source: source_type)
       end
 
       target_path
@@ -92,6 +92,15 @@ module Caruso
       nil
     end
 
+    # Register the marketplace in the registry after name is known.
+    # Must be called after extract_marketplace_name or when marketplace_name is set.
+    def register_marketplace(name)
+      return unless @clone_url # Only register if we cloned something
+
+      @marketplace_name = name
+      @registry.add_marketplace(name, @clone_url, cache_dir, ref: @ref, source: @clone_source_type)
+    end
+
     def extract_marketplace_name
       marketplace_data = load_marketplace
       name = marketplace_data["name"]
@@ -106,7 +115,25 @@ module Caruso
     private
 
     def load_marketplace
-      if local_path?
+      # Check github_repo? BEFORE local_path? because owner/repo format (e.g., "anthropics/claude-code")
+      # doesn't start with https:// but should be treated as a GitHub repo, not a local path
+      if github_repo?
+        # Clone repo and read marketplace.json from it
+        repo_path = clone_git_repo("url" => @marketplace_uri, "source" => "github")
+        # Try standard locations
+        json_path = File.join(repo_path, ".claude-plugin", "marketplace.json")
+        json_path = File.join(repo_path, "marketplace.json") unless File.exist?(json_path)
+
+        unless File.exist?(json_path)
+          raise "Could not find marketplace.json in #{@marketplace_uri}"
+        end
+
+        # Update marketplace_uri to point to the local file so relative paths work
+        @marketplace_uri = json_path
+        @base_dir = repo_path # Base dir is the repo root, regardless of where json is
+
+        JSON.parse(SafeFile.read(json_path))
+      elsif local_path?
         # If marketplace_uri is a directory, find marketplace.json in it
         if SafeDir.exist?(@marketplace_uri)
           json_path = File.join(@marketplace_uri, ".claude-plugin", "marketplace.json")
@@ -126,22 +153,6 @@ module Caruso
         end
 
         JSON.parse(SafeFile.read(@marketplace_uri))
-      elsif github_repo?
-        # Clone repo and read marketplace.json from it
-        repo_path = clone_git_repo("url" => @marketplace_uri, "source" => "github")
-        # Try standard locations
-        json_path = File.join(repo_path, ".claude-plugin", "marketplace.json")
-        json_path = File.join(repo_path, "marketplace.json") unless File.exist?(json_path)
-
-        unless File.exist?(json_path)
-          raise "Could not find marketplace.json in #{@marketplace_uri}"
-        end
-
-        # Update marketplace_uri to point to the local file so relative paths work
-        @marketplace_uri = json_path
-        @base_dir = repo_path # Base dir is the repo root, regardless of where json is
-
-        JSON.parse(SafeFile.read(json_path))
       else
         response = Faraday.get(@marketplace_uri)
         JSON.parse(response.body)

data/lib/caruso/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Caruso
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caruso
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Philipp Comans