rubycritic 3.3.0 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb8941448d84144db4e15c3cb37731de9c78a9b9
-  data.tar.gz: 36cf41f7d42d12668c4abe9f6300e0cbdeec43a5
+  metadata.gz: 65dd42190e2ce5eb0a6067eaf3a9c158eec42c89
+  data.tar.gz: 8e2633b8d064349f4f412dad2a4993c8def5a6c1
 SHA512:
-  metadata.gz: 2174e7c073020b197681db5c4af3501b302f85d64cb858c224e772d93a268eeebd68bf9d530203a20f278918d5bd03370be8a7d5ff988e83e1d1a7792ab05908
-  data.tar.gz: fb77e4cc9ce6aafe5cc8239f90d79f6354046568934f6baf37eda7bb47786fe77b256c8fef53fa548e442d7caad8b0e627eda1f9e6beb5c68b0aada9d2e3feaf
+  metadata.gz: 6ed0426b235e89803c2930852b3a88f49176d049526c64d36be0e4d3ec1708f049c672d51030bfb43c32e0f6476d41da9dad4c72e8964e5821ac2647dee8f4c5
+  data.tar.gz: 266453f2ae7cadbb4373adddaf33d15bde1bac2d46aeb3b26c71a519d72ccc1e6ddc74e7ec501db1ceb3c6587083e70184642d066d2a44f7ce445c4cee1718d0

data/.rubocop.yml

@@ -1,4 +1,5 @@
 AllCops:
+  DisplayCopNames: true
   Include:
     - '**/*.gemspec'
     - '**/*.rake'

data/.travis.yml

@@ -1,14 +1,17 @@
 sudo: false
 language: ruby
-cache: bundler
-before_install: gem update bundler
+cache:
+  bundler: true
+before_install:
+  - gem install bundler
 matrix:
   include:
     - rvm: 2.1.0
     - rvm: 2.1
     - rvm: 2.2
-    - rvm: 2.3.3
-    - rvm: 2.4.0
+    - rvm: 2.3
+    - rvm: 2.4
+    - rvm: 2.5
     - rvm: ruby-head
     - rvm: jruby-9.1.8.0
       env: JRUBY_OPTS='--debug' # get more accurate coverage data
@@ -18,4 +21,9 @@ matrix:
     - rvm: jruby-9.1.8.0
     - rvm: rbx-3
   fast_finish: true
-script: bundle exec rake
+
+script:
+  - bundle exec rake test
+  - bundle exec cucumber features --format progress --color
+  - bundle exec rake reek
+  - bundle exec rubocop

data/CHANGELOG.md

@@ -1,9 +1,19 @@
-# master [(unreleased)](https://github.com/whitesmith/rubycritic/compare/v3.3.0...master)
+# master [(unreleased)](https://github.com/whitesmith/rubycritic/compare/v3.4.0...master)
+
+* 
+
+# 3.4.0 / 2018-03-22 [(commits)](https://github.com/whitesmith/rubycritic/compare/v3.3.0...v3.4.0)
+
+* [CHANGE] Update `rubocop` to 0.51.0 (by [@olleolleolle][])
+* [CHANGE] Update `parser` to 2.5.0 (by [@joshrpowell][])
+* [CHANGE] Update `rainbow` to 3.0 (by [@joshrpowell][])
+* [CHANGE] Update `rubocop` to 0.53.0 (by [@joshrpowell][])
+* [BUGFIX] Fix wrong label for churn in the code file template (by [@nbekirov][])
 
 # 3.3.0 / 2017-10-10 [(commits)](https://github.com/whitesmith/rubycritic/compare/v3.2.3...v3.3.0)
 
 * [FEATURE] Add lint format similar to Golint (by [@nightscape][])
-* [CHANGE] Update `cucumber` to 3.0 (by [@onumis][]) 
+* [CHANGE] Update `cucumber` to 3.0 (by [@onumis][])
 * [CHANGE] Update `rake` to 12.0 (by [@onumis][])
 * [CHANGE] Update `rubocop` to 0.50.0 (by [@onumis][])
 * [CHANGE] Accepting floating point values from Flog (by [@onumis][])
