rails_git_hooks 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b95455f85a5e5f3789055e84fc610dcfa199f593d3fc34e5dfb94b781b0ad050
-  data.tar.gz: d2f37971fb832ba3c0e2b3651c7d27b4ca8a7665d6fdac879a43eac8ca38b022
+  metadata.gz: 8f679908a499fe6aed2f61cf433d27bf93042bf0dcf1ecfe2e4854f05b0e7b9e
+  data.tar.gz: 481df290f21058504a14d0b6995854861ed7d15099b40a34ec9ccdf6f18fcf3c
 SHA512:
-  metadata.gz: 93b5d01ffd6b14ed1d94543a41e95286afbcaa1f808d9c1d4045dd193e9de3a9f02b3b8a5d5374eadaea450028b28ee89a09c1af20869e30cd8cdeeb8620f259
-  data.tar.gz: 549b45c9aeb5f9607c5aa779d4fdf71196d7d08525f79cfde5e3bf2c3a7df107aa34e397258d4218e45a026e6ed474ab6bb4fc906174af0876eb61ba5cd4e44b
+  metadata.gz: 63518e1bcbca51fc17881473b90a0eb510eb2a6e62b26e6471e8890f8fd4e702392b6401f92124d4cd9cc1d398ad0aa03b3c9306a4ce34dc40313d6ab028da52
+  data.tar.gz: c549c30ca8f646f65bdf10a7281e0f2412bb8a796e0665a80e68c05cdac6ed0a39aed58f48011e23b3eba4622db43b6764bae103e434170a601938f4e5f8291e

data/CHANGELOG.md

@@ -4,6 +4,21 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [0.7.2]
+
+### Added
+
+- **post-checkout hook** — Runs after branch checkout. Includes `bundle-install` (run `bundle install` when Gemfile/Gemfile.lock changed) and `db-migrate` (run `rails db:migrate` when migrations or schema changed). Both enabled by default.
+- **post-merge hook** — Runs after merge. Same checks as post-checkout: `bundle-install` and `db-migrate`, enabled by default. Keeps the app bundled and migrated when pulling or merging (inspired by [hookup](https://rubygems.org/gems/hookup)).
+- **Shared check modules** — `checks/shared/bundle_install_check.rb` and `checks/shared/db_migrate_check.rb` hold common logic and options for the post-checkout and post-merge bundle/migrate checks.
+- **Specs for every check** — RSpec examples for all 13 checks (pre-commit, commit-msg, pre-push, post-checkout, post-merge) under `spec/rails_git_hooks/checks/`.
+
+### Changed
+
+- **Default install** — With no config file, `install` now installs **commit-msg**, **pre-commit**, **post-checkout**, and **post-merge** (post-checkout/post-merge bundle and db-migrate checks are on by default).
+- **Runner** — `modified_files` now supports `post_checkout` (files changed between refs on branch checkout) and `post_merge` (files changed between ORIG_HEAD and HEAD). Repository adds `changed_files(ref1, ref2)`.
+- **defaults.yml** — PostCheckout and PostMerge sections: `BundleInstall` and `DbMigrate` set to `enabled: true` by default.
+
 ## [0.7.1]
 
 ### Added

data/README.md

@@ -4,45 +4,51 @@
 [![Build Status](https://github.com/NikitaNazarov1/rails_git_hooks/actions/workflows/tests.yml/badge.svg?branch=main)](https://github.com/NikitaNazarov1/rails_git_hooks/actions/workflows/tests.yml?query=branch%3Amain)
 [![RuboCop](https://github.com/NikitaNazarov1/rails_git_hooks/actions/workflows/rubocop.yml/badge.svg?branch=main)](https://github.com/NikitaNazarov1/rails_git_hooks/actions/workflows/rubocop.yml?query=branch%3Amain)
 
-Git hooks for Rails and Ruby projects with built-in defaults, optional sparse overrides, and Overcommit-style per-check policies.
-
-## What changed
-
-The project now uses a **code-first hook runtime**:
-
-- checks declare their defaults in Ruby
-- hook scripts are thin bootstraps
-- `.rails_git_hooks.yml` is optional and contains only overrides
-- checks can be configured with `enabled`, `quiet`, `on_fail`, `on_warn`, `on_missing_dependency`, `include`, and `exclude`
-
-## Included hooks
-
-| Git hook | Purpose |
-|---|---|
-| `commit-msg` | Prefix commit messages with Jira-style ticket IDs from the current branch |
-| `pre-commit` | Run commit-time checks like branch protection, debugger detection, format validation, and optional code quality checks |
-| `pre-push` | Run the test suite before push |
+Git hooks for Rails and Ruby projects: sensible defaults out of the box, optional YAML overrides, and per-check policies (enable/disable, fail vs warn, include/exclude).
+
+## Features
+
+- **Code-first runtime** — Checks are Ruby classes; hook scripts are thin bootstraps that delegate to a shared runtime.
+- **Sparse config** — Defaults live in the gem ([config/defaults.yml](https://github.com/NikitaNazarov1/rails_git_hooks/blob/main/lib/rails_git_hooks/config/defaults.yml)). But you can redefine them via your own yml config file in a root repository.
+- **Flexible configuration options** — Per check: `enabled`, `quiet`, `on_fail`, `on_warn`, `on_missing_dependency`, `include`, `exclude`, `command`.
+- **Dependency handling** — Checks declare executables/libraries; missing deps are handled by a single policy (`on_missing_dependency`).
+
+## Included hooks and checks
+
+| Hook         | Check key            | Enabled By Default | Description |
+|-------------|----------------------|---------|-------------|
+| **commit-msg** | `jira-prefix`        | ✅      | Prefix commit messages with Jira-style ticket IDs from the branch name (e.g. `[TICKET-123]`). |
+| **pre-commit** | `default-branch`     | ✅      | Block commits on `master` / `main`; prompt to use a feature branch. |
+| **pre-commit** | `debugger-check`     | ✅      | Warn (or fail) on debugger statements in Ruby, JavaScript/TypeScript, and Python. |
+| **pre-commit** | `yaml-format-check`  | ✅      | Warn on invalid `.yml` / `.yaml` files. |
+| **pre-commit** | `json-format-check`  | ✅      | Warn on invalid `.json` files. |
+| **pre-commit** | `migrations-check`   | ✅      | Warn when migration files are staged but schema/data_schema files are not. |
+| **pre-commit** | `whitespace-check`   | Off     | Fail on trailing whitespace and merge conflict markers. |
+| **pre-commit** | `rubocop-check`      | Off     | Run RuboCop on staged Ruby files (requires `rubocop` in the project). |
+| **pre-push**   | `run-tests`          | Off     | Run test suite before push (default: `bundle exec rspec`). Enable in config to install pre-push. |
+| **post-checkout** | `bundle-install`   | ✅      | Run `bundle install` when Gemfile or Gemfile.lock changed after a branch checkout. |
+| **post-checkout** | `db-migrate`       | ✅      | Run `rails db:migrate` when migrations or schema changed after a branch checkout. |
+| **post-merge** | `bundle-install`     | ✅      | Run `bundle install` when Gemfile or Gemfile.lock changed after a merge. |
+| **post-merge** | `db-migrate`        | ✅      | Run `rails db:migrate` when migrations or schema changed after a merge. |
 
 ## Quick start
 
-### 1. Install the gem
-
-```bash
-gem install rails_git_hooks
-```
+### 1. Add the gem
 
-Or add it to your `Gemfile`:
+**Gemfile:**
 
 ```ruby
 gem "rails_git_hooks"
 ```
 
-Then install dependencies:
+Then:
 
 ```bash
 bundle install
 ```
 
+Or install globally: `gem install rails_git_hooks`.
+
 ### 2. Install hooks
 
 From your project root:
@@ -51,53 +57,25 @@ From your project root:
 bundle exec rails_git_hooks install
 ```
 
-This installs `commit-msg` and `pre-commit` by default.
-
-### 3. Inspect available checks
-
-```bash
-bundle exec rails_git_hooks list
-```
-
-### 4. Override behavior only when needed
-
-Enable RuboCop:
-
-```bash
-bundle exec rails_git_hooks enable rubocop-check
-```
-
-Make debugger statements fail instead of warn:
+With default config this installs **commit-msg**, **pre-commit**, **post-checkout**, and **post-merge** into `.git/hooks/` and copies the runtime there (pre-push is off by default; enable `run-tests` in config to add it).
 
-```bash
-bundle exec rails_git_hooks set debugger-check on_fail fail
-```
+## Configuration
 
-Disable migrations warnings:
+### Priority (low → high)
 
-```bash
-bundle exec rails_git_hooks disable migrations-check
-```
+1. **Built-in defaults** (in the gem’s `config/defaults.yml`)
+2. **`.rails_git_hooks.yml`** in the repo root (sparse overrides; commit this)
+3. **`.rails_git_hooks.local.yml`** in the repo root (optional; overrides the above, typically gitignored)
 
-Show effective config:
-
-```bash
-bundle exec rails_git_hooks show-config
-```
-
-## Config model
-
-You do **not** need a config file for the defaults to work.
-
-If you want overrides, create one:
+**Create the main override file:**
 
 ```bash
 bundle exec rails_git_hooks init
 ```
 
-This creates `.rails_git_hooks.yml`. The file is sparse: only your changes are stored there.
+**Optional:** Create `.rails_git_hooks.local.yml` in the repo root for personal overrides (merged on top of `.rails_git_hooks.yml`). Add it to `.gitignore` if you don’t want to commit it.
 
-Example:
+### Example override file
 
 ```yaml
 PreCommit:
@@ -114,116 +92,29 @@ PreCommit:
       - "db/schema.rb"
 ```
 
-### Supported per-check options
-
-| Option | Meaning |
-|---|---|
-| `enabled` | Enable or disable a check |
-| `quiet` | Hide normal output unless the check warns or fails |
-| `on_fail` | Map a check failure to `fail`, `warn`, or `pass` |
-| `on_warn` | Map a warning to `warn`, `fail`, or `pass` |
-| `on_missing_dependency` | Control behavior when required tools/libraries are missing |
-| `include` | File paths or glob patterns that the check should apply to |
-| `exclude` | File paths or glob patterns to remove from the included set |
-| `command` | Override the command used by command-based checks |
+### Per-check options
 
-## Dependency model
-
-Checks can declare dependencies such as:
-
-- executables like `bundle`
-- Ruby libraries like `rubocop`
-- required files
-
-If a dependency is missing, the runner produces a structured result and applies the check’s `on_missing_dependency` policy. This makes missing-tool behavior consistent across all checks.
-
-## Default checks
-
-### `commit-msg`
-
-- `jira-prefix`
-  - enabled by default
-  - prefixes commit messages with `[TICKET-123]` when the branch name contains a Jira-style ticket ID
-
-### `pre-commit`
-
-- `default-branch`
-  - enabled by default
-  - fails on `master` / `main`
-
-- `debugger-check`
-  - enabled by default
-  - warns on debugger statements in Ruby, JavaScript/TypeScript, and Python
-
-- `yaml-format-check`
-  - enabled by default
-  - warns on invalid `.yml` / `.yaml`
-
-- `json-format-check`
-  - enabled by default
-  - warns on invalid `.json`
-
-- `migrations-check`
-  - enabled by default
-  - warns when schema/data schema files appear to be missing after migrations
-
-- `whitespace-check`
-  - disabled by default
-  - fails on trailing whitespace and merge conflict markers
-
-- `rubocop-check`
-  - disabled by default
-  - runs RuboCop on staged Ruby files
-  - default dependency behavior warns if `rubocop` is missing
-
-### `pre-push`
-
-- `run-tests`
-  - enabled by default when `pre-push` is installed
-  - runs `bundle exec rspec`
+| Option | Description |
+|--------|--------------|
+| `enabled` | Turn the check on or off. |
+| `quiet` | Suppress normal output unless the check warns or fails. |
+| `on_fail` | `fail`, `warn`, or `pass` when the check fails. |
+| `on_warn` | `warn`, `fail`, or `pass` when the check would warn. |
+| `on_missing_dependency` | Behavior when a required executable/library is missing. |
+| `include` | Glob patterns for files the check applies to. |
+| `exclude` | Glob patterns to exclude from `include`. |
+| `command` | Override the command for checks that run external commands. |
 
 ## CLI reference
 
 | Command | Description |
-|---|---|
-| `rails_git_hooks install [HOOK...]` | Install hook scripts into `.git/hooks` |
-| `rails_git_hooks list` | List available git hooks and check keys |
-| `rails_git_hooks init` | Create `.rails_git_hooks.yml` |
-| `rails_git_hooks enable CHECK_NAME` | Set `enabled: true` for a check override |
-| `rails_git_hooks disable CHECK_NAME` | Set `enabled: false` for a check override |
-| `rails_git_hooks set CHECK_NAME OPTION VALUE` | Set a single override option |
-| `rails_git_hooks show-config` | Print effective merged configuration |
-
-Examples:
-
-```bash
-rails_git_hooks install
-rails_git_hooks install pre-push
-rails_git_hooks enable rubocop-check
-rails_git_hooks disable migrations-check
-rails_git_hooks set debugger-check on_fail fail
-rails_git_hooks set rubocop-check quiet true
-rails_git_hooks show-config
-```
-
-## Manual installation
+|---------|--------------|
+| `rails_git_hooks install` | Install hooks that have at least one enabled check in the merged config (defaults + .rails_git_hooks.yml + .rails_git_hooks.local.yml). |
+| `rails_git_hooks init` | Create an empty `.rails_git_hooks.yml`. |
 
-From your project (with the gem in the Gemfile or installed), run:
+## Contributing
 
-```bash
-bundle exec rails_git_hooks install
-```
-
-This installs the thin hook bootstraps and the embedded `rails_git_hooks` runtime into `.git/hooks/`.
-
-## Development
-
-```bash
-bundle install
-bundle exec rake              # run specs
-bundle exec rake build        # build the gem
-bundle exec rake install      # install locally
-```
+Contributions are welcome. Open an [issue](https://github.com/NikitaNazarov1/rails_git_hooks/issues) for bugs or ideas, or submit a pull request.
 
 ## License
 

data/lib/rails_git_hooks/checks/post_checkout/bundle_install.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module GitHooks
+  module Checks
+    module PostCheckout
+      class BundleInstall < Base
+        include BundleInstallCheck
+
+        check_definition key: 'bundle-install',
+                         hook: :post_checkout,
+                         description: 'Run bundle install when Gemfile or Gemfile.lock changed (branch checkout)',
+                         **BundleInstallCheck::DEFINITION_OPTIONS
+      end
+    end
+  end
+end

data/lib/rails_git_hooks/checks/post_checkout/db_migrate.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module GitHooks
+  module Checks
+    module PostCheckout
+      class DbMigrate < Base
+        include DbMigrateCheck
+
+        check_definition key: 'db-migrate',
+                         hook: :post_checkout,
+                         description: 'Run db:migrate when migrations or schema changed (branch checkout)',
+                         **DbMigrateCheck::DEFINITION_OPTIONS
+      end
+    end
+  end
+end

data/lib/rails_git_hooks/checks/post_checkout.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module GitHooks
+  module Checks
+    module PostCheckout
+    end
+  end
+end
+
+require_relative 'post_checkout/bundle_install'
+require_relative 'post_checkout/db_migrate'

data/lib/rails_git_hooks/checks/post_merge/bundle_install.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module GitHooks
+  module Checks
+    module PostMerge
+      class BundleInstall < Base
+        include BundleInstallCheck
+
+        check_definition key: 'bundle-install',
+                         hook: :post_merge,
+                         description: 'Run bundle install when Gemfile or Gemfile.lock changed (after merge)',
+                         **BundleInstallCheck::DEFINITION_OPTIONS
+      end
+    end
+  end
+end

data/lib/rails_git_hooks/checks/post_merge/db_migrate.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module GitHooks
+  module Checks
+    module PostMerge
+      class DbMigrate < Base
+        include DbMigrateCheck
+
+        check_definition key: 'db-migrate',
+                         hook: :post_merge,
+                         description: 'Run db:migrate when migrations or schema changed (after merge)',
+                         **DbMigrateCheck::DEFINITION_OPTIONS
+      end
+    end
+  end
+end

data/lib/rails_git_hooks/checks/post_merge.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module GitHooks
+  module Checks
+    module PostMerge
+    end
+  end
+end
+
+require_relative 'post_merge/bundle_install'
+require_relative 'post_merge/db_migrate'

data/lib/rails_git_hooks/checks/shared/bundle_install_check.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module GitHooks
+  module Checks
+    # Shared logic and options for "run bundle install when Gemfile/Gemfile.lock changed"
+    # (post-checkout and post-merge). Each hook has its own class that passes hook + description.
+    module BundleInstallCheck
+      DEFINITION_OPTIONS = {
+        file_based: true,
+        enabled: false,
+        include: %w[Gemfile Gemfile.lock],
+        dependencies: { executables: ['bundle'] },
+        command: %w[bundle install],
+        install_hint: 'Ensure bundle is available'
+      }.freeze
+
+      def run
+        return CheckResult.pass if applicable_files.empty?
+
+        output, status = capture(*Array(config['command']))
+        return CheckResult.pass if status.success?
+
+        messages = output.split("\n").map(&:rstrip).reject(&:empty?)
+        CheckResult.fail(messages: messages)
+      end
+    end
+  end
+end

data/lib/rails_git_hooks/checks/shared/db_migrate_check.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module GitHooks
+  module Checks
+    # Shared logic and options for "run db:migrate when migrations or schema changed"
+    # (post-checkout and post-merge). Each hook has its own class that passes hook + description.
+    module DbMigrateCheck
+      DEFINITION_OPTIONS = {
+        file_based: true,
+        enabled: false,
+        include: ['db/migrate/*.rb', 'db/schema.rb', 'db/structure.sql'],
+        dependencies: { executables: ['bundle'] },
+        command: %w[bundle exec rails db:migrate],
+        install_hint: 'Rails app with db:migrate (or override command in config)'
+      }.freeze
+
+      def run
+        return CheckResult.pass if applicable_files.empty?
+
+        output, status = capture(*Array(config['command']))
+        return CheckResult.pass if status.success?
+
+        messages = output.split("\n").map(&:rstrip).reject(&:empty?)
+        CheckResult.fail(messages: messages)
+      end
+    end
+  end
+end

data/lib/rails_git_hooks/checks.rb

@@ -4,3 +4,7 @@ require_relative 'checks/base'
 require_relative 'checks/pre_commit'
 require_relative 'checks/commit_msg'
 require_relative 'checks/pre_push'
+require_relative 'checks/shared/bundle_install_check'
+require_relative 'checks/shared/db_migrate_check'
+require_relative 'checks/post_checkout'
+require_relative 'checks/post_merge'

data/lib/rails_git_hooks/cli.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'rails_git_hooks'
-require 'yaml'
 
 module GitHooks
   class CLI
@@ -10,22 +9,13 @@ module GitHooks
     end
 
     def run(argv)
-      case argv[0]
+      cmd = argv[0].to_s.strip.tr('_', '-')
+      case cmd
       when 'install'
-        run_install(argv[1..])
-      when 'list'
-        run_list
+        run_install
       when 'init'
         run_init
-      when 'disable'
-        run_disable(argv[1..])
-      when 'enable'
-        run_enable(argv[1..])
-      when 'set'
-        run_set(argv[1..])
-      when 'show-config'
-        run_show_config
-      when nil, '-h', '--help'
+      when '', '-h', '--help'
         print_help
       else
         warn "Unknown command: #{argv[0]}"
@@ -36,118 +26,36 @@ module GitHooks
 
     private
 
-    def run_install(args)
+    def run_install
       installer = Installer.new
-      installed = installer.install(*args)
+      installed = installer.install
       puts "Installed hooks: #{installed.join(', ')}"
     rescue GitHooks::Error => e
       warn "Error: #{e.message}"
       exit 1
     end
 
-    def run_list
-      repo = Repository.new
-      config = OverrideConfig.new(repo: repo)
-
-      puts 'Available hooks:'
-      Installer.available_hook_names.each { |name| puts "  #{name}" }
-      puts
-      puts 'Available checks:'
-      CheckRegistry.all.each do |definition|
-        check_config = config.config_for(definition)
-        puts "  #{definition.key} (#{definition.hook_section}/#{definition.config_name}, enabled=#{check_config['enabled']})"
-      end
-    rescue GitHooks::Error
-      puts 'Available hooks:'
-      Installer.available_hook_names.each { |name| puts "  #{name}" }
-      puts
-      puts 'Available checks:'
-      CheckRegistry.all.each do |definition|
-        puts "  #{definition.key} (#{definition.hook_section}/#{definition.config_name})"
-      end
-    end
-
     def run_init
       config = OverrideConfig.new(repo: Repository.new)
       config.init
       puts "Initialized #{Constants::CONFIG_FILE}"
     end
 
-    def run_disable(args)
-      key = args.first
-      if key.nil?
-        warn 'Usage: rails_git_hooks disable CHECK_NAME'
-        exit 1
-      end
-
-      repo = Repository.new
-      definition = CheckRegistry.find!(key)
-      OverrideConfig.new(repo: repo).set_option(definition, 'enabled', false)
-      puts "Disabled: #{key}"
-    end
-
-    def run_enable(args)
-      key = args.first
-      if key.nil?
-        warn 'Usage: rails_git_hooks enable CHECK_NAME'
-        exit 1
-      end
-
-      repo = Repository.new
-      definition = CheckRegistry.find!(key)
-      OverrideConfig.new(repo: repo).set_option(definition, 'enabled', true)
-      puts "Enabled: #{key}"
-    end
-
-    def run_set(args)
-      key, option, value = args
-      if key.nil? || option.nil? || value.nil?
-        warn 'Usage: rails_git_hooks set CHECK_NAME OPTION VALUE'
-        exit 1
-      end
-
-      definition = CheckRegistry.find!(key)
-      OverrideConfig.new(repo: Repository.new).set_option(definition, option, value)
-      puts "Updated: #{key} #{option}=#{value}"
-    end
-
-    def run_show_config
-      repo = Repository.new
-      config = OverrideConfig.new(repo: repo).effective_config(CheckRegistry.all)
-      puts YAML.dump(config)
-    end
-
     def print_help
       puts <<~HELP
         rails_git_hooks - Install configurable Git hooks
 
         Usage:
-          rails_git_hooks install [HOOK...]
-          rails_git_hooks list
+          rails_git_hooks install
           rails_git_hooks init
-          rails_git_hooks enable CHECK_NAME
-          rails_git_hooks disable CHECK_NAME
-          rails_git_hooks set CHECK_NAME OPTION VALUE
-          rails_git_hooks show-config
           rails_git_hooks --help
 
         Commands:
-          install   Install hooks into current repo's .git/hooks.
-          list      List available hooks and checks.
+          install   Install hooks that have at least one enabled check (merged config: defaults + .rails_git_hooks.yml + .rails_git_hooks.local.yml).
           init      Create a sparse #{Constants::CONFIG_FILE} override file.
-          enable    Enable a check in #{Constants::CONFIG_FILE}.
-          disable   Disable a check in #{Constants::CONFIG_FILE}.
-          set       Set a check option like on_fail/on_warn/quiet.
-          show-config Print effective merged configuration.
 
         Examples:
           rails_git_hooks install
-          rails_git_hooks enable rubocop-check
-          rails_git_hooks disable migrations-check
-          rails_git_hooks set debugger-check on_fail fail
-          rails_git_hooks set rubocop-check quiet true
-          rails_git_hooks show-config
-          rails_git_hooks install commit-msg pre-commit
       HELP
     end
   end

data/lib/rails_git_hooks/config/constants.rb

@@ -8,13 +8,19 @@ module GitHooks
     RUNTIME_SOURCE_DIR = File.expand_path('lib/rails_git_hooks', GEM_ROOT).freeze
     RUNTIME_DIR_NAME = 'rails_git_hooks'
     CONFIG_FILE = '.rails_git_hooks.yml'
+    CONFIG_FILE_LOCAL = '.rails_git_hooks.local.yml'
 
     # Default hooks when install is run with no arguments.
     DEFAULT_HOOKS = %w[commit-msg pre-commit].freeze
     HOOK_CONFIG_NAMES = {
       pre_commit: 'PreCommit',
       commit_msg: 'CommitMsg',
-      pre_push: 'PrePush'
+      pre_push: 'PrePush',
+      post_checkout: 'PostCheckout',
+      post_merge: 'PostMerge'
     }.freeze
+
+    # Section name (from YAML) -> hook script name (e.g. for install)
+    SECTION_TO_HOOK = HOOK_CONFIG_NAMES.invert.transform_values { |sym| sym.to_s.tr('_', '-') }.freeze
   end
 end

data/lib/rails_git_hooks/config/defaults.yml

@@ -112,7 +112,7 @@ CommitMsg:
 
 PrePush:
   RunTests:
-    enabled: true
+    enabled: false
     quiet: false
     on_fail: fail
     on_warn: warn
@@ -121,7 +121,70 @@ PrePush:
     exclude: []
     dependencies:
       executables: [bundle]
+      libraries: [rspec]
     command: [bundle, exec, rspec]
     description: Run test suite before push
     file_based: false
     install_hint: Install test dependencies and ensure `bundle exec rspec` runs successfully
+
+PostCheckout:
+  BundleInstall:
+    enabled: true
+    quiet: false
+    on_fail: fail
+    on_warn: warn
+    on_missing_dependency: warn
+    include: [Gemfile, Gemfile.lock]
+    exclude: []
+    dependencies:
+      executables: [bundle]
+    command: [bundle, install]
+    description: Run bundle install when Gemfile or Gemfile.lock changed (branch checkout)
+    file_based: true
+    install_hint: Ensure bundle is available
+
+  DbMigrate:
+    enabled: true
+    quiet: false
+    on_fail: fail
+    on_warn: warn
+    on_missing_dependency: warn
+    include: [db/migrate/*.rb, db/schema.rb, db/structure.sql]
+    exclude: []
+    dependencies:
+      executables: [bundle]
+    command: [bundle, exec, rails, db:migrate]
+    description: Run db:migrate when migrations or schema changed (branch checkout)
+    file_based: true
+    install_hint: Rails app with db:migrate (or override command in config)
+
+PostMerge:
+  BundleInstall:
+    enabled: true
+    quiet: false
+    on_fail: fail
+    on_warn: warn
+    on_missing_dependency: warn
+    include: [Gemfile, Gemfile.lock]
+    exclude: []
+    dependencies:
+      executables: [bundle]
+    command: [bundle, install]
+    description: Run bundle install when Gemfile or Gemfile.lock changed (after merge)
+    file_based: true
+    install_hint: Ensure bundle is available
+
+  DbMigrate:
+    enabled: true
+    quiet: false
+    on_fail: fail
+    on_warn: warn
+    on_missing_dependency: warn
+    include: [db/migrate/*.rb, db/schema.rb, db/structure.sql]
+    exclude: []
+    dependencies:
+      executables: [bundle]
+    command: [bundle, exec, rails, db:migrate]
+    description: Run db:migrate when migrations or schema changed (after merge)
+    file_based: true
+    install_hint: Rails app with db:migrate (or override command in config)

data/lib/rails_git_hooks/install/installer.rb

@@ -5,19 +5,23 @@ require 'fileutils'
 module GitHooks
   class Installer
     def initialize(git_dir: nil)
-      @git_dir = git_dir || Repository.new.git_dir
+      if git_dir
+        @git_dir = git_dir
+        @repo = nil
+      else
+        @repo = Repository.new
+        @git_dir = @repo.git_dir
+      end
     end
 
-    def install(*hook_names)
+    def install
       target_dir = File.join(@git_dir, 'hooks')
       raise GitHooks::Error, "Not a git repository or .git/hooks not found: #{@git_dir}" unless Dir.exist?(target_dir)
 
       copy_runtime(target_dir)
 
-      hooks = hook_names.empty? ? Constants::DEFAULT_HOOKS : hook_names
+      hooks = hooks_enabled_in_config.select { |name| self.class.available_hook_names.include?(name) }
       hooks.each_with_object([]) do |name, installed|
-        next unless self.class.available_hook_names.include?(name)
-
         dest = File.join(target_dir, name)
         File.write(dest, File.read(File.join(Constants::HOOKS_DIR, name)))
         File.chmod(0o755, dest)
@@ -35,6 +39,28 @@ module GitHooks
 
     private
 
+    def repo_for_config
+      @repo_for_config ||= begin
+        root = File.dirname(@git_dir)
+        Struct.new(:root, :config_path, :local_config_path).new(
+          root,
+          File.join(root, Constants::CONFIG_FILE),
+          File.join(root, Constants::CONFIG_FILE_LOCAL)
+        )
+      end
+    end
+
+    def hooks_enabled_in_config
+      override_config = OverrideConfig.new(repo: repo_for_config)
+      effective = override_config.effective_config(CheckRegistry.all)
+      effective.each_with_object([]) do |(section_name, check_configs), out|
+        hook_name = Constants::SECTION_TO_HOOK[section_name]
+        next unless hook_name && self.class.available_hook_names.include?(hook_name)
+
+        out << hook_name if check_configs.values.any? { |cfg| cfg['enabled'] == true }
+      end.uniq
+    end
+
     def copy_runtime(target_dir)
       runtime_dir = File.join(target_dir, Constants::RUNTIME_DIR_NAME)
       FileUtils.rm_rf(runtime_dir)

data/lib/rails_git_hooks/runtime/check_registry.rb

@@ -11,7 +11,11 @@ module GitHooks
       Checks::PreCommit::WhitespaceCheck,
       Checks::PreCommit::RuboCop,
       Checks::CommitMsg::JiraPrefix,
-      Checks::PrePush::RunTests
+      Checks::PrePush::RunTests,
+      Checks::PostCheckout::BundleInstall,
+      Checks::PostCheckout::DbMigrate,
+      Checks::PostMerge::BundleInstall,
+      Checks::PostMerge::DbMigrate
     ].freeze
 
     def self.all

data/lib/rails_git_hooks/runtime/override_config.rb

@@ -15,9 +15,9 @@ module GitHooks
     end
 
     def load
-      return {} unless File.exist?(@repo.config_path)
-
-      deep_stringify(YAML.safe_load(File.read(@repo.config_path), aliases: true) || {})
+      main = load_file(@repo.config_path)
+      local = load_file(@repo.local_config_path)
+      deep_merge(main, local)
     end
 
     def config_for(definition)
@@ -35,7 +35,7 @@ module GitHooks
     end
 
     def set_option(definition, option, value)
-      data = load
+      data = load_file(@repo.config_path)
       section = data[definition.hook_section] ||= {}
       section[definition.config_name] ||= {}
 
@@ -69,6 +69,12 @@ module GitHooks
 
     private
 
+    def load_file(path)
+      return {} unless File.exist?(path)
+
+      deep_stringify(YAML.safe_load(File.read(path), aliases: true) || {})
+    end
+
     def write(data)
       if data.empty?
         FileUtils.rm_f(@repo.config_path)

data/lib/rails_git_hooks/runtime/repository.rb

@@ -14,6 +14,10 @@ module GitHooks
       File.join(root, Constants::CONFIG_FILE)
     end
 
+    def local_config_path
+      File.join(root, Constants::CONFIG_FILE_LOCAL)
+    end
+
     def hook_runtime_dir(hooks_dir)
       File.join(hooks_dir, Constants::RUNTIME_DIR_NAME)
     end
@@ -38,6 +42,10 @@ module GitHooks
       git_output('diff', '--cached', '--name-only').split("\n").map(&:strip).reject(&:empty?)
     end
 
+    def changed_files(ref1, ref2)
+      git_output('diff', '--name-only', ref1.to_s, ref2.to_s).split("\n").map(&:strip).reject(&:empty?)
+    end
+
     private
 
     def resolve_paths(start_dir)

data/lib/rails_git_hooks/runtime/runner.rb

@@ -52,6 +52,10 @@ module GitHooks
     def modified_files
       @modified_files ||= case @hook_name
                           when :pre_commit then @repo.staged_files
+                          when :post_checkout
+                            argv[2] == '1' ? @repo.changed_files(argv[0], argv[1]) : []
+                          when :post_merge
+                            @repo.changed_files('ORIG_HEAD', 'HEAD')
                           else []
                           end
     end

data/lib/rails_git_hooks/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GitHooks
-  VERSION = '0.7.1'
+  VERSION = '0.7.2'
 end

data/templates/hooks/post-checkout

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+hooks_dir = File.dirname(File.expand_path(__FILE__))
+begin
+  require 'bundler/setup'
+rescue LoadError, StandardError
+  nil
+end
+
+require File.join(hooks_dir, 'rails_git_hooks', 'runtime')
+
+exit GitHooks::Runtime.execute(:post_checkout, argv: ARGV, stdin: $stdin.read)

data/templates/hooks/post-merge

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+hooks_dir = File.dirname(File.expand_path(__FILE__))
+begin
+  require 'bundler/setup'
+rescue LoadError, StandardError
+  nil
+end
+
+require File.join(hooks_dir, 'rails_git_hooks', 'runtime')
+
+exit GitHooks::Runtime.execute(:post_merge, argv: ARGV, stdin: $stdin.read)

metadata

@@ -1,56 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_git_hooks
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Nikita Nazarov
 bindir: bin
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
+dependencies: []
 description: Installs most useful git hooks for Rails and Ruby projects
 email:
 - nikenor11@gmail.com
@@ -68,6 +26,12 @@ files:
 - lib/rails_git_hooks/checks/base.rb
 - lib/rails_git_hooks/checks/commit_msg.rb
 - lib/rails_git_hooks/checks/commit_msg/jira_prefix.rb
+- lib/rails_git_hooks/checks/post_checkout.rb
+- lib/rails_git_hooks/checks/post_checkout/bundle_install.rb
+- lib/rails_git_hooks/checks/post_checkout/db_migrate.rb
+- lib/rails_git_hooks/checks/post_merge.rb
+- lib/rails_git_hooks/checks/post_merge/bundle_install.rb
+- lib/rails_git_hooks/checks/post_merge/db_migrate.rb
 - lib/rails_git_hooks/checks/pre_commit.rb
 - lib/rails_git_hooks/checks/pre_commit/debugger_check.rb
 - lib/rails_git_hooks/checks/pre_commit/default_branch.rb
@@ -78,6 +42,8 @@ files:
 - lib/rails_git_hooks/checks/pre_commit/yaml_format_check.rb
 - lib/rails_git_hooks/checks/pre_push.rb
 - lib/rails_git_hooks/checks/pre_push/run_tests.rb
+- lib/rails_git_hooks/checks/shared/bundle_install_check.rb
+- lib/rails_git_hooks/checks/shared/db_migrate_check.rb
 - lib/rails_git_hooks/cli.rb
 - lib/rails_git_hooks/config/constants.rb
 - lib/rails_git_hooks/config/defaults.yml
@@ -96,6 +62,8 @@ files:
 - lib/rails_git_hooks/runtime/runner.rb
 - lib/rails_git_hooks/version.rb
 - templates/hooks/commit-msg
+- templates/hooks/post-checkout
+- templates/hooks/post-merge
 - templates/hooks/pre-commit
 - templates/hooks/pre-push
 homepage: https://github.com/NikitaNazarov1/rails_git_hooks