ducalis 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c318246f914585d93588a49a31dfb31c7598b5f5
-  data.tar.gz: 8a4d1be3c918559feffab7275779250d76c60dfb
+  metadata.gz: 1cebb8b9bfce243520e492e14428a31520166d57
+  data.tar.gz: 71377e24c677052deba2729e4d6edad9d5661408
 SHA512:
-  metadata.gz: 319fb773559268eec362ae2a8f561d6f92a2f77d9d9b44825d4eb0fa70548173af97cdf266346677231ca152da5e9d416478b60a1b322845c1f576e55035b032
-  data.tar.gz: 4c81501488830a22fb562b31c32f4104f0d47d9dda9ab5102c2a0c9b149a328c30ead9a774f1368869af7cc128d8a86d3f2631be9f3783994fc993e0a2e0b732
+  metadata.gz: a80ee7b95acfc74476566eb5c5cf4b02dd94889a27f1832772e30d6e85cc923443dcf3e659847e455c3884dde71b1fcb75e09a85bb2e1ebd3cc4cbe81af3ebd8
+  data.tar.gz: 113862c9e97fd9c418f31ccd172153660daf9406307fa5e8fbb5756658b173ebda5ce8e7dde7f5dfe00cfcf1d0e157fad33d3daca70d84fd5c514702e5709a81

data/.codeclimate.yml

@@ -1,6 +1,6 @@
 engines:
   rubocop:
     enabled: true
-    channel: rubocop-0-46
+    channel: rubocop-0-52
     config:
       file: .rubocop.yml

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.1
   UseCache: false
   Exclude:
     - 'client/vendor/bundle/**/*'

data/.travis.yml

@@ -1,5 +1,6 @@
 language: ruby
 rvm:
+  - 2.1.1
   - 2.2.9
   - 2.3.6
   - 2.4.3
@@ -7,3 +8,10 @@ before_install:
   - gem update --system
   - gem --version
   - gem install bundler
+script:
+  - bundle exec rake
+  - bash bin/legacy_versions_test.sh
+matrix:
+  include:
+    - rvm: 2.5.0
+      env: IGNORE_LEGACY=true

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    ducalis (0.6.0)
+    ducalis (0.7.0)
       git (~> 1.3, >= 1.3.0)
       policial (= 0.0.4)
       regexp-examples (~> 1.3, >= 1.3.2)
-      rubocop (~> 0.46.0, >= 0.45.0)
+      rubocop (>= 0.45.0)
 
 GEM
   remote: https://rubygems.org/
@@ -37,6 +37,7 @@ GEM
     multipart-post (2.0.0)
     octokit (4.8.0)
       sawyer (~> 0.8.0, >= 0.5.3)
+    parallel (1.12.1)
     parser (2.5.0.0)
       ast (~> 2.4.0)
     policial (0.0.4)
@@ -45,19 +46,18 @@ GEM
       octokit (~> 4.3)
       rubocop (~> 0.39)
     powerpack (0.1.1)
-    pry (0.11.2)
+    pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     public_suffix (3.0.2)
-    rainbow (2.2.2)
-      rake
-    rake (12.1.0)
+    rainbow (3.0.0)
+    rake (12.3.0)
     regexp-examples (1.4.2)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
       rspec-expectations (~> 3.7.0)
       rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.0)
+    rspec-core (3.7.1)
       rspec-support (~> 3.7.0)
     rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -65,11 +65,12 @@ GEM
     rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
-    rspec-support (3.7.0)
-    rubocop (0.46.0)
-      parser (>= 2.3.1.1, < 3.0)
+    rspec-support (3.7.1)
+    rubocop (0.52.1)
+      parallel (~> 1.10)
+      parser (>= 2.4.0.2, < 3.0)
       powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
+      rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.9.0)
@@ -89,4 +90,4 @@ DEPENDENCIES
   rspec (~> 3.0)
 
 BUNDLED WITH
-   1.16.0.pre.2
+   1.16.1

data/Rakefile

@@ -5,8 +5,8 @@ require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
 
 RuboCop::RakeTask.new do |task|
-  task.options = %w(--auto-correct)
+  task.options = %w[--auto-correct]
 end
 
 RSpec::Core::RakeTask.new(:spec)
-task default: %i(rubocop spec)
+task default: %i[rubocop spec]

data/bin/ducalis

@@ -26,7 +26,7 @@ if ARGV.any? { |arg| arg == '--docs' }
 end
 
 if Ducalis::PassedArgs.ci_mode?
