Skip to content

Commit

Permalink
padawan - use annotaterb instead of annotate, remove annotate from hu…
Browse files Browse the repository at this point in the history
…sky pre-commit script
  • Loading branch information
dcordz committed Nov 11, 2024
1 parent 136d4cc commit ae17db8
Show file tree
Hide file tree
Showing 8 changed files with 278 additions and 215 deletions.
58 changes: 58 additions & 0 deletions .annotaterb.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
---
:position: before
:position_in_additional_file_patterns: before
:position_in_class: before
:position_in_factory: before
:position_in_fixture: before
:position_in_routes: before
:position_in_serializer: before
:position_in_test: before
:classified_sort: true
:exclude_controllers: true
:exclude_factories: false
:exclude_fixtures: false
:exclude_helpers: true
:exclude_scaffolds: true
:exclude_serializers: false
:exclude_sti_subclasses: false
:exclude_tests: false
:force: false
:format_markdown: false
:format_rdoc: false
:format_yard: false
:frozen: false
:ignore_model_sub_dir: false
:ignore_unknown_models: false
:include_version: false
:show_check_constraints: false
:show_complete_foreign_keys: false
:show_foreign_keys: true
:show_indexes: true
:simple_indexes: false
:sort: false
:timestamp: false
:trace: false
:with_comment: true
:with_column_comments: true
:with_table_comments: true
:active_admin: false
:command:
:debug: false
:hide_default_column_types: ""
:hide_limit_column_types: ""
:ignore_columns:
:ignore_routes:
:models: true
:routes: false
:skip_on_db_migrate: false
:target_action: :do_annotations
:wrapper:
:wrapper_close:
:wrapper_open:
:classes_default_to_s: []
:additional_file_patterns: []
:model_dir:
- app/models
:require: []
:root_dir:
- ""
2 changes: 0 additions & 2 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,4 @@ npx tsc --project tsconfig.json
echo "Run rubocop on changed files, autofix any fixable offenses"
bundle exec rubocop --autocorrect --only-recognized-file-types $changed_files

bundle exec annotate --models

git update-index --again
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.3.5
3.3.6
9 changes: 5 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@

source "https://rubygems.org"

ruby "3.3.5"
ruby "3.3.6"

# Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
gem "rails", "~> 7.2"
gem "rails", "~> 8"

# The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]
gem "sprockets-rails"

# Use the Puma web server [https://github.com/puma/puma]
gem "puma", ">= 5.0"
gem "puma", ">= 5"

# # Use JavaScript with ESM import maps [https://github.com/rails/importmap-rails]
# gem 'importmap-rails'
Expand Down Expand Up @@ -133,7 +133,8 @@ group :development do

# https://github.com/ctran/annotate_models
# https://stackoverflow.com/questions/1289557/how-do-you-discover-model-attributes-in-rails
gem "annotate"
# Use annotaterb instead of annotate - https://github.com/drwl/annotaterb
gem "annotaterb"

# Ruby type hints
# https://sorbet.org/docs/adopting
Expand Down
Loading

0 comments on commit ae17db8

Please sign in to comment.