calcifer 0.1.1 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0c1bdeaf9f49017bb6f2aff22d00c18f7bb68557214065f9ace1eba6c5d2751
-  data.tar.gz: 0f7feb93dfceeb89a75c507111e283d846f71e1c025e520333511a320b1c33b0
+  metadata.gz: a959bb4f96beb91315e7571c4e0b6c6d40e6c9225f545d063b9fc2f3ed926d9a
+  data.tar.gz: 54a53e3d1dcb91bcbd20aac7ffe794d4b22867508a76d66e3066afb16b057321
 SHA512:
-  metadata.gz: a7f917e7934082a97c5b230dd6b41003cfcd7da2f8e13657dd705bf868497f538c28b27073af41c8fb05cb274d49c60ad669ff3a95e6d5615423fc861ee5ec20
-  data.tar.gz: a81969f58b5f626d64119bff0f938d11e7d2c1a98d1d759991f54c3b60af205dd63f75013ab9791f7fa49c476ccc194d3e57920924a81ac941d1a8016ae564ef
+  metadata.gz: b522e099b19572387281ae0d987adcd796e98e3cc47e88115e2a06437a6a1d6bdf9dddd8462a81876f241c1b2a762d656138c35c31b564eff1bbfef40fe6639c
+  data.tar.gz: f98d7b8431f5ef378950ddddff0323abb846d7951b7ac68f875516e5e1307d7a3eeeadcf8f00eae9ac4b4d70aa7b28694496d67d8ea055f4214feaad31644e61

data/Gemfile.lock

@@ -1,13 +1,19 @@
 PATH
   remote: .
   specs:
-    calcifer (0.1.1)
+    calcifer (0.2.1)
+      rgl
 
 GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.5.0)
+    generator (0.0.1)
+    lazy_priority_queue (0.1.1)
     rake (10.5.0)
+    rgl (0.5.7)
+      lazy_priority_queue (~> 0.1.0)
+      stream (~> 0.5.3)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -21,6 +27,8 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.3)
+    stream (0.5.3)
+      generator
 
 PLATFORMS
   ruby

data/calcifer.gemspec

@@ -14,6 +14,8 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/GustavoDuarteM/calcifer"
   spec.license       = "MIT"
 
+  spec.required_ruby_version = '>= 2.6.4'
+
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
   if spec.respond_to?(:metadata)
@@ -37,6 +39,8 @@ Gem::Specification.new do |spec|
   spec.executables     = ['calcifer']
   spec.require_paths   = ["lib"]
 
+  spec.add_dependency 'rgl'
+
   spec.add_development_dependency "bundler", "~> 1.17"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"

data/lib/calcifer/builders/root_file_builder.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Calcifer
+  module Buiders
+    class RootFileBuilder
+      def initialize(file)
+        @file = file
+      end
+
+      def build
+        return unless @file
+
+        module_name = Calcifer::Finders::ModuleNameFinder.new(@file).execute
+        Calcifer::Graph::RootFile.new(module_name, @file) if module_name
+      end
+    end
+  end
+end

data/lib/calcifer/finders/file_related_finder.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Calcifer
+  module Finders
+    class FileRelatedFinder
+      attr_reader :related_spec_files
+
+      def initialize(module_name)
+        @module_name = module_name
+      end
+
+      def execute
+        related_files_path.split
+      end
+
+      private
+
+      def related_files_path
+        `grep -Rlw '#{@module_names}' ./app`
+      end
+    end
+  end
+end

data/lib/calcifer/finders/{modules_finder.rb → module_name_finder.rb}

@@ -2,30 +2,23 @@
 
 module Calcifer
   module Finders
-    class ModulesFinder
+    class ModuleNameFinder
       MODULE_REGEX = /^(module)\s\w+/.freeze
       CLASS_REGEX = /^(class)\s\w+/.freeze
+      ONE_LINE_CLASS_REGEX = /^(class)\s\w+\s<\s\w+;\s(end)/.freeze
       attr_reader :modules
 
-      def initialize(file_list)
-        @file_list = file_list
-        @modules = []
+      def initialize(file)
+        @file = file
       end
 
       def execute
-        @file_list.each do |file|
-          module_name = build_module_name(file)
-          @modules << module_name if module_name.length.positive?
-        end
-        @modules
-      end
-
-      private
+        return unless @file
 
-      def build_module_name(file)
-        # TODO add clause to one line defnition as "class Error < StandardError; end"
         module_name = ''
-        file.readlines.each do |line|
+        @file.readlines.each do |line|
+          next if line.strip.match(ONE_LINE_CLASS_REGEX)&.length&.positive?
+
           if line.strip.match(MODULE_REGEX)&.length&.positive?
             module_name += "#{line.gsub('module', '').strip}::"
           elsif line.strip.match(CLASS_REGEX)&.length&.positive?
@@ -33,7 +26,8 @@ module Calcifer
             break
           end
         end
-        module_name
+
+        module_name.length.positive? ? module_name : nil
       end
     end
   end

data/lib/calcifer/finders/spec_files_related_finder.rb

@@ -5,25 +5,19 @@ module Calcifer
     class SpecFilesRelatedFinder
       attr_reader :related_spec_files
 
-      def initialize(modules)
-        @modules = modules
+      def initialize(related_files_path)
+        @related_files_path = related_files_path
       end
 
       def execute
         @related_spec_files = specs_to_related_files.join(' ').strip
       end
 
-      private
-
-      def related_files_path
-        module_names = @modules.join('\\|')
-        `grep -Rlw '#{module_names}' ./app`
-      end
-
       def specs_to_related_files
-        related_files_path.split.map(&lambda { |file_path|
-          file_path.gsub('./app', './spec').gsub('.rb', '_spec.rb')
-        }).select { |file_path_spec| File.file?(file_path_spec) }
+        @related_files_path.map(&lambda { |file_path|
+          spec_file_path = file_path.gsub('./app', './spec').gsub('.rb', '_spec.rb')
+          File.file?(spec_file_path) ? spec_file_path : nil
+        }).compact
       end
     end
   end

data/lib/calcifer/graph/root_file.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Calcifer
+  module Graph
+    class RootFile
+      attr :graph_root, :module_name, :file_path
+
+      def initialize(module_name, file)
+        @module_name = module_name
+        @file = file
+        @file_path = file.path
+        build_graph_root
+      end
+
+      def add_related_file_path(file_path)
+        @graph_root.add_edge(@file.path, file_path)
+      end
+
+      def related_files_paths
+        @graph_root.vertices - [@file.path]
+      end
+
+      private
+
+      def build_graph_root
+        @graph_root = RGL::DirectedAdjacencyGraph.new
+        @graph_root.add_vertex(@file.path)
+      end
+    end
+  end
+end

data/lib/calcifer/version.rb

@@ -1,3 +1,3 @@
 module Calcifer
-  VERSION = "0.1.1"
+  VERSION = "0.2.1"
 end

data/lib/calcifer.rb

@@ -1,18 +1,24 @@
 # frozen_string_literal: true
 
-require 'calcifer/version'
-require 'calcifer/finders/modules_finder'
-require 'calcifer/finders/files_diff_finder'
-require 'calcifer/finders/spec_files_related_finder'
+Dir["#{File.dirname(__FILE__)}/calcifer/**/*.rb"].sort.each { |file| require file }
+require 'rgl/adjacency'
 
 module Calcifer
   class Error < StandardError; end
 
   def self.execute
     file_list = Calcifer::Finders::FilesDiffFinder.new.execute
-    module_list = Calcifer::Finders::ModulesFinder.new(file_list).execute
-    spec_files_path_list = Calcifer::Finders::SpecFilesRelatedFinder.new(module_list).execute
+    graph_list_file = file_list.map(&->(file) { Calcifer::Buiders::RootFileBuilder.new(file).build }).compact
 
-    printf %x[echo #{spec_files_path_list}]
+    graph_list_file.each do |graph|
+      related_files = Calcifer::Finders::FileRelatedFinder.new(graph.module_name).execute
+      graph_vertices = related_files.map { |related_file| [graph.file_path, related_file] }
+      graph.graph_root.add_edges(*graph_vertices)
+    end
+
+    spec_files_path = graph_list_file.map(&:related_files_paths).flatten
+    spec_files_path_list = Calcifer::Finders::SpecFilesRelatedFinder.new(spec_files_path).execute
+
+    printf `echo #{spec_files_path_list}`
   end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: calcifer
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1
 platform: ruby
 authors:
 - Gustavo Duarte
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-29 00:00:00.000000000 Z
+date: 2022-01-05 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rgl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -74,9 +88,12 @@ files:
 - bin/setup
 - calcifer.gemspec
 - lib/calcifer.rb
+- lib/calcifer/builders/root_file_builder.rb
+- lib/calcifer/finders/file_related_finder.rb
 - lib/calcifer/finders/files_diff_finder.rb
-- lib/calcifer/finders/modules_finder.rb
+- lib/calcifer/finders/module_name_finder.rb
 - lib/calcifer/finders/spec_files_related_finder.rb
+- lib/calcifer/graph/root_file.rb
 - lib/calcifer/version.rb
 homepage: https://github.com/GustavoDuarteM/calcifer
 licenses:
@@ -92,7 +109,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.6.4
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="