Maintenance: Move rubocop support files to the new .dev folder.

zammad · May 13, 2024 · 706fe83 · 706fe83
1 parent 5873d1b
commit 706fe83
Show file tree

Hide file tree

Showing 37 changed files with 14 additions and 15 deletions.
diff --git a/.rubocop/cop/zammad/active_record_reorder.rb → ...bocop/cop/zammad/active_record_reorder.rb b/.rubocop/cop/zammad/active_record_reorder.rb → ...bocop/cop/zammad/active_record_reorder.rb
diff --git a/...cop/zammad/correct_migration_timestamp.rb → ...cop/zammad/correct_migration_timestamp.rb b/...cop/zammad/correct_migration_timestamp.rb → ...cop/zammad/correct_migration_timestamp.rb
diff --git a/.../cop/zammad/detect_translatable_string.rb → .../cop/zammad/detect_translatable_string.rb b/.../cop/zammad/detect_translatable_string.rb → .../cop/zammad/detect_translatable_string.rb
diff --git a/.rubocop/cop/zammad/enforce_in_modal.rb → .dev/rubocop/cop/zammad/enforce_in_modal.rb b/.rubocop/cop/zammad/enforce_in_modal.rb → .dev/rubocop/cop/zammad/enforce_in_modal.rb
diff --git a/.rubocop/cop/zammad/exists_condition.rb → .dev/rubocop/cop/zammad/exists_condition.rb b/.rubocop/cop/zammad/exists_condition.rb → .dev/rubocop/cop/zammad/exists_condition.rb
diff --git a/.../cop/zammad/exists_date_time_precision.rb → .../cop/zammad/exists_date_time_precision.rb b/.../cop/zammad/exists_date_time_precision.rb → .../cop/zammad/exists_date_time_precision.rb
diff --git a/.rubocop/cop/zammad/exists_db_strategy.rb → .../rubocop/cop/zammad/exists_db_strategy.rb b/.rubocop/cop/zammad/exists_db_strategy.rb → .../rubocop/cop/zammad/exists_db_strategy.rb
diff --git a/...zammad/exists_reset_column_information.rb → ...zammad/exists_reset_column_information.rb b/...zammad/exists_reset_column_information.rb → ...zammad/exists_reset_column_information.rb
diff --git a/.rubocop/cop/zammad/faker_unique.rb → .dev/rubocop/cop/zammad/faker_unique.rb b/.rubocop/cop/zammad/faker_unique.rb → .dev/rubocop/cop/zammad/faker_unique.rb
diff --git a/.rubocop/cop/zammad/forbid_def_send.rb → .dev/rubocop/cop/zammad/forbid_def_send.rb b/.rubocop/cop/zammad/forbid_def_send.rb → .dev/rubocop/cop/zammad/forbid_def_send.rb
diff --git a/.rubocop/cop/zammad/forbid_default_scope.rb → ...ubocop/cop/zammad/forbid_default_scope.rb b/.rubocop/cop/zammad/forbid_default_scope.rb → ...ubocop/cop/zammad/forbid_default_scope.rb
diff --git a/.rubocop/cop/zammad/forbid_rand.rb → .dev/rubocop/cop/zammad/forbid_rand.rb b/.rubocop/cop/zammad/forbid_rand.rb → .dev/rubocop/cop/zammad/forbid_rand.rb
diff --git a/.../cop/zammad/forbid_translatable_marker.rb → .../cop/zammad/forbid_translatable_marker.rb b/.../cop/zammad/forbid_translatable_marker.rb → .../cop/zammad/forbid_translatable_marker.rb
diff --git a/...op/zammad/migration_scheduler_last_run.rb → ...op/zammad/migration_scheduler_last_run.rb b/...op/zammad/migration_scheduler_last_run.rb → ...op/zammad/migration_scheduler_last_run.rb
diff --git a/.rubocop/cop/zammad/no_to_sym_on_string.rb → ...rubocop/cop/zammad/no_to_sym_on_string.rb b/.rubocop/cop/zammad/no_to_sym_on_string.rb → ...rubocop/cop/zammad/no_to_sym_on_string.rb
diff --git a/...p/zammad/prefer_negated_if_over_unless.rb → ...p/zammad/prefer_negated_if_over_unless.rb b/...p/zammad/prefer_negated_if_over_unless.rb → ...p/zammad/prefer_negated_if_over_unless.rb
diff --git a/.rubocop/cop/zammad/timezone_default.rb → .dev/rubocop/cop/zammad/timezone_default.rb b/.rubocop/cop/zammad/timezone_default.rb → .dev/rubocop/cop/zammad/timezone_default.rb
diff --git a/...op/zammad/to_forbid_over_not_to_permit.rb → ...op/zammad/to_forbid_over_not_to_permit.rb b/...op/zammad/to_forbid_over_not_to_permit.rb → ...op/zammad/to_forbid_over_not_to_permit.rb
diff --git a/...p/cop/zammad/trigger_from_commit_hooks.rb → ...p/cop/zammad/trigger_from_commit_hooks.rb b/...p/cop/zammad/trigger_from_commit_hooks.rb → ...p/cop/zammad/trigger_from_commit_hooks.rb
diff --git a/.rubocop/cop/zammad/update_copyright.rb → .dev/rubocop/cop/zammad/update_copyright.rb b/.rubocop/cop/zammad/update_copyright.rb → .dev/rubocop/cop/zammad/update_copyright.rb
diff --git a/.rubocop/default.yml → .dev/rubocop/default.yml b/.rubocop/default.yml → .dev/rubocop/default.yml
@@ -11,7 +11,7 @@ require:
   - rubocop-rails
   - rubocop-rspec
   - rubocop-rspec_rails
