ficha 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ac8590b6ab46f565f13b1bb959e55c790f8ecebb62a7946b47be7e3acd94a88
-  data.tar.gz: 6290916d3e12018298de9343a6d4803ce2b7beb5d983c19a9f26c1b32993426f
+  metadata.gz: 496e19f7e52e61e225538dea7b4c30c8381d8687b226355ba5912847c08b7a12
+  data.tar.gz: af98dadc7f8a44cb987cda56a07f07d28fa9082d486dd3092eead7715112cbc3
 SHA512:
-  metadata.gz: 68dbe337310fa333176a6b7341d479dec441af04de24dc1e811307631432c3d459b4aaf31fbbf5272148e2b9cef6971aeb9f43e6703f129b2c9314d66236a4d7
-  data.tar.gz: b5216fd9da5ed299891069e10101af2598a3a68c36cdd31ef2b02b7d59e42be5a1d32dd596d8aaf963418c57e752718d44fa5167371362aa15b8c9f7a1c8fe07
+  metadata.gz: 959e3c3e460f16cc0f507c23c23ab5817320e3524066bb7fb87d9ba1113bc26ba4c0bfb484f43e6cfaae4794eb32167096b1e4c991a94ad10cb67d2f24d915a0
+  data.tar.gz: e717d46c80e33f9990c7fad060764a05adaed236e3996d294dcde16dbba1c3f7ef71c35269920ffa5342ffa15cbeb88eafc076a75c5e93c0951c36b9b7bdb083

data/CHANGELOG.md

@@ -1,23 +1,32 @@
 # Changelog
 
-All notable changes to `ficha` will be documented in this file.
-
+All notable changes to `ficha` will be documented in this file.  
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),  
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [0.2.0] - 2025-12-09
+
+### Added
+
+- Support for **global configuration** via `~/.ficha.yml` (used when no local `.ficha.yml` or `ficha.yml` is present).
+- **Strategy composition**: define composite strategies using the `compose` key (e.g. `user-plus-session: { compose: [by-model:User, by-model:Session] }`).
+- Built-in `Style/NoComments` RuboCop cop (disabled by default) for minimal-comment style enforcement.
 
 ### Changed
 
-- Refactored `Ficha::CLI#run` into smaller private methods to improve readability and comply with RuboCop metrics (ABC size, method length).
+- Refactored `Ficha::CLI` and `Ficha::Engine` internals to improve readability and testability.
+- Updated README examples to use correct config key `include_paths` (was incorrectly shown as `include`).
+- Improved query parsing and strategy resolution logic.
 
 ### Fixed
 
-- Auto-corrected code style with RuboCop.
+- Corrected GitHub repository URI in gemspec metadata.
 
 ### Internal
 
-- Added RuboCop linting to GitHub Actions CI.
+- Added end-to-end tests for composed strategies and global config loading.
+- Enforced RuboCop in GitHub Actions CI.
+- Excluded test files from `Metrics/*` RuboCop checks.
 
 ## [0.1.0] - 2025-12-09
 

data/README.md

@@ -131,6 +131,36 @@ excludes:
 
 ---
 
+## Global Configuration
+
+If you don’t want to add `.ficha.yml` to every project, you can create a **global config** at `~/.ficha.yml`.
+
+`ficha` will use it **only when no local `.ficha.yml` or `ficha.yml` is found**.
+
+This is useful for defining your personal strategies (e.g. `by-model`, `by-job`) once and reusing them everywhere.
+
+> 🔒 Sensitive or project-specific paths (like `output`, `excludes`) should still go into local config.
+
+Example `~/.ficha.yml`:
+
+```yaml
+version: "1"
+strategies:
+  by-model:
+    params: [name]
+    include_paths:
+      - "app/models/{{name | underscore}}.rb"
+      - "app/controllers/{{name | pluralize | underscore}}_controller.rb"
+  by-job:
+    params: [name]
+    include_paths:
+      - "app/jobs/{{name | underscore}}.rb"
+```
+
+Now you can run ficha by-model:User in any Ruby project — even without a local config!
+
+---
+
 ## 🎯 Built-in Strategies
 
 | Strategy      | Purpose |

data/bin/console

@@ -4,8 +4,5 @@
 require "bundler/setup"
 require "ficha"
 
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
 require "irb"
 IRB.start(__FILE__)

data/bin/ficha

@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-# bin/ficha
-
 $LOAD_PATH.unshift File.expand_path("../lib", __dir__)
 require "ficha/cli"
 

