rubycritic 4.3.3 → 4.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44375d4c40c08e4261e91751ffa2d5dec2128df68fb2f246316cb7934f1a4031
-  data.tar.gz: 6e9354a069d577119f62cd836218dd2a102c04fb93cf17e38e32c703735a2bfd
+  metadata.gz: 652fcfc312c74fc2e3192e2ce98fb03055308ce5760d6697dd58d04eb59df508
+  data.tar.gz: b8c845a71d1277a0e569f2a43b477fb8b399f1800c0ff420893c2bf89f447dbd
 SHA512:
-  metadata.gz: 68a71b2e8561a0ff52d05d2458ff8858f0127603d929190f57a8bbf390e00efb77a9181441760debe66cae88a74983606e235afd729e7a2730571d47c8360810
-  data.tar.gz: 2e330e0a44b4aaf6aa1ab5f8bd3268303fb041346dfccf25ca0c2079c818a568cd9a77f5c5dad3e7ea9ece49c8c3deed7a1dcd13fcff7b81ee13e0e2c8e967d8
+  metadata.gz: fb084002ab283454294ae6a7d5e87824c5fff66b77d107f9f04fd22a10153cbc2b3ef56635371fc55037d4e8af9276f6563c39de6d3ab2c33d600d0def59b30c
+  data.tar.gz: 456aa8aaaa6115c8fcb72430ee7db5ae5f2f94cf5bd6fa5f5ee344f95cc46bd5544e6235138a43162810916a52f501695e3e51d9d6c510bb7ddd303a696d4831

data/CHANGELOG.md

@@ -1,4 +1,26 @@
-# master [(unreleased)](https://github.com/whitesmith/rubycritic/compare/v4.3.3...master)
+# master [(unreleased)](https://github.com/whitesmith/rubycritic/compare/v4.5.1...master)
+
+# v4.5.2 / 2020-08-20 [(commits)](https://github.com/whitesmith/rubycritic/compare/v4.5.1...v4.5.2)
+
+* [BUGFIX] Handle simplecov v0.19 and install appraisal (by [@MZiserman][])
+
+# v4.5.1 / 2020-06-29 [(commits)](https://github.com/whitesmith/rubycritic/compare/v4.5.0...v4.5.1)
+
+* [BUGFIX] Handle git --name-status Copied (C) operation (by [@rizalmuthi][])
+
+# v4.5.0 / 2020-05-14 [(commits)](https://github.com/whitesmith/rubycritic/compare/v4.4.1...v4.5.0)
+
+* [CHANGE] Relax `launchy` version dependency requirement
+* [CHANGE] Drop support for ruby 2.3 (by [@joshrpowell][])
+* [CHANGE] Update Reek dependency to '~> 6.0', '< 7.0' (by [@joshrpowell][])
+
+# v4.4.1 / 2020-02-20 [(commits)](https://github.com/whitesmith/rubycritic/compare/v4.4.0...v4.4.1)
+
+* [CHANGE] Rewrite how churn is calculated to make it faster
+
+# v4.4.0 / 2020-02-15 [(commits)](https://github.com/whitesmith/rubycritic/compare/v4.3.3...v4.4.0)
+
+* [FEATURE] Take into account the `.flayignore` file (by [@Flink][])
 
 # v4.3.3 / 2020-01-31 [(commits)](https://github.com/whitesmith/rubycritic/compare/v4.3.2...v4.3.3)
 
@@ -325,3 +347,4 @@
 [@Adre]: https://github.com/Adre
 [@GeoffTidey]: https://github.com/GeoffTidey
 [@lloydwatkin]: https://github.com/lloydwatkin
+[@Flink]: https://github.com/Flink

data/README.md

@@ -216,10 +216,10 @@ See [formatters](docs/formatters.md)
 
 RubyCritic is supporting Ruby versions:
 
-* 2.3
 * 2.4
 * 2.5
 * 2.6
+* 2.7
 
 ## Improving RubyCritic
 

data/lib/rubycritic/analysers/coverage.rb

@@ -107,11 +107,15 @@ module RubyCritic
       # All results that are above the SimpleCov.merge_timeout will be
       # dropped. Returns an array of SimpleCov::Result items.
       def results
-        array = []
-        resultset.each do |command_name, data|
-          array << ::SimpleCov::Result.from_hash(command_name => data)
+        if Gem.loaded_specs['simplecov'].version >= Gem::Version.new('0.19')
+          ::SimpleCov::Result.from_hash(resultset)
+        else
+          array = []
+          resultset.each do |command_name, data|
+            array << ::SimpleCov::Result.from_hash(command_name => data)
+          end
+          array
         end
-        array
       end
     end
   end

data/lib/rubycritic/analysers/helpers/flay.rb

@@ -6,6 +6,7 @@ module RubyCritic
   class Flay < ::Flay
     def initialize(paths)
       super()
+      paths = PathExpander.new([], '').filter_files(paths, DEFAULT_IGNORE)
       process(*paths)
       analyze
     end

data/lib/rubycritic/generators/html/assets/stylesheets/application.css

@@ -221,7 +221,7 @@ header {
 }
 .sidebar-nav li a:hover {color:#9B111D;}
 .sidebar-nav li a i,.sidebar-nav li a img {font-size:18px;display:block;margin:0 auto;}
-/*End of Layout Stlyes*/
+/*End of Layout Styles*/
 
 .fadeIn {-webkit-animation: fadein 2s; /* Safari, Chrome and Opera > 12.1 */
   -moz-animation: fadein 2s; /* Firefox < 16 */

data/lib/rubycritic/source_control_systems/git.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'tty/which'
+require 'rubycritic/source_control_systems/git/churn'
 
 module RubyCritic
   module SourceControlSystem
@@ -28,12 +29,16 @@ module RubyCritic
         'Git'
       end
 
+      def churn
+        @churn ||= Churn.new
+      end
+
       def revisions_count(path)
-        git("log --follow --format=%h #{path.shellescape}").count("\n")
+        churn.revisions_count(path)
       end
 
       def date_of_last_commit(path)
-        git("log -1 --date=iso --format=%ad #{path.shellescape}").chomp!
+        churn.date_of_last_commit(path)
       end
 
       def revision?

data/lib/rubycritic/source_control_systems/git/churn.rb

@@ -0,0 +1,87 @@
+# frozen_string_literal: true
+
+module RubyCritic
+  module SourceControlSystem
+    class Git < Base
+      Stats = Struct.new(:count, :date)
+
+      class Renames
+        def initialize
+          @data = {}
+        end
+
+        def renamed(from, to)
+          current = current(to)
+          @data[from] = current
+        end
+
+        def current(name)
+          @data.fetch(name, name)
+        end
+      end
+
+      class Churn
+        def initialize
+          @renames = Renames.new
+          @date = nil
+          @stats = {}
+
+          call
+        end
+
+        def revisions_count(path)
+          stats(path).count
+        end
+
+        def date_of_last_commit(path)
+          stats(path).date
+        end
+
+        private
+
+        def call
+          Git
+            .git("log --all --date=iso --follow --format='format:date:%x09%ad' --name-status .")
+            .split("\n")
+            .reject(&:empty?)
+            .each { |line| process_line(line) }
+        end
+
+        def process_line(line)
+          operation, *rest = line.split("\t")
+
+          case operation
+          when /^date:/
+            process_date(*rest)
+          when /^[RC]/
+            process_rename(*rest)
+          else
+            process_file(*rest)
+          end
+        end
+
+        def process_date(date)
+          @date = date
+        end
+
+        def process_rename(from, to)
+          @renames.renamed(from, to)
+          process_file(to)
+        end
+
+        def process_file(filename)
+          record_commit(@renames.current(filename), @date)
+        end
+
+        def record_commit(filename, date)
+          stats = @stats[filename] ||= Stats.new(0, date)
+          stats.count += 1
+        end
+
+        def stats(path)
+          @stats.fetch(path, Stats.new(0))
+        end
+      end
+    end
+  end
+end

data/lib/rubycritic/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RubyCritic
-  VERSION = '4.3.3'.freeze
+  VERSION = '4.5.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubycritic
 version: !ruby/object:Gem::Version
-  version: 4.3.3
+  version: 4.5.2
 platform: ruby
 authors:
 - Guilherme Simoes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-31 00:00:00.000000000 Z
+date: 2020-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: flay
@@ -42,16 +42,16 @@ dependencies:
   name: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.3
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.3
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement
@@ -86,20 +86,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: ruby_parser
   requirement: !ruby/object:Gem::Requirement
@@ -157,85 +157,99 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: aruba
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.0
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: aruba
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.12.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.12'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '10.0'
     - - "~>"
       - !ruby/object:Gem::Version
         version: '11.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '10.0'
     - - "~>"
       - !ruby/object:Gem::Version
         version: '11.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.2.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.2.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: diff-lcs
   requirement: !ruby/object:Gem::Requirement
@@ -254,22 +268,22 @@ dependencies:
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.10.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.10.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: mdl
   requirement: !ruby/object:Gem::Requirement
@@ -288,82 +302,82 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.3.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.3.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.3.0
 - !ruby/object:Gem::Dependency
   name: minitest-around
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 11.0.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '12.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 11.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 11.0.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '12.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 11.0.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -496,6 +510,7 @@ files:
 - lib/rubycritic/source_control_systems/base.rb
 - lib/rubycritic/source_control_systems/double.rb
 - lib/rubycritic/source_control_systems/git.rb
+- lib/rubycritic/source_control_systems/git/churn.rb
 - lib/rubycritic/source_control_systems/mercurial.rb
 - lib/rubycritic/source_control_systems/perforce.rb
 - lib/rubycritic/source_locator.rb
@@ -512,14 +527,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.3
 signing_key: 
 specification_version: 4
 summary: RubyCritic is a Ruby code quality reporter