-  - ../config/initializers/inflections.rb
+  - ../../config/initializers/inflections.rb
   - ./rubocop_zammad.rb
 
 inherit_from:
@@ -28,7 +28,7 @@ AllCops:
   Include:
     - '.gitlab/**/*.rb'
     - '.github/**/*.rb'
-    - '.rubocop/**/*.rb'
+    - '.dev/rubocop/**/*.rb'
   Exclude:
     - 'bin/*'
     - 'db/schema.rb'

diff --git a/.rubocop/rubocop_zammad.rb → .dev/rubocop/rubocop_zammad.rb b/.rubocop/rubocop_zammad.rb → .dev/rubocop/rubocop_zammad.rb
diff --git a/.rubocop/todo.rspec.yml → .dev/rubocop/todo.rspec.yml b/.rubocop/todo.rspec.yml → .dev/rubocop/todo.rspec.yml
diff --git a/.rubocop/todo.yml → .dev/rubocop/todo.yml b/.rubocop/todo.yml → .dev/rubocop/todo.yml
diff --git a/.rubocop/validate_todos.rb → .dev/rubocop/validate_todos.rb b/.rubocop/validate_todos.rb → .dev/rubocop/validate_todos.rb
@@ -17,7 +17,7 @@
     section['Exclude'].each do |file|
       next if file.include? '*'
 
-      obsolete_excludes.push(file) if !File.exist? "#{__dir__}/../#{file}"
+      obsolete_excludes.push(file) if !File.exist? "#{__dir__}/../../#{file}"
     end
   end
 end

diff --git a/.github/workflows/ci/lint.sh b/.github/workflows/ci/lint.sh
@@ -18,7 +18,7 @@ echo "Rails zeitwerk:check autoloader check…"
 bundle exec rails zeitwerk:check
 .gitlab/check_graphql_api_consistency.sh
 echo "Rubocop check…"