data/exe/ficha

@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-# exe/ficha
-
 $LOAD_PATH.unshift File.expand_path("../lib", __dir__)
 require "ficha"
 

data/ficha.gemspec

@@ -34,9 +34,9 @@ Gem::Specification.new do |spec|
 
   spec.metadata = {
     "homepage_uri" => spec.homepage,
-    "source_code_uri" => "https://github.com/ilmir/ficha",
-    "changelog_uri" => "https://github.com/ilmir/ficha/blob/main/CHANGELOG.md",
-    "bug_tracker_uri" => "https://github.com/ilmir/ficha/issues",
+    "source_code_uri" => "https://github.com/it1ro/ficha",
+    "changelog_uri" => "https://github.com/it1ro/ficha/blob/main/CHANGELOG.md",
+    "bug_tracker_uri" => "https://github.com/it1ro/ficha/issues",
     "rubygems_mfa_required" => "true"
   }
 end

data/lib/ficha/config.rb

@@ -6,6 +6,10 @@ module Ficha
   class Config
     DEFAULT_CONFIG_PATH = File.expand_path("../../data/base.ficha.yml", __dir__)
 
+    def initialize(data)
+      @data = data
+    end
+
     def self.load(config_path = nil)
       config_path ||= find_config
       if config_path && File.exist?(config_path)
@@ -17,8 +21,15 @@ module Ficha
       new(raw)
     end
 
-    def initialize(data)
-      @data = data
+    def self.find_config
+      local_candidates = ["./.ficha.yml", "./ficha.yml"]
+      local = local_candidates.find { |f| File.exist?(f) }
+      return local if local
+
+      global = File.expand_path("~/.ficha.yml")
+      return global if File.exist?(global)
+
+      nil
     end
 
     def strategies
@@ -28,9 +39,5 @@ module Ficha
     def defaults
       @data.fetch("defaults", {})
     end
-
-    def self.find_config
-      ["./.ficha.yml", "./ficha.yml"].find { |f| File.exist?(f) }
-    end
   end
 end

data/lib/ficha/engine.rb

@@ -31,12 +31,28 @@ module Ficha
       strategy_name = parsed[:name]
       params = parsed[:params]
 
-      strategy = @config.strategies[strategy_name]
-      raise "strategy '#{strategy_name}' not found in .ficha.yml" unless strategy
+      strategy = find_strategy!(strategy_name)
 
-      param_hash = build_param_hash(strategy["params"] || [], params)
+      if strategy.key?("compose")
+        resolve_composed_query(strategy["compose"])
+      else
+        resolve_simple_query(strategy, params)
+      end
+    end
+
+    def find_strategy!(name)
+      strategy = @config.strategies[name]
+      raise "strategy '#{name}' not found in .ficha.yml" unless strategy
+
+      strategy
+    end
+
+    def resolve_composed_query(sub_queries)
+      sub_queries.flat_map { |sub_query| resolve_query(sub_query) }
+    end
 
-      # Раскрываем include_paths через шаблоны и glob
+    def resolve_simple_query(strategy, given_params)
+      param_hash = build_param_hash(strategy["params"] || [], given_params)
       strategy["include_paths"].flat_map do |pattern|
         rendered = Template.render(pattern, param_hash)
         Dir.glob(rendered)
@@ -75,7 +91,6 @@ module Ficha
       excludes = @overrides[:exclude_paths] || []
       files.reject do |path|
         excludes.any? do |exclude_glob|
-          # Если glob не содержит *, **, ? — считаем, что это директория → добавляем /**
           glob = exclude_glob.include?("*") || exclude_glob.include?("?") ? exclude_glob : "#{exclude_glob}/**/*"
           File.fnmatch(glob, path, File::FNM_PATHNAME | File::FNM_DOTMATCH)
         end

data/lib/ficha/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ficha
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Ilmir Karimov
@@ -56,9 +56,9 @@ licenses:
 - AGPL-3.0-or-later
 metadata:
   homepage_uri: https://github.com/ilmir/ficha
-  source_code_uri: https://github.com/ilmir/ficha
-  changelog_uri: https://github.com/ilmir/ficha/blob/main/CHANGELOG.md
-  bug_tracker_uri: https://github.com/ilmir/ficha/issues
+  source_code_uri: https://github.com/it1ro/ficha
+  changelog_uri: https://github.com/it1ro/ficha/blob/main/CHANGELOG.md
+  bug_tracker_uri: https://github.com/it1ro/ficha/issues
   rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths: