agents_skill_vault 0.1.0 → 0.2.0

data/lib/agents_skill_vault/vault.rb

@@ -20,6 +20,11 @@ module AgentsSkillVault
   #   vault.sync("user/repo")           # => SyncResult
   #
   class Vault
+    include ResourceAdder
+    include ResourceSyncer
+    include ResourceValidator
+    include ManifestOperations
+
     # @return [String] The absolute path to the vault's storage directory
     attr_reader :storage_path
 
@@ -46,7 +51,6 @@ module AgentsSkillVault
       GitOperations.check_git_available!
       GitOperations.check_git_version!
 
-      # Auto-validate unvalidated resources if manifest exists
       validate_all if File.exist?(@manifest_path) && !list_unvalidated.empty?
     end
 
@@ -102,7 +106,7 @@ module AgentsSkillVault
     # Filters resources by GitHub username.
     #
     # @param username [String] The GitHub username to filter by
-    # @return [Array<Resource>] Resources owned by the specified user
+    # @return [Array<Resource>] Resources owned by specified user
     #
     # @example
     #   vault.filter_by_username("octocat")
@@ -159,7 +163,7 @@ module AgentsSkillVault
     # Filters resources by skill name.
     #
     # @param name [String] The skill name to filter by
-    # @return [Array<Resource>] Resources matching the skill name
+    # @return [Array<Resource>] Resources matching skill name
     #
     def filter_by_skill_name(name)
       list.select { |r| r.skill_name == name }
@@ -167,7 +171,7 @@ module AgentsSkillVault
 
     # Finds a resource by its label without raising an error.
     #
-    # @param label [String] The unique label of the resource
+    # @param label [String] The unique label of resource
     # @return [Resource, nil] The resource if found, nil otherwise
     #
     # @example
@@ -180,7 +184,7 @@ module AgentsSkillVault
 
     # Retrieves a resource by its label, raising an error if not found.
     #
-    # @param label [String] The unique label of the resource
+    # @param label [String] The unique label of resource
     # @return [Resource] The resource with the specified label
     # @raise [Errors::NotFound] if no resource with the label exists
     #
@@ -231,7 +235,7 @@ module AgentsSkillVault
       results
     end
 
-    # Removes a resource from the vault.
+    # Removes a resource from vault.
     #
     # @param label [String] The label of the resource to remove
     # @param delete_files [Boolean] Whether to also delete the local files (default: false)
@@ -251,539 +255,10 @@ module AgentsSkillVault
       manifest.remove_resource(label)
     end
 