-  Ducalis::CLI.new(ARGV - %w(--ci)).start
+  Ducalis::CLI.new(ARGV - %w[--ci]).start
 else
   Ducalis::PassedArgs.process_args!
 

data/bin/legacy_versions_test.sh

@@ -0,0 +1,21 @@
+#!/bin/sh
+
+set -e
+
+if [ -n "${IGNORE_LEGACY-}" ]; then
+  echo "$(tput bold)Nothing to test!"
+  exit 0;
+fi
+
+echo "$(tput bold)Enforcing old RuboCop version: $(tput sgr0)"
+sed -i.bak "s/'>= 0.45.0'/'>= 0.45.0', '0.46.0'/" ducalis.gemspec
+bundle install --no-deployment --quiet --no-color
+bundle show rubocop
+echo "$(tput bold)Running rspec on old RuboCop version: $(tput sgr0)"
+bundle exec rspec --format progress
+echo "$(tput bold)Enforcing new RuboCop version: $(tput sgr0)"
+mv ducalis.gemspec.bak ducalis.gemspec
+bundle install --no-deployment --quiet --no-color
+bundle show rubocop
+echo "$(tput bold)Running rspec on new RuboCop version: $(tput sgr0)"
+bundle exec rspec --format progress

data/ducalis.gemspec

@@ -31,5 +31,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'git', '~> 1.3', '>= 1.3.0'
   spec.add_dependency 'policial', '0.0.4'
   spec.add_dependency 'regexp-examples', '~> 1.3', '>= 1.3.2'
-  spec.add_dependency 'rubocop', '>= 0.45.0', '~> 0.46.0'
+  spec.add_dependency 'rubocop', '>= 0.45.0'
 end

data/lib/ducalis.rb

@@ -4,7 +4,7 @@ require 'parser/current'
 require 'policial'
 
 module Ducalis
-  DOTFILE = '.ducalis.yml'
+  DOTFILE = '.ducalis.yml'.freeze
   DUCALIS_HOME = File.realpath(File.join(File.dirname(__FILE__), '..'))
   DEFAULT_FILE = File.join(DUCALIS_HOME, 'config', DOTFILE)
 end
@@ -61,3 +61,7 @@ require 'ducalis/cops/too_long_workers'
 require 'ducalis/cops/uncommented_gem'
 require 'ducalis/cops/unlocked_gem'
 require 'ducalis/cops/useless_only'
+
+require 'ducalis/cops/extensions/rubocop_cast'
+
+RuboCop::Cop::Cop.prepend(RubocopCast)

data/lib/ducalis/commentators/console.rb

@@ -5,7 +5,7 @@ require 'logger'
 module Ducalis
   module Commentators
     class Console
-      DOCUMENTATION_PATH = 'https://ducalis-rb.github.io/'
+      DOCUMENTATION_PATH = 'https://ducalis-rb.github.io/'.freeze
 
       def initialize(config)
         @config = config

data/lib/ducalis/commentators/github.rb

@@ -3,7 +3,7 @@
 module Ducalis
   module Commentators
     class Github
-      STATUS = 'COMMENT'
+      STATUS = 'COMMENT'.freeze
       SIMILARITY_THRESHOLD = 0.8
 
       def initialize(config)

data/lib/ducalis/cops/callbacks_activerecord.rb

