From 7acae6522b840f5e7bda24362c4e91937ea41e44 Mon Sep 17 00:00:00 2001 From: Maikel Linke Date: Fri, 25 Feb 2022 11:56:33 +1100 Subject: [PATCH] Relax cyclomatic complexity to community default Why should we be more strict than the rest of the world? --- .rubocop_styleguide.yml | 11 +++-------- .rubocop_todo.yml | 28 ++-------------------------- 2 files changed, 5 insertions(+), 34 deletions(-) diff --git a/.rubocop_styleguide.yml b/.rubocop_styleguide.yml index 53d0605122..af32a1de5a 100644 --- a/.rubocop_styleguide.yml +++ b/.rubocop_styleguide.yml @@ -19,6 +19,9 @@ AllCops: # # Cop settings that have been agreed upon by the OFN community +Metrics: + Enabled: true + Rails/SkipsModelValidations: AllowedMethods: - "touch" @@ -77,12 +80,8 @@ Lint/UselessAssignment: - spec/**/* Metrics/AbcSize: - Enabled: true Max: 30 # default 17 -Metrics: - Enabled: true - Metrics/BlockLength: IgnoredMethods: [ "class_eval", @@ -99,10 +98,6 @@ Metrics/BlockLength: "shared_examples", ] -Metrics/CyclomaticComplexity: - Enabled: true - Max: 6 # default 7 - Metrics/MethodLength: Enabled: true Max: 25 # default 10 diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index d0c9742a39..cf3c7a46ae 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1,6 +1,6 @@ # This configuration was generated by # `rubocop --auto-gen-config --auto-gen-only-exclude --exclude-limit 1400` -# on 2022-02-25 00:10:16 UTC using RuboCop version 1.22.2. +# on 2022-02-25 00:56:00 UTC using RuboCop version 1.22.2. # The point is for the user to remove these configuration records # one by one as the offenses are removed from the code base. # Note that changes in the inspected code, or installation of new @@ -532,68 +532,44 @@ Metrics/ClassLength: - 'lib/open_food_network/users_and_enterprises_report.rb' - 'lib/open_food_network/xero_invoices_report.rb' -# Offense count: 71 +# Offense count: 40 # Configuration parameters: IgnoredMethods, Max. Metrics/CyclomaticComplexity: Exclude: - - 'app/controllers/admin/enterprise_fees_controller.rb' - 'app/controllers/admin/enterprises_controller.rb' - - 'app/controllers/checkout_controller.rb' - 'app/controllers/spree/admin/orders_controller.rb' - - 'app/controllers/spree/admin/payment_methods_controller.rb' - - 'app/controllers/spree/admin/payments_controller.rb' - 'app/controllers/spree/admin/taxons_controller.rb' - - 'app/controllers/spree/admin/users_controller.rb' - 'app/controllers/spree/orders_controller.rb' - 'app/helpers/checkout_helper.rb' - 'app/helpers/order_cycles_helper.rb' - - 'app/helpers/spree/admin/base_helper.rb' - 'app/helpers/spree/admin/navigation_helper.rb' - - 'app/helpers/spree/admin/orders_helper.rb' - 'app/models/enterprise.rb' - 'app/models/enterprise_relationship.rb' - 'app/models/product_import/entry_validator.rb' - 'app/models/spree/ability.rb' - 'app/models/spree/address.rb' - - 'app/models/spree/adjustment.rb' - 'app/models/spree/order/checkout.rb' - 'app/models/spree/order_inventory.rb' - - 'app/models/spree/payment.rb' - 'app/models/spree/preference.rb' - 'app/models/spree/preferences/preferable.rb' - 'app/models/spree/preferences/preferable_class_methods.rb' - 'app/models/spree/product.rb' - 'app/models/spree/return_authorization.rb' - - 'app/models/spree/shipment.rb' - 'app/models/spree/tax_rate.rb' - 'app/models/spree/variant.rb' - 'app/models/spree/zone.rb' - - 'app/services/cart_service.rb' - - 'app/services/products_renderer.rb' - - 'app/services/sets/model_set.rb' - 'engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_report.rb' - - 'engines/order_management/app/services/order_management/reports/enterprise_fee_summary/parameters.rb' - - 'engines/order_management/app/services/order_management/stock/estimator.rb' - - 'engines/order_management/app/services/order_management/subscriptions/validator.rb' - - 'lib/active_merchant/billing/gateways/stripe_payment_intents_decorator.rb' - 'lib/discourse/single_sign_on.rb' - 'lib/open_food_network/customers_report.rb' - 'lib/open_food_network/enterprise_issue_validator.rb' - 'lib/open_food_network/group_buy_report.rb' - - 'lib/open_food_network/order_cycle_form_applicator.rb' - - 'lib/open_food_network/order_cycle_permissions.rb' - 'lib/open_food_network/orders_and_fulfillments_report/customer_totals_report.rb' - 'lib/open_food_network/payments_report.rb' - - 'lib/open_food_network/sales_tax_report.rb' - 'lib/open_food_network/xero_invoices_report.rb' - - 'lib/spree/core/controller_helpers/common.rb' - 'lib/spree/core/controller_helpers/order.rb' - 'lib/spree/core/controller_helpers/respond_with.rb' - 'lib/spree/localized_number.rb' - - 'lib/stripe/authorize_response_patcher.rb' - - 'lib/stripe/credit_card_clone_destroyer.rb' - 'spec/models/product_importer_spec.rb' - - 'spec/support/i18n_translations_checker.rb' # Offense count: 31 # Configuration parameters: CountComments, Max, CountAsOne, ExcludedMethods, IgnoredMethods.