-    # Validates a specific resource.
-    #
-    # Re-validates the skill file and updates the validation status.
-    #
-    # @param label [String] The label of the resource to validate
-    # @return [Resource] The updated resource
-    # @raise [Errors::NotFound] if the resource doesn't exist
-    #
-    def validate_resource(label)
-      resource = fetch(label)
-
-      if resource.is_skill
-        skill_file = File.join(resource.local_path, "SKILL.md")
-        result = SkillValidator.validate(skill_file)
-
-        updated_resource = Resource.from_h(
-          resource.to_h.merge(
-            validation_status: result[:valid] ? :valid_skill : :invalid_skill,
-            validation_errors: result[:errors]
-          ),
-          storage_path: storage_path
-        )
-      else
-        updated_resource = Resource.from_h(
-          resource.to_h.merge(validation_status: :not_a_skill),
-          storage_path: storage_path
-        )
-      end
-
-      manifest.update_resource(updated_resource)
-      updated_resource
-    end
-
-    # Validates all resources in the vault.
-    #
-    # Re-validates all resources and updates their validation status.
-    #
-    # @return [Hash] Summary of validation results
-    #   - :valid [Integer] Count of valid skills
-    #   - :invalid [Integer] Count of invalid skills
-    #   - :not_a_skill [Integer] Count of non-skill resources
-    #   - :unvalidated [Integer] Count of resources that couldn't be validated
-    #
-    def validate_all
-      results = { valid: 0, invalid: 0, not_a_skill: 0, unvalidated: 0 }
-
-      list.each do |resource|
-        validate_resource(resource.label)
-
-        case resource.validation_status
-        when :valid_skill
-          results[:valid] += 1
-        when :invalid_skill
-          results[:invalid] += 1
-        when :not_a_skill
-          results[:not_a_skill] += 1
-        else
-          results[:unvalidated] += 1
-        end
-      end
-
-      results
-    end
-
-    # Removes all invalid skills from the vault.
-    #
-    # Deletes local files and removes from manifest for all resources with
-    # validation_status == :invalid_skill.
-    #
-    # @return [Integer] Number of skills removed
-    #
-    def cleanup_invalid_skills
-      invalid_resources = list_invalid_skills
-
-      invalid_resources.each do |resource|
-        FileUtils.rm_rf(resource.local_path) if resource.local_path
-        manifest.remove_resource(resource.label)
-      end
-
-      invalid_resources.size
-    end
-
-    # Re-downloads all resources from scratch.
-    #
-    # Deletes local files and performs a fresh clone/checkout for each resource.
-    # Useful for recovering from corruption or ensuring a clean state.
-    #
-    # @return [void]
-    #
-    def redownload_all
-      list.each do |resource|
-        FileUtils.rm_rf(resource.local_path) if resource.local_path
-        download_resource(resource)
-        updated_resource = Resource.from_h(resource.to_h.merge(synced_at: Time.now), storage_path: storage_path)
-        manifest.update_resource(updated_resource)
-      end
-    end
-
-    # Exports the manifest to a file for backup or sharing.
-    #
-    # @param export_path [String] Path where the manifest should be exported
-    # @return [void]
-    #
-    # @example
-    #   vault.export_manifest("/backups/manifest.json")
-    #
-    def export_manifest(export_path)
-      FileUtils.cp(@manifest_path, export_path)
-    end
-
-    # Imports and merges a manifest from another vault.
-    #
-    # Resources from the imported manifest are merged with existing resources.
-    # If a label exists in both, the imported resource overwrites the existing one.
-    # Note: This only updates the manifest; files are not downloaded automatically.
-    #
-    # @param import_path [String] Path to the manifest file to import
-    # @return [void]
-    #
-    # @example
-    #   vault.import_manifest("/shared/manifest.json")
-    #   vault.redownload_all  # Download the imported resources
-    #
-    def import_manifest(import_path)
-      imported_data = JSON.parse(File.read(import_path), symbolize_names: true)
-      current_data = manifest.load
-
-      merged_resources = merge_resources(current_data[:resources] || [], imported_data[:resources] || [])
-
-      manifest.save(version: Manifest::VERSION, resources: merged_resources)
-    end
-
     private
 
     def default_manifest_data
       { version: Manifest::VERSION, resources: [] }
     end