@@ -15,7 +15,7 @@ module Ducalis
       | You can read more [here](https://medium.com/planet-arkency/a61fd75ab2d3).
     MESSAGE
 
-    METHODS_BLACK_LIST = %i(
+    METHODS_BLACK_LIST = %i[
       after_commit
       after_create
       after_destroy
@@ -35,7 +35,7 @@ module Ducalis
       before_save
       before_update
       before_validation
-    ).freeze
+    ].freeze
 
     def on_send(node)
       return unless in_model?

data/lib/ducalis/cops/controllers_except.rb

@@ -8,8 +8,8 @@ module Ducalis
       | Prefer to use `:only` over `:except` in controllers because it's more explicit and will be easier to maintain for new developers.
     MESSAGE
 
-    FILTERS = %i(before_filter after_filter around_filter
-                 before_action after_action around_action).freeze
+    FILTERS = %i[before_filter after_filter around_filter
+                 before_action after_action around_action].freeze
 
     def on_send(node)
       _, method_name, *args = *node

data/lib/ducalis/cops/extensions/rubocop_cast.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module RubocopCast
+  OLD_RUBOCOP_VERSION = Gem::Version.new('0.46.0')
+
+  def add_offense(node, loc, message = nil, severity = nil)
+    if Gem::Version.new(RuboCop::Version.version) > OLD_RUBOCOP_VERSION
+      super(node, location: loc, message: message, severity: severity)
+    else
+      super(node, loc, message, severity)
+    end
+  end
+end

data/lib/ducalis/cops/extensions/type_resolving.rb

@@ -1,18 +1,19 @@
 # frozen_string_literal: true
+
 module TypeResolving
-  MODELS_CLASS_NAMES = %w(
+  MODELS_CLASS_NAMES = %w[
     ApplicationRecord
     ActiveRecord::Base
-  ).freeze
+  ].freeze
 
-  WORKERS_SUFFIXES = %w(
+  WORKERS_SUFFIXES = %w[
     Worker
     Job
-  ).freeze
+  ].freeze
 
-  CONTROLLER_SUFFIXES = %w(
+  CONTROLLER_SUFFIXES = %w[
     Controller
-  ).freeze
+  ].freeze
 
   SERVICES_PATH = File.join('app', 'services')
 

data/lib/ducalis/cops/multiple_times.rb

@@ -42,9 +42,9 @@ module Ducalis
     alias on_defs on_def
     alias on_send on_def
 
-    def_node_search :date_today, '(send (const nil :Date) :today)'
-    def_node_search :date_current, '(send (const nil :Date) :current)'
-    def_node_search :time_current, '(send (const nil :Time) :current)'
-    def_node_search :time_now, '(send (const nil :Time) :now)'
+    def_node_search :date_today, '(send (const _ :Date) :today)'
+    def_node_search :date_current, '(send (const _ :Date) :current)'
+    def_node_search :time_current, '(send (const _ :Time) :current)'
+    def_node_search :time_now, '(send (const _ :Time) :now)'
   end
 end

data/lib/ducalis/cops/preferable_methods.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'rubocop'
 
 module Ducalis
@@ -7,13 +8,13 @@ module Ducalis
       | Prefer to use %<alternative>s method instead of %<original>s because of %<reason>s.
     MESSAGE
 
-    WHITE_LIST = %w(cache file params attrs options).freeze
+    WHITE_LIST = %w[cache file params attrs options].freeze
 
     ALWAYS_TRUE = ->(_who, _what, _args) { true }
 
     DELETE_CHECK = lambda do |who, _what, args|
-      !%i(sym str).include?(args.first && args.first.type) &&
-        args.count <= 1 && !WHITE_LIST.any? { |regex| who.to_s.include?(regex) }
+      !%i[sym str].include?(args.first && args.first.type) &&
+        args.count <= 1 && WHITE_LIST.none? { |regex| who.to_s.include?(regex) }
     end
 
     VALIDATE_CHECK = lambda do |_who, _what, args|
@@ -64,7 +65,7 @@ module Ducalis
     }.freeze
 
     DETAILS = "Dangerous methods are:
-#{DESCRIPTION.keys.map { |name| "`#{name}`" }.join(', ')}."
+#{DESCRIPTION.keys.map { |name| "`#{name}`" }.join(', ')}.".freeze
 
     def on_send(node)
       who, what, *args = *node

data/lib/ducalis/cops/regex_cop.rb

@@ -37,9 +37,9 @@ module Ducalis
     ).freeze
 
     DETAILS = "Available regexes are:
-      #{SELF_DESCRIPTIVE.map { |name| "`#{name}`" }.join(', ')}"
+      #{SELF_DESCRIPTIVE.map { |name| "`#{name}`" }.join(', ')}".freeze
 
-    DEFAULT_EXAMPLE = 'some_example'
+    DEFAULT_EXAMPLE = 'some_example'.freeze
 
     def on_begin(node)
       not_defined_regexes(node).each do |regex|

data/lib/ducalis/cops/rest_only_cop.rb

@@ -17,7 +17,7 @@ module Ducalis
       | [About RESTful architecture](<https://confreaks.tv/videos/railsconf2017-in-relentless-pursuit-of-rest>)
     MESSAGE
 
-    WHITELIST = %i(index show new edit create update destroy).freeze
+    WHITELIST = %i[index show new edit create update destroy].freeze
 
     def on_def(node)
       return unless in_controller?

data/lib/ducalis/cops/strings_in_activerecords.rb

@@ -10,10 +10,10 @@ module Ducalis
     MESSAGE
 
     VALIDATEBLE_METHODS =
-      ::Ducalis::CallbacksActiverecord::METHODS_BLACK_LIST + %i(
+      ::Ducalis::CallbacksActiverecord::METHODS_BLACK_LIST + %i[
         validates
         validate
-      )
+      ]
 
     def on_send(node)
       _, method_name, *args = *node
@@ -30,7 +30,7 @@ module Ducalis
     def skip_node?(current_node)
       key, value = *current_node
       return true unless current_node.type == :pair
-      return true unless %w(if unless).include?(key.source)
+      return true unless %w[if unless].include?(key.source)
       return true unless value.type == :str
       false
     end

data/lib/ducalis/cops/too_long_workers.rb

@@ -16,13 +16,9 @@ module Ducalis
 
     def on_class(node)
       return unless in_worker?
-      check_code_length(node)
-    end
-
-    private
-
-    def message(length, max_length)
-      format("#{OFFENSE} [%d/%d]", length, max_length)
+      length = code_length(node)
+      return unless length > max_length
+      add_offense(node, :expression, "#{OFFENSE} [#{length}/#{max_length}]")
     end
   end
 end

data/lib/ducalis/cops/uncommented_gem.rb

@@ -12,7 +12,7 @@ module Ducalis
       | It will increase [bus-factor](<https://en.wikipedia.org/wiki/Bus_factor>).
     MESSAGE
 
-    ALLOWED_KEYS = %w(require group :require :group).freeze
+    ALLOWED_KEYS = %w[require group :require :group].freeze
 
     def investigate(processed_source)
       return unless processed_source.ast
@@ -27,7 +27,7 @@ module Ducalis
 
     private
 
-    def_node_search :gem_declarations, '(send nil :gem str #allowed_args?)'
+    def_node_search :gem_declarations, '(send _ :gem str #allowed_args?)'
 
     def commented?(processed_source, node)
       processed_source.comments

data/lib/ducalis/cops/unlocked_gem.rb

@@ -17,6 +17,6 @@ module Ducalis
       end
     end
 
-    def_node_search :gem_declarations, '(send nil :gem (str _))'
+    def_node_search :gem_declarations, '(send _ :gem (str _))'
   end
 end

data/lib/ducalis/cops/useless_only.rb

@@ -25,8 +25,8 @@ module Ducalis
 
     MESSAGE
 
-    FILTERS = %i(before_filter after_filter around_filter
-                 before_action after_action around_action).freeze
+    FILTERS = %i[before_filter after_filter around_filter
+                 before_action after_action around_action].freeze
 
     def on_send(node)
       _, method_name, *args = *node

data/lib/ducalis/documentation.rb

@@ -65,8 +65,8 @@ class SpecsProcessor < Parser::AST::Processor
 end
 
 class Documentation
-  SIGNAL_WORD = 'raises'
-  RULE_WORD = '[rule]'
+  SIGNAL_WORD = 'raises'.freeze
+  RULE_WORD = '[rule]'.freeze
 
   def call
     Dir[File.join(File.dirname(__FILE__), 'cops', '*.rb')].sort.map do |f|

data/lib/ducalis/patched_rubocop/git_files_access.rb

@@ -5,7 +5,7 @@ require 'singleton'
 
 module PatchedRubocop
   class GitFilesAccess
-    DELETED = 'deleted'
+    DELETED = 'deleted'.freeze
 
     include PatchedRubocop::Diffs
     include Singleton

data/lib/ducalis/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ducalis
-  VERSION = '0.6.0'
+  VERSION = '0.7.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ducalis
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Ignat Zakrevsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-18 00:00:00.000000000 Z
+date: 2018-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -71,9 +71,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.45.0
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.46.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -81,15 +78,13 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.45.0
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.46.0
 description: "    Ducalis is RuboCop based static code analyzer for enterprise Rails
   \    applications.\n"
 email:
 - iezakrevsky@gmail.com
 executables:
 - ducalis
+- legacy_versions_test.sh
 extensions: []
 extra_rdoc_files: []
 files:
@@ -105,6 +100,7 @@ files:
 - README.md
 - Rakefile
 - bin/ducalis
+- bin/legacy_versions_test.sh
 - config/.ducalis.yml
 - ducalis.gemspec
 - lib/ducalis.rb
@@ -122,6 +118,7 @@ files:
 - lib/ducalis/cops/data_access_objects.rb
 - lib/ducalis/cops/enforce_namespace.rb
 - lib/ducalis/cops/evlis_overusing.rb
+- lib/ducalis/cops/extensions/rubocop_cast.rb
 - lib/ducalis/cops/extensions/type_resolving.rb
 - lib/ducalis/cops/fetch_expression.rb
 - lib/ducalis/cops/keyword_defaults.rb