rubycritic 4.0.2 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df75e210aa0ea8009e2a23910fbd42e0e59416ed3413b887b0319747d26c0ef1
-  data.tar.gz: a6e3daf4bfa8853213c987a88fd58df06b06759e7e6e9e0c85bdc18e08ebed6a
+  metadata.gz: 6d28dbb364926311a07893f4d5ee5253a1435c16e992d0c132ecf90c045a141c
+  data.tar.gz: 05b8fd0c896ba749a88278572c9e62557770cebee01ab757286845416992259c
 SHA512:
-  metadata.gz: e32162d4b575a62a72868927d93da26501f3911930feff237bd8db629fff87dd1b488abb513509b09a30302a0c13cdea03fe8e54ac72a3bb2d558bccc9f5b226
-  data.tar.gz: 55f54ae73bc65bbe10b49f086c93fea2d3d7e2bcde0e8f0bab5c2cb1df35df78500c3279a61be35fe800542382ee16d910f9c550713e224304c2edbfe23b186b
+  metadata.gz: bf3b9b8d0ba55fceef78eaf2247efbe753de30b6d3e3a1a946105b3e848d517853ed0b58f4a65ee2caa9eaa1cae4919fb0eb4d021c1ac76bceb29983d1f658b9
+  data.tar.gz: 6c69233b3e52f5022f96c45a06ade7e9402f2d0c2a59fbc3268a2a96804ecc1ef129cbc2313d663b690d309c91d19726fa03c25d3960e242fbceaa14fb660287

data/CHANGELOG.md

@@ -1,4 +1,13 @@
-# master [(unreleased)](https://github.com/whitesmith/rubycritic/compare/v4.0.2...master)
+# master [(unreleased)](https://github.com/whitesmith/rubycritic/compare/v4.1.0...master)
+
+*
+
+# master [(unreleased)](https://github.com/whitesmith/rubycritic/compare/v4.0.2...v4.1.0)
+
+* [BUGFIX] Assorted fixes in HTML report (by [@jbampton][])
+* [BUGFIX] Fix duplicate HTML5 DOCTYPE (by [@jbampton][])
+* [BUGFIX] Config options getting overwritten by nil argv options (by [@nathanbwright][])
+* [CHANGE] Update Reek dependency to '~> 5.0', '< 6.0' (by [@leksster][])
 
 # 4.0.2 / 2019-03-14 [(commits)](https://github.com/whitesmith/rubycritic/compare/v4.0.1...v4.0.2)
 
@@ -277,3 +286,6 @@
 [@AllanSiqueira]: https://github.com/AllanSiqueira
 [@harman28]: https://github.com/harman28
 [@lightalloy]: https://github.com/lightalloy
+[@jbampton]: https://github.com/jbampton
+[@nathanbwright]: https://github.com/nathanbwright
+[@leksster]: https://github.com/leksster

data/lib/rubycritic/cli/options.rb

@@ -19,8 +19,14 @@ module RubyCritic
         self
       end
 
+      # :reek:NilCheck
       def to_h
-        file_options.to_h.merge(argv_options.to_h)
+        file_hash = file_options.to_h
+        argv_hash = argv_options.to_h
+
+        file_hash.merge(argv_hash) do |_, file_option, argv_option|
+          argv_option.nil? ? file_option : argv_option
+        end
       end
     end
   end

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

@@ -89,7 +89,7 @@ header {
 .Graph_Cards img {margin-top:30px;}
 .Graph_Cards h4 {color:#A4A4A4;}
 .Summary_Wrapper {display:inline-block;width:100%;}
-.Summary_Title {padding:left:0;}
+.Summary_Title {padding-left:0;}
 .Summary_Title h3 {padding:10px;position:relative;color:#fff;}
 .Summary_Title h3:after {
   content: "";
@@ -124,7 +124,7 @@ header {
 .Summary_Content .list-inline {
   text-align:center;
   margin-top:10px;
-  pading-right:0;
+  padding-right:0;
 }
 .Summary_Content .list-inline span {color:#A4A4A4}
 #wrapper.toggled #page-content-wrapper {

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

@@ -21,8 +21,8 @@
         <tbody>
           <% @analysed_modules.each do |analysed_module| %>
             <tr>
-              <td>
-                <% unless Config.suppress_ratings %>
+              <% unless Config.suppress_ratings %>
+                <td>
                   <% if Config.build_mode? %>
                     <% master_analysed_module = Config.base_branch_collection.find(analysed_module.pathname) %>
                     <% if master_analysed_module.cost > analysed_module.cost %>
@@ -34,8 +34,8 @@
                     <% end %>
                   <% end %>
                   <div class="rating <%= analysed_module.rating.to_s.downcase %>"><%= analysed_module.rating %></div>
-                <% end %>
-              </td>
+                </td>
+              <% end %>
               <td>
                 <ul class="nav nav-pills">
                   <li role="presentation" >

data/lib/rubycritic/generators/html/templates/layouts/application.html.erb

@@ -1,5 +1,4 @@
 <!DOCTYPE html>
-<!doctype html>
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta charset="utf-8">
@@ -18,7 +17,7 @@
   <body>
     <header class="navbar navbar-default navbar-fixed-top">
       <a href="#menu-toggle" class="btn btn-default hidden-lg visible-sm-* hidden-md visible-xs-* pull-left" id="menu-toggle"><i class="fa fa-bars" aria-hidden="true"></i></a>
-      <a href="<%= file_path('overview.html') %>"><img src="<%= image_path('logo.png') %>" title="Ruby Critic Logo" width="55"><span class="logo">RUBYCRITIC</span></a>
+      <a href="<%= file_path('overview.html') %>"><img src="<%= image_path('logo.png') %>" alt="Ruby Critic Logo" title="Ruby Critic Logo" width="55"><span class="logo">RUBYCRITIC</span></a>
       <% if Config.compare_branches_mode? %>
         <ul class="nav navbar-nav navbar-right">
           <a href="<%= @base_path %>"><span class="branch"><%= Config.base_branch %></span></a>
@@ -50,7 +49,7 @@
       </div>
     </div>
 
-    <!-- Javascripts -->
+    <!-- JavaScripts -->
     <%= javascript_tag(:'jquery.min') %>
     <%= javascript_tag(:'jquery.tablesorter.min') %>
     <%= javascript_tag(:'jquery.scrollTo.min') %>

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

@@ -23,10 +23,10 @@
             <% if Config.source_control_present? %>
               <div id="churn-vs-complexity-graph-container" class="chart-container"></div>
             <% else %>
-              <div id="churn-error">We can't show you Churn-vs-Complexity graph because this project does not seem to be under a source code management system like git or perforce at the moment. This doesn't mean that anything is wrong, it just means certain features like this one are not avaiable.</div>
+              <div id="churn-error">We can't show you Churn-vs-Complexity graph because this project does not seem to be under a source code management system like git or perforce at the moment. This doesn't mean that anything is wrong, it just means certain features like this one are not available.</div>
             <% end %>
 
-            <script type="text/javascript">
+            <script>
              var turbulenceData = <%= @turbulence_data %>;
              var score = <%= @score %>;
             </script>

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

@@ -6,7 +6,7 @@
     <div class="description">
       <div class="heading">
         <span>
-          <i class="fa fa-warning" aria-hidden"true"=""></i>
+          <i class="fa fa-warning" aria-hidden="true"></i>
           <a href="<%= smell.doc_url %>" target="_blank"><b><%= smell.type %></b></a>
         </span>
       </div>

data/lib/rubycritic/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubycritic
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.1.0
 platform: ruby
 authors:
 - Guilherme Simoes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-14 00:00:00.000000000 Z
+date: 2019-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: flay
@@ -86,14 +86,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.3.0
+        version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.3.0
+        version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: ruby_parser
   requirement: !ruby/object:Gem::Requirement