@@ -224,3 +234,5 @@
 [@yuku-t]: https://github.com/yuku-t
 [@ochagata]: https://github.com/ochagata
 [@nightscape]: https://github.com/nightscape
+[@nbekirov]: https://github.com/nbekirov
+[@joshrpowell]: https://github.com/joshrpowell

data/README.md

@@ -184,7 +184,7 @@ end
 
 ## Compatibility
 
-RubyCritic is supporting:
+RubyCritic is supporting Ruby versions:
 
 * 2.1
 * 2.2

data/bin/rubycritic

@@ -3,7 +3,7 @@
 
 # Always look in the lib directory of this gem
 # first when searching the load path
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift File.expand_path('../lib', __dir__)
 
 require 'rubycritic/cli/application'
 

data/lib/rubycritic/analysers/smells/flog.rb

@@ -35,9 +35,7 @@ module RubyCritic
         @flog.flog(analysed_module.path)
         @flog.each_by_score do |class_method, original_score|
           score = original_score.round
-          if score >= HIGH_COMPLEXITY_SCORE_THRESHOLD
-            analysed_module.smells << create_smell(class_method, score)
-          end
+          analysed_module.smells << create_smell(class_method, score) if score >= HIGH_COMPLEXITY_SCORE_THRESHOLD
         end
       end
 

data/lib/rubycritic/cli/application.rb

@@ -21,7 +21,7 @@ module RubyCritic
         print(reporter.status_message)
         reporter.status
       rescue OptionParser::InvalidOption => error
-        $stderr.puts "Error: #{error}"
+        warn "Error: #{error}"
         STATUS_ERROR
       end
 

data/lib/rubycritic/cli/options.rb

@@ -76,6 +76,7 @@ module RubyCritic
           no_browser: no_browser
         }
       end
+      # rubocop:enable Metrics/MethodLength
 
       private
 

data/lib/rubycritic/core/analysed_module.rb

@@ -87,8 +87,8 @@ module RubyCritic
       }
     end
 
-    def to_json(*a)
-      to_h.to_json(*a)
+    def to_json(*options)
+      to_h.to_json(*options)
     end
   end
 end

data/lib/rubycritic/core/analysed_modules_collection.rb

@@ -9,13 +9,13 @@ module RubyCritic
 
     # Limit used to prevent very bad modules to have excessive impact in the
     # overall result. See #limited_cost_for
-    COST_LIMIT = 32
+    COST_LIMIT = 32.0
     # Score goes from 0 (worst) to 100 (perfect)
-    MAX_SCORE = 100
+    MAX_SCORE = 100.0
     # Projects with an average cost of 16 (or above) will score 0, since 16
     # is where the worst possible rating (F) starts
-    ZERO_SCORE_COST = 16
-    COST_MULTIPLIER = MAX_SCORE.to_f / ZERO_SCORE_COST
+    ZERO_SCORE_COST = 16.0
+    COST_MULTIPLIER = MAX_SCORE / ZERO_SCORE_COST
 
     def initialize(paths)
       @modules = SourceLocator.new(paths).pathnames.map do |pathname|

data/lib/rubycritic/core/location.rb

@@ -26,8 +26,8 @@ module RubyCritic
       }
     end
 
-    def to_json(*a)
-      to_h.to_json(*a)
+    def to_json(*options)
+      to_h.to_json(*options)
     end
 
     def ==(other)

data/lib/rubycritic/core/rating.rb

@@ -23,8 +23,8 @@ module RubyCritic
       @letter
     end
 
-    def to_json(*a)
-      to_h.to_json(*a)
+    def to_json(*options)
+      to_h.to_json(*options)
     end
   end
 end

data/lib/rubycritic/core/smell.rb

@@ -48,8 +48,8 @@ module RubyCritic
       }
     end
 
-    def to_json(*a)
-      to_h.to_json(*a)
+    def to_json(*options)
+      to_h.to_json(*options)
     end
 
     def doc_url

data/lib/rubycritic/generators/html/base.rb

@@ -12,7 +12,7 @@ module RubyCritic
           ERB.new(File.read(File.join(TEMPLATES_DIR, template_path)))
         end
 
-        TEMPLATES_DIR = File.expand_path('../templates', __FILE__)
+        TEMPLATES_DIR = File.expand_path('templates', __dir__)
         LAYOUT_TEMPLATE = erb_template(File.join('layouts', 'application.html.erb'))
 
         include ViewHelpers

data/lib/rubycritic/generators/html/templates/code_file.html.erb

@@ -32,7 +32,7 @@
             </div>
             <div class="col-md-3">
               <div><span class="metric"><%= @analysed_module.complexity_per_method %></span><small> complexity/method</small></div>
-              <div><span class="metric"><%= @analysed_module.churn %></span><small> loc/method</small></div>
+              <div><span class="metric"><%= @analysed_module.churn %></span><small> churn</small></div>
             </div>
             <div class="col-md-3">
               <div><span class="metric"><%= @analysed_module.complexity %></span><small> complexity</small></div>

data/lib/rubycritic/generators/html_report.rb

@@ -10,7 +10,7 @@ require 'rubycritic/generators/html/code_file'
 module RubyCritic
   module Generator
     class HtmlReport
-      ASSETS_DIR = File.expand_path('../html/assets', __FILE__)
+      ASSETS_DIR = File.expand_path('html/assets', __dir__)
 
       def initialize(analysed_modules)
         @analysed_modules = analysed_modules

data/lib/rubycritic/generators/text/lint.rb

@@ -6,7 +6,7 @@ module RubyCritic
     module Text
       class Lint
         class << self
-          TEMPLATE_PATH = File.expand_path('../templates/lint.erb', __FILE__)
+          TEMPLATE_PATH = File.expand_path('templates/lint.erb', __dir__)
           FILE_NAME = 'lint.txt'.freeze
 
           def file_directory

data/lib/rubycritic/generators/text/list.rb

@@ -7,7 +7,7 @@ module RubyCritic
     module Text
       class List
         class << self
-          TEMPLATE_PATH = File.expand_path('../templates/list.erb', __FILE__)
+          TEMPLATE_PATH = File.expand_path('templates/list.erb', __dir__)
 
           def erb_template
             @erb_template ||= ERB.new(File.read(TEMPLATE_PATH), nil, '-')

data/lib/rubycritic/source_control_systems/double.rb

@@ -3,11 +3,11 @@
 module RubyCritic
   module SourceControlSystem
     class Double < Base
-      def revisions_count(_)
+      def revisions_count(_path)
         0
       end
 
-      def date_of_last_commit(_)
+      def date_of_last_commit(_path)
         nil
       end
 

data/lib/rubycritic/source_control_systems/perforce.rb

@@ -48,7 +48,7 @@ module RubyCritic
       end
 
       def date_of_last_commit(path)
-        DateTime.strptime(perforce_files[Perforce.key_file(path)].last_commit, '%s').strftime('%Y-%m-%d %H:%M:%S %z')
+        Time.strptime(perforce_files[Perforce.key_file(path)].last_commit, '%s').strftime('%Y-%m-%d %H:%M:%S %z')
       end
 
       def revision?

data/lib/rubycritic/version.rb

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

data/rubycritic.gemspec

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'rubycritic/version'
 
@@ -24,22 +24,22 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'flay', '~> 2.8'
   spec.add_runtime_dependency 'flog', '~> 4.4'
   spec.add_runtime_dependency 'launchy', '2.4.3'
-  spec.add_runtime_dependency 'tty-which', '~> 0.3.0'
-  spec.add_runtime_dependency 'parser', '~> 2.4.0'
-  spec.add_runtime_dependency 'rainbow', '~> 2.1'
+  spec.add_runtime_dependency 'parser', '~> 2.5.0'
+  spec.add_runtime_dependency 'rainbow', '~> 3.0'
   spec.add_runtime_dependency 'reek', '~> 4.4'
   spec.add_runtime_dependency 'ruby_parser', '~> 3.8'
+  spec.add_runtime_dependency 'tty-which', '~> 0.3.0'
   spec.add_runtime_dependency 'virtus', '~> 1.0'
 
   spec.add_development_dependency 'aruba', '~> 0.12', '>= 0.12.0'
   spec.add_development_dependency 'bundler', '~> 1.3', '>= 1.3.0'
+  spec.add_development_dependency 'byebug', '~> 9.0', '>= 8.0'
   spec.add_development_dependency 'cucumber', '~> 3.0', '>= 2.2.0'