-
-    # Adds a repository resource, scanning for all skills.
-    #
-    # @param parsed_url [UrlParser::ParseResult] Parsed URL
-    # @param label [String, nil] Custom label
-    # @return [Array<Resource>] Created resources (one per skill found)
-    #
-    def add_repository_resource(parsed_url, label:)
-      target_path = File.join(storage_path, parsed_url.username, parsed_url.repo)
-      FileUtils.mkdir_p(File.dirname(target_path))
-
-      repo_url = "https://github.com/#{parsed_url.username}/#{parsed_url.repo}"
-      GitOperations.clone_repo(repo_url, target_path, branch: parsed_url.branch)
-
-      skills = SkillScanner.scan_directory(target_path)
-
-      if skills.empty?
-        # No skills found, create single resource for repo
-        resource = create_resource(parsed_url, label: label || parsed_url.label)
-        resource = Resource.from_h(
-          resource.to_h.merge(
-            validation_status: :not_a_skill,
-            is_skill: false
-          ),
-          storage_path: storage_path
-        )
-        manifest.add_resource(resource)
-        return [resource]
-      end
-
-      # Create resource for each skill found
-      skills.map do |skill|
-        skill_label = label ? "#{label}-#{skill[:skill_name]}" : "#{parsed_url.username}/#{parsed_url.repo}/#{skill[:skill_name]}"
-
-        resource = Resource.new(
-          label: skill_label,
-          url: repo_url,
-          username: parsed_url.username,
-          repo: parsed_url.repo,
-          folder: skill[:folder_path],
-          type: :repo,
-          branch: parsed_url.branch,
-          relative_path: skill[:folder_path],
-          storage_path: storage_path,
-          validation_status: :unvalidated,
-          validation_errors: [],
-          skill_name: skill[:skill_name],
-          is_skill: true
-        )
-
-        skill_file = File.join(target_path, skill[:folder_path], "SKILL.md")
-        result = SkillValidator.validate(skill_file)
-
-        resource = Resource.from_h(
-          resource.to_h.merge(
-            validation_status: result[:valid] ? :valid_skill : :invalid_skill,
-            validation_errors: result[:errors]
-          ),
-          storage_path: storage_path
-        )
-
-        manifest.add_resource(resource)
-        resource
-      end
-    end
-
-    # Adds a folder resource.
-    #
-    # @param parsed_url [UrlParser::ParseResult] Parsed URL
-    # @param label [String, nil] Custom label
-    # @return [Resource] Created resource
-    #
-    def add_folder_resource(parsed_url, label:)
-      repo_path = File.join(storage_path, parsed_url.username, parsed_url.repo)
-      target_path = File.join(repo_path, parsed_url.relative_path)
-      FileUtils.mkdir_p(repo_path)
-
-      repo_url = "https://github.com/#{parsed_url.username}/#{parsed_url.repo}"
-      paths = [parsed_url.relative_path]
-      GitOperations.sparse_checkout(repo_url, repo_path, branch: parsed_url.branch, paths: paths)
-
-      skills = SkillScanner.scan_directory(target_path)
-
-      if skills.empty?
-        skill_name = File.basename(parsed_url.relative_path)
-        resource_label = label || "#{parsed_url.username}/#{parsed_url.repo}/#{skill_name}"
-
-        resource = Resource.new(
-          label: resource_label,
-          url: repo_url,
-          username: parsed_url.username,
-          repo: parsed_url.repo,
-          folder: parsed_url.relative_path,
-          type: :folder,
-          branch: parsed_url.branch,
-          relative_path: parsed_url.relative_path,
-          storage_path: storage_path,
-          validation_status: :not_a_skill,
-          validation_errors: [],
-          skill_name: nil,
-          is_skill: false
-        )
-
-        manifest.add_resource(resource)
-        resource
-      elsif skills.length == 1
-        skill = skills.first
-        skill_name = skill[:skill_name]
-        resource_label = label || "#{parsed_url.username}/#{parsed_url.repo}/#{skill_name}"
-
-        skill_relative_path = if skill[:relative_path] == "."
-                                parsed_url.relative_path
-                              else
-                                File.join(
-                                  parsed_url.relative_path, skill[:relative_path]
-                                )
-                              end
-
-        resource = Resource.new(
-          label: resource_label,
-          url: repo_url,
-          username: parsed_url.username,
-          repo: parsed_url.repo,
-          folder: parsed_url.relative_path,
-          type: :folder,
-          branch: parsed_url.branch,
-          relative_path: skill_relative_path,
-          storage_path: storage_path,
-          skill_name: skill_name,
-          is_skill: true
-        )
-
-        skill_file = File.join(target_path, skill[:relative_path], "SKILL.md")
-        result = SkillValidator.validate(skill_file)
-
-        resource = Resource.from_h(
-          resource.to_h.merge(
-            validation_status: result[:valid] ? :valid_skill : :invalid_skill,
-            validation_errors: result[:errors]
-          ),
-          storage_path: storage_path
-        )
-
-        manifest.add_resource(resource)
-        resource
-      else
-        skills.map do |skill|
-          skill_name = skill[:skill_name]
-          skill_label = label ? "#{label}/#{skill_name}" : "#{parsed_url.username}/#{parsed_url.repo}/#{skill_name}"
-
-          skill_relative_path = if skill[:relative_path] == "."
-                                  parsed_url.relative_path
-                                else
-                                  File.join(
-                                    parsed_url.relative_path, skill[:relative_path]
-                                  )
-                                end
-
-          resource = Resource.new(
-            label: skill_label,
-            url: repo_url,
-            username: parsed_url.username,
-            repo: parsed_url.repo,
-            folder: parsed_url.relative_path,
-            type: :folder,
-            branch: parsed_url.branch,
-            relative_path: skill_relative_path,
-            storage_path: storage_path,
-            skill_name: skill_name,
-            is_skill: true
-          )
-
-          skill_file = File.join(target_path, skill[:relative_path], "SKILL.md")
-          result = SkillValidator.validate(skill_file)
-
-          resource = Resource.from_h(
-            resource.to_h.merge(
-              validation_status: result[:valid] ? :valid_skill : :invalid_skill,
-              validation_errors: result[:errors]
-            ),
-            storage_path: storage_path
-          )
-
-          manifest.add_resource(resource)
-          resource
-        end
-      end
-    end
-
-    # Adds a file resource.
-    #
-    # @param parsed_url [UrlParser::ParseResult] Parsed URL
-    # @param label [String, nil] Custom label
-    # @return [Resource] Created resource
-    #
-    def add_file_resource(parsed_url, label:)
-      repo_url = "https://github.com/#{parsed_url.username}/#{parsed_url.repo}"
-
-      if parsed_url.is_skill_file?
-        # This is a SKILL.md file, download the parent folder
-        repo_path = File.join(storage_path, parsed_url.username, parsed_url.repo)
-        target_path = File.join(repo_path, parsed_url.skill_folder_path)
-        FileUtils.mkdir_p(repo_path)
-
-        paths = [parsed_url.skill_folder_path]
-        GitOperations.sparse_checkout(repo_url, repo_path, branch: parsed_url.branch, paths: paths)
-
-        skill_file = File.join(target_path, "SKILL.md")
-        result = SkillValidator.validate(skill_file)
-
-        resource_label = label || "#{parsed_url.username}/#{parsed_url.repo}/#{parsed_url.skill_name}"
-        resource = Resource.new(
-          label: resource_label,
-          url: repo_url,
-          username: parsed_url.username,
-          repo: parsed_url.repo,
-          folder: parsed_url.skill_folder_path,
-          type: :file,
-          branch: parsed_url.branch,
-          relative_path: parsed_url.skill_folder_path,
-          storage_path: storage_path,
-          validation_status: result[:valid] ? :valid_skill : :invalid_skill,
-          validation_errors: result[:errors],
-          skill_name: parsed_url.skill_name,
-          is_skill: true
-        )
-
-        manifest.add_resource(resource)
-        resource
-      else
-        # Non-SKILL.md file, download the parent folder
-        parent_path = File.dirname(parsed_url.relative_path)
-        repo_path = File.join(storage_path, parsed_url.username, parsed_url.repo)
-        FileUtils.mkdir_p(repo_path)
-
-        paths = [parent_path]
-        GitOperations.sparse_checkout(repo_url, repo_path, branch: parsed_url.branch, paths: paths)
-
-        resource = Resource.new(
-          label: label || parsed_url.label,
-          url: parsed_url.url,
-          username: parsed_url.username,
-          repo: parsed_url.repo,
-          folder: parent_path,
-          type: :file,
-          branch: parsed_url.branch,
-          relative_path: parsed_url.relative_path,
-          storage_path: storage_path,
-          validation_status: :not_a_skill,
-          validation_errors: [],
-          skill_name: nil,
-          is_skill: false
-        )
-
-        manifest.add_resource(resource)
-        resource
-      end
-    end
-
-    def create_resource(parsed_url, label:)
-      label ||= parsed_url.label
-
-      Resource.new(
-        label: label,
-        url: "https://github.com/#{parsed_url.username}/#{parsed_url.repo}",
-        username: parsed_url.username,
-        repo: parsed_url.repo,
-        folder: parsed_url.type == :repo ? nil : File.basename(parsed_url.relative_path || ""),
-        type: parsed_url.type,
-        branch: parsed_url.branch,
-        relative_path: parsed_url.relative_path,
-        storage_path: storage_path
-      )
-    end
-
-    def download_resource(resource)
-      target_path = resource.local_path
-      parent_dir = File.dirname(target_path)
-      FileUtils.mkdir_p(parent_dir)
-
-      if resource.type == :repo
-        GitOperations.clone_repo(resource.url, target_path, branch: resource.branch)
-      else
-        paths = [resource.relative_path]
-        GitOperations.sparse_checkout(resource.url, target_path, branch: resource.branch, paths: paths)
-      end
-    end
-
-    def sync_resource(resource)
-      return SyncResult.new(success: false, error: "Resource has no local path") unless resource.local_path
-
-      unless Dir.exist?(resource.local_path)
-        return SyncResult.new(success: false,
-                              error: "Path does not exist: #{resource.local_path}")
-      end
-
-      GitOperations.pull(resource.local_path)
-
-      # For repo type resources, re-scan for skills and re-validate
-      if resource.type == :repo
-        sync_repository_resource(resource)
-      else
-        # For folder/file type resources, just re-validate
-        validate_resource(resource.label)
-      end
-
-      # Update synced_at for all resources from this repo
-      repo_resources = list.select { |r| r.repo == resource.repo && r.username == resource.username }
-      repo_resources.each do |r|
-        updated = Resource.from_h(r.to_h.merge(synced_at: Time.now), storage_path: storage_path)
-        manifest.update_resource(updated)
-      end
-
-      SyncResult.new(success: true, changes: true)
-    rescue Errors::Error => e
-      SyncResult.new(success: false, error: e.message)
-    end
-
-    # Syncs a repository-type resource, re-scanning for skills.
-    #
-    # @param resource [Resource] The resource to sync
-    #
-    def sync_repository_resource(resource)
-      skills = SkillScanner.scan_directory(resource.local_path)
-
-      # Get existing skills for this repo
-      existing_resources = list.select do |r|
-        r.repo == resource.repo && r.username == resource.username && r.type == :repo
-      end
-
-      # Process each found skill
-      skills.each do |skill|
-        skill_label = "#{resource.username}/#{resource.repo}/#{skill[:skill_name]}"
-        existing = existing_resources.find { |r| r.skill_name == skill[:skill_name] }
-
-        if existing
-          # Re-validate existing skill
-          skill_file = File.join(resource.local_path, skill[:folder_path], "SKILL.md")
-          result = SkillValidator.validate(skill_file)
-
-          updated = Resource.from_h(
-            existing.to_h.merge(
-              validation_status: result[:valid] ? :valid_skill : :invalid_skill,
-              validation_errors: result[:errors]
-            ),
-            storage_path: storage_path
-          )
-          manifest.update_resource(updated)
-        else
-          # Add new skill
-          new_resource = Resource.new(
-            label: skill_label,
-            url: resource.url,
-            username: resource.username,
-            repo: resource.repo,
-            folder: skill[:folder_path],
-            type: :repo,
-            branch: resource.branch,
-            relative_path: skill[:folder_path],
-            storage_path: storage_path,
-            validation_status: :unvalidated,
-            validation_errors: [],
-            skill_name: skill[:skill_name],
-            is_skill: true
-          )
-
-          skill_file = File.join(resource.local_path, skill[:folder_path], "SKILL.md")
-          result = SkillValidator.validate(skill_file)
-
-          new_resource = Resource.from_h(
-            new_resource.to_h.merge(
-              validation_status: result[:valid] ? :valid_skill : :invalid_skill,
-              validation_errors: result[:errors]
-            ),
-            storage_path: storage_path
-          )
-
-          manifest.add_resource(new_resource)
-        end
-      end
-    end
-
-    def merge_resources(current_resources, imported_resources)
-      merged = current_resources.dup
-
-      imported_resources.each do |imported|
-        existing_index = merged.find_index { |r| r[:label] == imported[:label] }
-
-        if existing_index
-          merged[existing_index] = imported
-        else
-          merged << imported
-        end
-      end
-
-      merged
-    end
   end
 end

data/lib/agents_skill_vault/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AgentsSkillVault
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/scripts/manual_test.rb

@@ -21,23 +21,23 @@ def section(title)
   puts "=" * 70
 end
 
-def print_resource(r)
-  status_sym = r.validation_status.to_s.upcase
-  status_color = case r.validation_status
+def print_resource(resource)
+  status_sym = resource.validation_status.to_s.upcase
+  status_color = case resource.validation_status
                  when :valid_skill then "✓"
                  when :invalid_skill then "✗"
                  when :not_a_skill then "○"
                  else "?"
                  end
 
-  puts "  #{status_color} #{r.label}"
-  puts "     Type: #{r.type}, URL: #{r.url}"
-  puts "     Local: #{r.local_path}"
-  puts "     Skill: #{r.skill_name || "N/A"}"
+  puts "  #{status_color} #{resource.label}"
+  puts "     Type: #{resource.type}, URL: #{resource.url}"
+  puts "     Local: #{resource.local_path}"
+  puts "     Skill: #{resource.skill_name || "N/A"}"
   puts "     Status: #{status_sym}"
-  return unless r.validation_errors.any?
+  return unless resource.validation_errors.any?
 
-  puts "     Errors: #{r.validation_errors.empty? ? "None" : r.validation_errors.join(", ")}"
+  puts "     Errors: #{resource.validation_errors.empty? ? "None" : resource.validation_errors.join(", ")}"
 end
 
 def print_sync_result(label, result)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: agents_skill_vault
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Lucian Ghinda
@@ -84,6 +84,10 @@ files:
 - lib/agents_skill_vault/sync_result.rb
 - lib/agents_skill_vault/url_parser.rb
 - lib/agents_skill_vault/vault.rb
+- lib/agents_skill_vault/vault/manifest_operations.rb
+- lib/agents_skill_vault/vault/resource_adder.rb
+- lib/agents_skill_vault/vault/resource_syncer.rb
+- lib/agents_skill_vault/vault/resource_validator.rb
 - lib/agents_skill_vault/version.rb
 - scripts/manual_test.rb
 - sig/agents_skill_vault.rbs