diff --git a/.rubocop.yml b/.rubocop.yml index daaacb7bd..ad6516659 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -8,6 +8,12 @@ AllCops: - 'gemfiles/vendor/**/*' NewCops: enable +Gemspec/RequiredRubyVersion: + Enabled: false + +Style/OptionalBooleanParameter: + Enabled: false + Layout/LineLength: Max: 120 diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 21142df65..f8bbfa5f9 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1,6 +1,6 @@ # This configuration was generated by # `rubocop --auto-gen-config` -# on 2020-05-03 14:16:43 +0200 using RuboCop version 0.82.0. +# on 2021-04-02 11:19:09 UTC using RuboCop version 0.93.1. # 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 @@ -9,10 +9,10 @@ # Offense count: 2 # Configuration parameters: IgnoredMethods. Metrics/AbcSize: - Max: 44 + Max: 45 # Offense count: 4 -# Configuration parameters: CountComments, ExcludedMethods. +# Configuration parameters: CountComments, CountAsOne, ExcludedMethods. Metrics/MethodLength: Max: 28 diff --git a/Gemfile.lock b/Gemfile.lock index 68cbca20a..5c81fb408 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -32,7 +32,7 @@ GEM bundler rake thor (>= 0.14.0) - ast (2.4.0) + ast (2.4.2) builder (3.2.4) coderay (1.1.2) concurrent-ruby (1.1.6) @@ -95,9 +95,9 @@ GEM multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) - parallel (1.19.1) - parser (2.7.1.2) - ast (~> 2.4.0) + parallel (1.20.1) + parser (3.0.0.0) + ast (~> 2.4.1) pg (1.2.3) pry (0.13.1) coderay (~> 1.1) @@ -122,6 +122,7 @@ GEM rake (13.0.3) rchardet (1.8.0) rdoc (6.2.1) + regexp_parser (2.1.1) rexml (3.2.4) rspec (3.10.0) rspec-core (~> 3.10.0) @@ -136,14 +137,18 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) rspec-support (3.10.2) - rubocop (0.83.0) + rubocop (1.12.0) parallel (~> 1.10) - parser (>= 2.7.0.1) + parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.8, < 3.0) rexml + rubocop-ast (>= 1.2.0, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 2.0) - ruby-progressbar (1.10.1) + unicode-display_width (>= 1.4.0, < 3.0) + rubocop-ast (1.4.1) + parser (>= 2.7.1.5) + ruby-progressbar (1.11.0) semver2 (3.4.2) simplecov (0.16.1) docile (~> 1.1) @@ -161,7 +166,7 @@ GEM sync tzinfo (1.2.7) thread_safe (~> 0.1) - unicode-display_width (1.7.0) + unicode-display_width (2.0.0) yard (0.9.26) zeitwerk (2.3.0) diff --git a/acts-as-messageable.gemspec b/acts-as-messageable.gemspec index 0d3d8c3aa..b664e3e91 100644 --- a/acts-as-messageable.gemspec +++ b/acts-as-messageable.gemspec @@ -12,7 +12,7 @@ Gem::Specification.new do |s| s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version= s.require_paths = ['lib'] s.authors = ['Piotr Nielacny'] - s.date = '2020-05-13' + s.date = '2021-04-02' s.email = 'piotr.nielacny@gmail.com' s.extra_rdoc_files = [ 'README.md' @@ -71,35 +71,52 @@ Gem::Specification.new do |s| 'spec/support/uuid_user.rb' ] s.homepage = 'http://github.com/LTe/acts-as-messageable' - s.rubygems_version = '3.1.3' + s.rubygems_version = '3.0.3' s.summary = 'Make user messageable!;-)' - s.specification_version = 4 if s.respond_to? :specification_version + if s.respond_to? :specification_version + s.specification_version = 4 - if s.respond_to? :add_runtime_dependency - s.add_runtime_dependency('activerecord', ['>= 0']) - s.add_runtime_dependency('activesupport', ['>= 0']) - s.add_runtime_dependency('ancestry', ['>= 0']) - s.add_runtime_dependency('railties', ['>= 0']) - s.add_development_dependency('appraisal', ['>= 0']) - s.add_development_dependency('coveralls', ['>= 0']) - s.add_development_dependency('jeweler', ['>= 0']) - s.add_development_dependency('pg', ['>= 0']) - s.add_development_dependency('pry', ['>= 0']) - s.add_development_dependency('rspec', ['>= 0']) - s.add_development_dependency('rubocop', ['>= 0']) - s.add_development_dependency('sqlite3', ['>= 0']) - s.add_development_dependency('timecop', ['>= 0']) - s.add_development_dependency('yard', ['>= 0']) + if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') + s.add_runtime_dependency('activerecord', ['>= 0']) + s.add_runtime_dependency('activesupport', ['>= 0']) + s.add_runtime_dependency('ancestry', ['>= 0']) + s.add_runtime_dependency('railties', ['>= 0']) + s.add_development_dependency('appraisal', ['>= 0']) + s.add_development_dependency('coveralls', ['>= 0']) + s.add_development_dependency('jeweler', ['>= 0']) + s.add_development_dependency('pg', ['>= 0']) + s.add_development_dependency('pry', ['>= 0']) + s.add_development_dependency('rspec', ['>= 0']) + s.add_development_dependency('rubocop', ['>= 0']) + s.add_development_dependency('sqlite3', ['>= 0']) + s.add_development_dependency('timecop', ['>= 0']) + s.add_development_dependency('yard', ['>= 0']) + else + s.add_dependency('activerecord', ['>= 0']) + s.add_dependency('activesupport', ['>= 0']) + s.add_dependency('ancestry', ['>= 0']) + s.add_dependency('appraisal', ['>= 0']) + s.add_dependency('coveralls', ['>= 0']) + s.add_dependency('jeweler', ['>= 0']) + s.add_dependency('pg', ['>= 0']) + s.add_dependency('pry', ['>= 0']) + s.add_dependency('railties', ['>= 0']) + s.add_dependency('rspec', ['>= 0']) + s.add_dependency('rubocop', ['>= 0']) + s.add_dependency('sqlite3', ['>= 0']) + s.add_dependency('timecop', ['>= 0']) + s.add_dependency('yard', ['>= 0']) + end else s.add_dependency('activerecord', ['>= 0']) s.add_dependency('activesupport', ['>= 0']) s.add_dependency('ancestry', ['>= 0']) - s.add_dependency('appraisal', ['>= 0']) - s.add_dependency('coveralls', ['>= 0']) - s.add_dependency('jeweler', ['>= 0']) - s.add_dependency('pg', ['>= 0']) - s.add_dependency('pry', ['>= 0']) + s.add_dependency('railties', ['>= 0']) + s.add_dependency('railties', ['>= 0']) + s.add_dependency('railties', ['>= 0']) + s.add_dependency('railties', ['>= 0']) + s.add_dependency('railties', ['>= 0']) s.add_dependency('railties', ['>= 0']) s.add_dependency('rspec', ['>= 0']) s.add_dependency('rubocop', ['>= 0']) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index edcfbbaa7..882329ca6 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -4,7 +4,7 @@ $LOAD_PATH.unshift(File.dirname(__FILE__)) require 'rspec' require 'active_record/railtie' -ActiveRecord::Base.logger = Logger.new(STDERR) +ActiveRecord::Base.logger = Logger.new($stderr) ActiveRecord::Base.logger.level = 3 require 'coveralls' @@ -55,9 +55,7 @@ def create_database ActiveRecord::Schema.define(version: 1) do - if ENV.fetch('DATABASE_ADAPTER', '') == 'postgresql' - enable_extension 'pgcrypto' unless extension_enabled?('pgcrypto') - end + enable_extension 'pgcrypto' if ENV.fetch('DATABASE_ADAPTER', '') == 'postgresql' && !extension_enabled?('pgcrypto') create_table(:messages, &TABLE_SCHEMA) create_table(:custom_messages, &TABLE_SCHEMA)