fixup! fixup! Blah

Author: Shreyas Balakrishna

lib/cpp_dependency_graph/directory_parser.rb

@@ -1,10 +1,10 @@
 module DirectoryParser
   def fetch_all_dirs(root_dir)
-    Find.find(root_dir).select { |e| File.directory?(e) }
+    Find.find(root_dir).select { |e| File.directory?(e) && e != root_dir }
   end
 
   def glob_files(path, extensions)
-    path = File.join(path, File::SEPARATOR) + '*' + extensions
+    path = File.join(path, File::SEPARATOR, '**', File::SEPARATOR, '*' + extensions)
     Dir.glob(path).select { |entry| File.file?(entry) }.compact
   end
 end

lib/cpp_dependency_graph/project.rb

@@ -24,6 +24,10 @@ def source_component(name)
     source_components[name]
   end
 
+  def project_component
+    @project_component ||= build_project_component
+  end
+
   def source_files
     @source_files ||= build_source_files
   end
@@ -41,12 +45,17 @@ def external_includes(component)
 
   def build_source_files
     # TODO: Breaking Demeter's law here
-    files = source_components.values.flat_map(&:source_files)
+    files = project_component.values.flat_map(&:source_files)
     files.map do |file|
       [file.path, file]
     end.to_h
   end
 
+  def build_project_component
+    c = SourceComponent.new(@path)
+    { c.name => c }
+  end
+
   def build_source_components
     # TODO: Dealing with source components with same dir name?
     dirs = fetch_all_dirs(@path)

spec/test/component_dependency_graph_spec.rb

@@ -8,36 +8,30 @@
   let(:dependency_graph) { ComponentDependencyGraph.new(project) }
 
   it 'returns all links for a project' do
-    expected_links = {}
-    expected_links['UI'] = [Link.new('UI', 'Framework', false),
-                            Link.new('UI', 'Engine', true)]
-    expected_links['DataAccess'] = [Link.new('DataAccess', 'Framework', false)]
-    expected_links['main'] = [Link.new('main', 'UI', false)]
-    expected_links['Framework'] = []
-    expected_links['System'] = []
-    expected_links['Engine'] = [Link.new('Engine', 'Framework', false),
-                                Link.new('Engine', 'UI', true),
-                                Link.new('Engine', 'DataAccess', false)]
-    expect(dependency_graph.all_links).to eq(expected_links)
+    links = dependency_graph.all_links
+    expect(links['UI']).to contain_exactly(Link.new('UI', 'Engine', true), Link.new('UI', 'Framework', false))
+    expect(links['DataAccess']).to contain_exactly(Link.new('DataAccess', 'Framework', false))
+    expect(links['main']).to contain_exactly(Link.new('main', 'UI', false))
+    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))
   end
 
   it 'returns empty links for an unknown component of a project' do
     expect(dependency_graph.links('Blah').empty?).to eq(true)
   end
 
   it 'returns links for a specified component of a project' do
-    expected_links = {}
-    expected_links['UI'] = [Link.new('UI', 'Engine', true)]
-    expected_links['Engine'] = [Link.new('Engine', 'Framework', false),
-                                Link.new('Engine', 'UI', true),
-                                Link.new('Engine', 'DataAccess', false)]
-    expect(dependency_graph.links('Engine')).to eq(expected_links)
+    links = dependency_graph.links('Engine')
+    expect(links['Engine']).to contain_exactly(Link.new('Engine', 'DataAccess', false), Link.new('Engine', 'Framework', false),
+                                               Link.new('Engine', 'UI', true))
+    expect(links['UI']).to contain_exactly(Link.new('UI', 'Engine', true))
   end
 
   it 'returns all cyclic links of a project' do
-    expected_links = {}
-    expected_links['Engine'] = [Link.new('Engine', 'UI', true)]
-    expected_links['UI'] = [Link.new('UI', 'Engine', true)]
-    expect(dependency_graph.all_cyclic_links).to eq(expected_links)
+    links = dependency_graph.all_cyclic_links
+    expect(links['Engine']).to contain_exactly(Link.new('Engine', 'UI', true))
+    expect(links['UI']).to contain_exactly(Link.new('UI', 'Engine', true))
   end
 end

spec/test/project_spec.rb

@@ -3,6 +3,11 @@
 require 'cpp_dependency_graph/project'
 
 RSpec.describe Project do
+  it 'parses overall project component' do
+    component_names = Project.new('spec/test/example_project').project_component.values.map(&:name).sort
+    expect(component_names).to eq(%w[example_project])
+  end
+
   it 'parses all source components' do
     component_names = Project.new('spec/test/example_project').source_components.values.map(&:name).sort
     expect(component_names).to eq(%w[DataAccess Engine Framework System UI main])

spec/test/source_component_spec.rb

@@ -14,8 +14,8 @@
   end
 
   it 'parses all source files within it' do
-    source_file_names = SourceComponent.new('spec/test/example_project/Engine').source_files.map(&:basename)
-    expect(source_file_names).to eq(['Engine.h', 'OldEngine.h', 'Engine.cpp'])
+    source_file_names = SourceComponent.new('spec/test/example_project/Engine').source_files.map(&:basename).sort
+    expect(source_file_names).to eq(['Engine.cpp', 'Engine.h', 'OldEngine.h'])
   end
 
   it 'has an includes attribute' do