-bundle exec .rubocop/validate_todos.rb
+bundle exec .dev/rubocop/validate_todos.rb
 bundle exec rubocop --parallel
 echo "Coffeelint check…"
 coffeelint --rules ./.coffeelint/rules/* app/

diff --git a/.gitlab/ci/lint.yml b/.gitlab/ci/lint.yml
@@ -58,7 +58,7 @@
     when: on_failure
   script:
     - echo "Rubocop check…"
-    - bundle exec .rubocop/validate_todos.rb
+    - bundle exec .dev/rubocop/validate_todos.rb
     - bundle exec rubocop --parallel
     - echo "bundler-audit security check…"
     - gem install bundler-audit

diff --git a/.rubocop.yml b/.rubocop.yml
@@ -2,4 +2,4 @@
 # a) don't spam the root directory with rubocop files
 # b) work around an issue with absolute excludes and custom development (https://github.com/rubocop-hq/rubocop/issues/4621)
 inherit_from:
-  - .rubocop/default.yml
+  - .dev/rubocop/default.yml
diff --git a/script/build/cleanup.sh b/script/build/cleanup.sh
@@ -22,7 +22,6 @@ rm .gitlab-ci.yml
 # linting
 # Since the .eslint-plugin-zammad folder is a dependency in package.json (required by assets:precompile), it cannot be removed.
 rm .rubocop.yml
-rm -rf .rubocop
 rm .stylelintrc.json .eslintignore .eslintrc .eslintrc.js .prettierrc.json
 rm coffeelint.json
 rm -rf .coffeelint

diff --git a/spec/rubocop/cop/zammad/active_record_reorder_spec.rb b/spec/rubocop/cop/zammad/active_record_reorder_spec.rb
@@ -1,7 +1,7 @@
 # Copyright (C) 2012-2024 Zammad Foundation, https://zammad-foundation.org/
 
 require 'rails_helper'
-require_relative '../../../../.rubocop/cop/zammad/active_record_reorder'
+require_relative '../../../../.dev/rubocop/cop/zammad/active_record_reorder'
 
 RSpec.describe RuboCop::Cop::Zammad::ActiveRecordReorder, :aggregate_failures, type: :rubocop do
 

diff --git a/spec/rubocop/cop/zammad/enforce_in_modal_spec.rb b/spec/rubocop/cop/zammad/enforce_in_modal_spec.rb
@@ -1,7 +1,7 @@
 # Copyright (C) 2012-2024 Zammad Foundation, https://zammad-foundation.org/
 
 require 'rails_helper'
-require_relative '../../../../.rubocop/cop/zammad/enforce_in_modal'
+require_relative '../../../../.dev/rubocop/cop/zammad/enforce_in_modal'
 
 RSpec.describe RuboCop::Cop::Zammad::EnforceInModal, type: :rubocop do
 

diff --git a/spec/rubocop/cop/zammad/faker_unique_spec.rb b/spec/rubocop/cop/zammad/faker_unique_spec.rb
@@ -1,7 +1,7 @@
 # Copyright (C) 2012-2024 Zammad Foundation, https://zammad-foundation.org/
 
 require 'rails_helper'
-require_relative '../../../../.rubocop/cop/zammad/faker_unique'
+require_relative '../../../../.dev/rubocop/cop/zammad/faker_unique'
 
 RSpec.describe RuboCop::Cop::Zammad::FakerUnique, :aggregate_failures, type: :rubocop do
 

diff --git a/spec/rubocop/cop/zammad/forbid_def_send_spec.rb b/spec/rubocop/cop/zammad/forbid_def_send_spec.rb
@@ -1,7 +1,7 @@
 # Copyright (C) 2012-2024 Zammad Foundation, https://zammad-foundation.org/
 
 require 'rails_helper'
-require_relative '../../../../.rubocop/cop/zammad/forbid_def_send'
+require_relative '../../../../.dev/rubocop/cop/zammad/forbid_def_send'
 
 RSpec.describe RuboCop::Cop::Zammad::ForbidDefSend, type: :rubocop do
   it 'accepts send() calls' do

diff --git a/spec/rubocop/cop/zammad/forbid_default_scope_spec.rb b/spec/rubocop/cop/zammad/forbid_default_scope_spec.rb
@@ -1,7 +1,7 @@
 # Copyright (C) 2012-2024 Zammad Foundation, https://zammad-foundation.org/
 
 require 'rails_helper'
-require_relative '../../../../.rubocop/cop/zammad/forbid_default_scope'
+require_relative '../../../../.dev/rubocop/cop/zammad/forbid_default_scope'
 
 RSpec.describe RuboCop::Cop::Zammad::ForbidDefaultScope, type: :rubocop do
   it 'accepts simple order' do

diff --git a/spec/rubocop/cop/zammad/migration_scheduler_last_run_spec.rb b/spec/rubocop/cop/zammad/migration_scheduler_last_run_spec.rb
@@ -1,7 +1,7 @@
 # Copyright (C) 2012-2024 Zammad Foundation, https://zammad-foundation.org/
 
 require 'rails_helper'
-require_relative '../../../../.rubocop/cop/zammad/migration_scheduler_last_run'
+require_relative '../../../../.dev/rubocop/cop/zammad/migration_scheduler_last_run'
 
 RSpec.describe RuboCop::Cop::Zammad::MigrationSchedulerLastRun, type: :rubocop do
 

diff --git a/spec/rubocop/cop/zammad/to_forbid_over_not_to_permit_spec.rb b/spec/rubocop/cop/zammad/to_forbid_over_not_to_permit_spec.rb
@@ -1,7 +1,7 @@
 # Copyright (C) 2012-2024 Zammad Foundation, https://zammad-foundation.org/
 
 require 'rails_helper'
-require_relative '../../../../.rubocop/cop/zammad/to_forbid_over_not_to_permit'
+require_relative '../../../../.dev/rubocop/cop/zammad/to_forbid_over_not_to_permit'
 
 RSpec.describe RuboCop::Cop::Zammad::ToForbidOverNotToPermit, type: :rubocop do
 

diff --git a/spec/rubocop/cop/zammad/trigger_from_commit_hooks_spec.rb b/spec/rubocop/cop/zammad/trigger_from_commit_hooks_spec.rb
@@ -1,7 +1,7 @@
 # Copyright (C) 2012-2024 Zammad Foundation, https://zammad-foundation.org/
 
 require 'rails_helper'
-require_relative '../../../../.rubocop/cop/zammad/trigger_from_commit_hooks'
+require_relative '../../../../.dev/rubocop/cop/zammad/trigger_from_commit_hooks'
 
 RSpec.describe RuboCop::Cop::Zammad::TriggerFromCommitHooks, :aggregate_failures, type: :rubocop do