+  spec.add_development_dependency 'diff-lcs', '~> 1.3'
   spec.add_development_dependency 'fakefs', '~> 0.10', '>= 0.10.0'
   spec.add_development_dependency 'minitest', '~> 5.3', '>= 5.3.0'
   spec.add_development_dependency 'minitest-around', '~> 0.4.0'
-  spec.add_development_dependency 'diff-lcs', '~> 1.3'
   spec.add_development_dependency 'mocha', '~> 1.1', '>= 1.1.0'
   spec.add_development_dependency 'rake', '~> 12.0', '>= 11.0.0'
-  spec.add_development_dependency 'rubocop', '~> 0.50.0'
-  spec.add_development_dependency 'byebug', '~> 9.0', '>= 8.0'
+  spec.add_development_dependency 'rubocop', '~> 0.53'
 end

data/test/lib/rubycritic/commands/status_reporter_test.rb

@@ -21,7 +21,7 @@ describe RubyCritic::Command::StatusReporter do
     end
 
     it 'accept a score' do
-      @reporter.score = 50
+      @reporter.score = 50.0
       @reporter.status.must_equal success_status
       @reporter.status_message.must_equal 'Score: 50.0'
     end
@@ -46,7 +46,7 @@ describe RubyCritic::Command::StatusReporter do
     end
 
     describe 'when score is below minimum' do
-      let(:score) { 98 }
+      let(:score) { 98.0 }
       it 'should return the correct status' do
         @reporter.score = score
         @reporter.status.must_equal score_below_minimum
@@ -61,7 +61,7 @@ describe RubyCritic::Command::StatusReporter do
     end
 
     describe 'when score is equal the minimum' do
-      let(:score) { 99 }
+      let(:score) { 99.0 }
       it 'should return the correct status' do
         @reporter.score = score
         @reporter.status.must_equal success_status
@@ -70,7 +70,7 @@ describe RubyCritic::Command::StatusReporter do
     end
 
     describe 'when score is above the minimum' do
-      let(:score) { 100 }
+      let(:score) { 100.0 }
       it 'should return the correct status' do
         @reporter.score = score
         @reporter.status.must_equal success_status

data/test/lib/rubycritic/source_control_systems/perforce_test.rb

@@ -151,10 +151,13 @@ Server address: the.server.address.com
       end
 
       it 'retrieves the date of the last commit of the ruby files' do
+        oldtz = ENV['TZ']
+        ENV['TZ'] = 'utc'
         Dir.stubs(:getwd).returns('/path/to/client')
         RubyCritic::SourceControlSystem::Perforce.stubs(:`).once.returns(p4_stats)
         @system.date_of_last_commit('a_ruby_file.rb').must_equal '2016-09-05 11:39:11 +0000'
         @system.date_of_last_commit('second_ruby_file.rb').must_equal '2016-05-30 09:47:48 +0000'
+        ENV['TZ'] = oldtz
       end
 
       it 'retrieves the information if the ruby file is opened (in the changelist and ready to commit)' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubycritic
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.4.0
 platform: ruby
 authors:
 - Guilherme Simoes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-10 00:00:00.000000000 Z
+date: 2018-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: flay
@@ -53,75 +53,75 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.4.3
 - !ruby/object:Gem::Dependency
-  name: tty-which
+  name: parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 2.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
-  name: parser
+  name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rainbow
+  name: reek
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '4.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '4.4'
 - !ruby/object:Gem::Dependency
-  name: reek
+  name: ruby_parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: '3.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: '3.8'
 - !ruby/object:Gem::Dependency
-  name: ruby_parser
+  name: tty-which
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: virtus
   requirement: !ruby/object:Gem::Requirement
@@ -176,6 +176,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '9.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '8.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '9.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -196,6 +216,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.0
+- !ruby/object:Gem::Dependency
+  name: diff-lcs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
@@ -250,20 +284,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.0
-- !ruby/object:Gem::Dependency
-  name: diff-lcs
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -310,34 +330,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.50.0
+        version: '0.53'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.50.0
-- !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '9.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '8.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '9.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '0.53'
 description: RubyCritic is a tool that wraps around various static analysis gems to
   provide a quality report of your Ruby code.
 email: