fixup! fixup! fixup! fixup! fixup! Blah

Author: Shreyas Balakrishna

Diff for: .rubocop.yml

@@ -1,8 +1,8 @@
 inherit_from: .rubocop_todo.yml
 
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.7
   DisabledByDefault: false
 
-Metrics/LineLength:
+Layout/LineLength:
   Max: 140

Diff for: cpp_dependency_graph.gemspec

@@ -29,8 +29,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = '3.1.2'
 
   s.add_runtime_dependency 'docopt', '~> 0.6'
-  s.add_runtime_dependency 'ruby-graphviz', '~> 1.2'
   s.add_runtime_dependency 'json', '~> 2.3.0'
+  s.add_runtime_dependency 'ruby-graphviz', '~> 1.2'
 
   s.add_development_dependency 'bundler', '~> 2.1'
   s.add_development_dependency 'debase', '~> 0.2'

Diff for: lib/cpp_dependency_graph/bidirectional_hash.rb

@@ -25,6 +25,7 @@ def rfetch(value)
 
   def fetch_from(hash, key)
     return nil unless hash.key?(key)
+
     v = hash[key]
     v.length == 1 ? v.first : v.dup
   end

Diff for: lib/cpp_dependency_graph/component_dependency_graph.rb

@@ -20,6 +20,7 @@ def all_cyclic_links
 
   def links(name)
     return {} unless all_links.key?(name)
+
     links = incoming_links(name)
     links.merge!(outgoing_links(name))
     links

Diff for: lib/cpp_dependency_graph/dir_tree.rb

@@ -11,7 +11,7 @@ class DirTree
   attr_reader :tree
 
   def initialize(path)
-    @tree ||= File.directory?(path) ? parse_dirs(path) : {}
+    @tree = File.directory?(path) ? parse_dirs(path) : {}
   end
 
   private
@@ -22,9 +22,12 @@ def parse_dirs(path, name = nil)
     # TODO: Use Dir.map.compact|filter instead here
     Dir.foreach(path) do |entry|
       next if ['..', '.'].include?(entry)
+
       full_path = File.join(path, entry)
       next unless File.directory?(full_path)
+
       next unless source_files_present?(full_path)
+
       data[:children] << parse_dirs(full_path, entry)
     end
     data

Diff for: lib/cpp_dependency_graph/directory_parser.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+
+# Utility methods for parsing directories
 module DirectoryParser
   def fetch_all_dirs(root_dir)
     Find.find(root_dir).select { |e| File.directory?(e) && e != root_dir }

Diff for: lib/cpp_dependency_graph/file_dependency_graph.rb

@@ -20,6 +20,7 @@ def all_cyclic_links
 
   def links(name)
     return {} unless all_links.key?(name)
+
     links = incoming_links(name)
     links.merge!(outgoing_links(name))
     links

Diff for: lib/cpp_dependency_graph/graph_to_dot_visualiser.rb

@@ -6,9 +6,9 @@
 class GraphToDotVisualiser
   def generate(deps, file)
     @g = GraphViz.new('dependency_graph')
-    nodes = create_nodes(deps)
-    connect_nodes(deps, nodes)
-    @g.output(:dot => file)
+    create_nodes(deps)
+    connect_nodes(deps)
+    @g.output(dot: file)
   end
 
   private
@@ -17,20 +17,20 @@ def create_nodes(deps)
     node_names = deps.flat_map do |_, links|
       links.map { |link| [link.source, link.target] }.flatten
     end.uniq
-    nodes = node_names.map { |name| [name, create_node(name)] }.to_h
-    nodes
+    node_names.each do |name|
+      add_node(name)
+    end
   end
 
-  def create_node(name)
-    node = @g.add_node(name, :shape => 'box3d')
-    node
+  def add_node(name)
+    @g.add_node(name, shape: 'box3d')
   end
 
-  def connect_nodes(deps, nodes)
+  def connect_nodes(deps)
     deps.each do |source, links|
       links.each do |link|
         if link.cyclic?
-          @g.add_edges(source, link.target, :color => 'red')
+          @g.add_edges(source, link.target, color: 'red')
         else
           @g.add_edges(source, link.target)
         end

Diff for: lib/cpp_dependency_graph/include_component_dependency_graph.rb

@@ -11,7 +11,6 @@ def initialize(project)
   end
 
   def all_links
-    components = @project.source_components
     @project.source_files.map do |file|
       links = file.includes.map { |inc| Link.new(file.basename, inc, false) }
       [file.basename, links]

Diff for: lib/cpp_dependency_graph/include_to_component_resolver.rb

@@ -19,6 +19,7 @@ def external_includes(component)
 
   def component_for_include(include)
     return '' unless source_files.key?(include)
+
     @component_include_map_cache[include] = component_for_include_private(include) unless @component_include_map_cache.key?(include)
     @component_include_map_cache[include]
   end
@@ -35,6 +36,7 @@ def component_for_include_private(include)
     header_file = source_files[include]
     implementation_files = implementation_files(header_file)
     return header_file.parent_component if implementation_files.empty?
+
     implementation_files[0].parent_component
   end
 

Diff for: lib/cpp_dependency_graph/project.rb

@@ -21,6 +21,7 @@ def source_components
 
   def source_component(name)
     return SourceComponent.new('NULL') unless source_components.key?(name)
+
     source_components[name]
   end
 
@@ -65,5 +66,4 @@ def build_source_components
     end.to_h
     components.delete_if { |_, v| v.source_files.size.zero? }
   end
-
 end

Diff for: lib/cpp_dependency_graph/source_file.rb

@@ -53,6 +53,7 @@ def file_contents
   def sanitised_file_contents
     contents = File.read(@path)
     return contents if contents.valid_encoding?
+
     contents.encode('UTF-16be', invalid: :replace, replace: '?').encode('UTF-8')
   end
 end

Diff for: spec/test/component_dependency_graph_spec.rb

@@ -15,7 +15,7 @@
     expect(links['Framework']).to be_empty
     expect(links['System']).to be_empty
     expect(links['Engine']).to contain_exactly(Link.new('Engine', 'DataAccess', false), Link.new('Engine', 'Framework', false),
-                                             Link.new('Engine', 'UI', true))
+                                               Link.new('Engine', 'UI', true))
   end
 
   it 'returns empty links for an unknown component of a project' do

Diff for: spec/test/dir_tree_spec.rb

@@ -12,29 +12,28 @@
   end
 
   it 'returns all directories and its subdirectories as a tree hash structure' do
-    expected_tree = JSON.parse('{
-      "name": "spec/test/example_project",
-      "children": [{
-        "name": "DataAccess",
-        "children": []
-      }, {
-        "name": "Engine",
-        "children": []
-      }, {
-        "name": "Framework",
-        "children": []
-      }, {
-        "name": "main",
-        "children": []
-      }, {
-        "name": "System",
-        "children": []
-      }, {
-        "name": "UI",
-        "children": []
-      }]
-    }',
-                               symbolize_names: true)
+    # expected_tree = JSON.parse('{
+    #   "name": "spec/test/example_project",
+    #   "children": [{
+    #     "name": "DataAccess",
+    #     "children": []
+    #   }, {
+    #     "name": "Engine",
+    #     "children": []
+    #   }, {
+    #     "name": "Framework",
+    #     "children": []
+    #   }, {
+    #     "name": "main",
+    #     "children": []
+    #   }, {
+    #     "name": "System",
+    #     "children": []
+    #   }, {
+    #     "name": "UI",
+    #     "children": []
+    #   }]
+    # }')
     # expect(dir_tree.tree).to eq(expected_tree)
   end
 end

Diff for: spec/test/project_spec.rb

@@ -35,6 +35,7 @@
   it 'all source files of project' do
     project = Project.new('spec/test/example_project')
     source_files = project.source_files.values.map(&:basename)
-    expect(source_files).to contain_exactly('DA.h', 'Display.cpp', 'Display.h', 'Engine.cpp', 'Engine.h', 'Engine.h', 'OldEngine.h', 'System.cpp', 'System.h', 'framework.h', 'main.cpp')
+    expect(source_files).to contain_exactly('DA.h', 'Display.cpp', 'Display.h', 'Engine.cpp', 'Engine.h', 'Engine.h',
+                                            'OldEngine.h', 'System.cpp', 'System.h', 'framework.h', 'main.cpp')
   end
 end