Create watcher class #20

lib/attractor.rb

@@ -4,6 +4,7 @@
 require 'attractor/calculator'
 require 'attractor/reporter'
 require 'attractor/suggester'
+require 'attractor/watcher'
 
 module Attractor
   class Error < StandardError; end

lib/attractor/calculator.rb

@@ -32,15 +32,5 @@ def calculate
         Value.new(file_path: change[:file_path], churn: change[:times_changed], complexity: complexity)
       end
     end
-
-    def self.watch(file_prefix: '')
-      listener = Listen.to(file_prefix) do |_modified, _added, _removed|
-        puts "modified #{_modified}"
-        puts "added #{_added}"
-        puts "removed #{_removed}"
-      end
-      listener.start
-      sleep
-    end
   end
 end

lib/attractor/cli.rb

@@ -23,12 +23,10 @@ def calc
     option :file_prefix, aliases: :p
     option :watch, aliases: :w, type: :boolean
     def report
-      puts 'Generating an HTML report'
       if options[:watch]
         puts 'Listening for file changes...'
-        Attractor::Calculator.watch(file_prefix: options[:file_prefix])
+        Attractor::HtmlReporter.new(file_prefix: options[:file_prefix]).watch
       else
-        puts "Generated HTML report at #{File.expand_path './attractor_output/index.html'}"
         case options[:format]
         when 'html'
           Attractor::HtmlReporter.new(file_prefix: options[:file_prefix]).report

lib/attractor/reporter.rb

@@ -7,12 +7,18 @@
 module Attractor
   # base reporter
   class Reporter
+    extend Forwardable
     attr_accessor :values
+    def_delegator :@watcher, :watch
 
     def initialize(file_prefix: '')
       @calculator = Calculator.new(file_prefix: file_prefix)
       @values = @calculator.calculate
       @suggester = Suggester.new(values)
+
+      @watcher = Watcher.new(file_prefix, lambda do
+        report
+      end)
     end
 
     def report
@@ -37,12 +43,14 @@ class HtmlReporter < Reporter
     def report
       super
 
+      puts 'Generating an HTML report'
       template = Tilt.new(File.expand_path('../templates/index.html.erb', __dir__))
       output = template.render self
 
       FileUtils.mkdir_p './attractor_output'
 
       File.open('./attractor_output/index.html', 'w') { |file| file.write(output) }
+      puts "Generated HTML report at #{File.expand_path './attractor_output/index.html'}"
     end
   end
 end

lib/attractor/watcher.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Attractor
+  # functionality for watching file system changes
+  class Watcher
+    def initialize(file_prefix, callback)
+      @file_prefix = file_prefix
+      @callback = callback
+    end
+
+    def watch
+      @callback.call
+
+      listener = Listen.to(@file_prefix, ignore: /^attractor_output/) do |modified, _added, _removed|
+        if modified
+          puts "#{modified.map(&:to_s).join(', ')} modified, recalculating..."
+          @callback.call
+        end
+      end
+      listener.start
+      sleep
+    end
+  end
+end