attractor 1.2.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 118ead51f4c2d1b543e923e93a0080d56e80cc814bfa0745b9d9400baef01c12
-  data.tar.gz: 4ed35b0269e8a5b1f5d81485283102a8bfd5e07effd82f7ad9684747fc14d409
+  metadata.gz: 699413053fc8137c150694aa57bc7f4b4ed4c51c2f65d7e3af4549d15d33d274
+  data.tar.gz: f630cd630d43770d34fd1afbffbb717deef4c76942f38917bdf811d8082f33f2
 SHA512:
-  metadata.gz: 6f51eb3d48a28ee8d0db31fff0d1228ea0945db99445cf55da0cb8f5b9cbe791554441480160d847c5e9508bda85875dcac7d8c83f703c7ddaf7953919275df3
-  data.tar.gz: 882c38655cd2b65c6d4732d2d7907a69887eff1c6ff1c6804df8336861e72becf1518d161602a1dfe6b6bd108f4c95b88b582bed615ba8f989f3b780789d1452
+  metadata.gz: 0d52ffc4e2b05bcc970cc6f9555baeebbee6dc9dde9de83cb0ce15a0a9e8359a5f7d204d3afe5001110d9936c988f0349703fca5d666577be38c3473e3e6cef2
+  data.tar.gz: '088f7c37f1e2769f15c439a295b3e2bb12ee6c1c1b6c2e2ee34dd8920d3a65e9a994509a23adb50c12da5fbb07ec07f94afd5b2d34dc2e6b7709ba65ee746e5b'

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## RELEASE 2.0.0
+
+* BREAKING: Move to a plug-in architecture, see README
+
 ## RELEASE 1.2.0
 
 * FEATURE: Backport React to static output

data/Rakefile

@@ -29,7 +29,4 @@ task :assets do
 
   npm_output = `npm run build`
   puts npm_output
-
-  npm_output = `cd src/javascript/calculator && npm run build`
-  puts npm_output
 end

data/attractor.gemspec

@@ -48,6 +48,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'tilt'
 
   spec.add_development_dependency 'aruba'
+  spec.add_development_dependency 'attractor-javascript'
+  spec.add_development_dependency 'attractor-ruby'
   spec.add_development_dependency 'autoprefixer-rails'
   spec.add_development_dependency 'bootstrap', '~> 4.3.1'
   spec.add_development_dependency 'bundler', '~> 2.0'

data/lib/attractor.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'attractor/version'
+require 'attractor/gem_names'
 require 'attractor/duration_parser'
 require 'attractor/calculators/base_calculator'
 require 'attractor/detectors/base_detector'
@@ -8,18 +9,6 @@ require 'attractor/reporters/base_reporter'
 require 'attractor/suggester'
 require 'attractor/watcher'
 
-Dir[File.join(__dir__, 'attractor', 'calculators', '*.rb')].each do |file|
-  next if file.start_with?('base')
-
-  require file
-end
-
-Dir[File.join(__dir__, 'attractor', 'detectors', '*.rb')].each do |file|
-  next if file.start_with?('base')
-
-  require file
-end
-
 Dir[File.join(__dir__, 'attractor', 'reporters', '*.rb')].each do |file|
   next if file.start_with?('base')
 
@@ -29,19 +18,27 @@ end
 module Attractor
   class Error < StandardError; end
 
+  @registry_entries = {}
+
+  def register(registry_entry)
+    @registry_entries[registry_entry.type] = registry_entry
+  end
+
   def calculators_for_type(type, **options)
-    case type
-    when 'js'
-      { 'js' => JsCalculator.new(**options) }
-    when 'rb'
-      { 'rb' => RubyCalculator.new(**options) }
-    else
-      {}.tap do |hash|
-        hash['rb'] = RubyCalculator.new(**options) if RubyDetector.new.detect
-        hash['js'] = JsCalculator.new(**options) if JsDetector.new.detect
-      end
-    end
+    registry_entry_for_type = @registry_entries[type]
+
+    return { type => registry_entry_for_type.calculator_class.new(**options) } if type
+
+    
+    Hash[@registry_entries.map do |type, entry|
+      [type, entry.calculator_class.new(**options)] if entry.detector_class.new.detect
+    end]
   end
 
   module_function :calculators_for_type
+  module_function :register
+end
+
+Attractor::GemNames.new.to_a.each do |gem_name|
+  require "attractor/#{gem_name}"
 end

data/lib/attractor/gem_names.rb

@@ -0,0 +1,16 @@
+module Attractor
+  # from https://github.com/prontolabs/pronto/blob/master/lib/pronto/gem_names.rb
+  class GemNames
+    def to_a
+      gems.map { |gem| gem.name.sub(/^attractor-/, '') }.uniq.sort
+    end
+
+    private
+
+    def gems
+      Gem::Specification.find_all.select do |gem|
+        gem.name =~ /^attractor-/
+      end
+    end
+  end
+end

data/lib/attractor/registry_entry.rb

@@ -0,0 +1,12 @@
+module Attractor
+  class RegistryEntry
+    attr_reader :type, :detector_class, :calculator_class
+
+    def initialize(type:, detector_class:, calculator_class:)
+      @type = type
+      @detector_class = detector_class
+      @calculator_class = calculator_class
+    end
+  end
+end
+

data/lib/attractor/version.rb

@@ -1,3 +1,3 @@
 module Attractor
-  VERSION = "1.2.0"
+  VERSION = "2.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: attractor
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Julian Rubisch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-15 00:00:00.000000000 Z
+date: 2020-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: churn
@@ -150,6 +150,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: attractor-javascript
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: attractor-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: autoprefixer-rails
   requirement: !ruby/object:Gem::Requirement
@@ -355,13 +383,11 @@ files:
 - exe/attractor
 - lib/attractor.rb
 - lib/attractor/calculators/base_calculator.rb
-- lib/attractor/calculators/js_calculator.rb
-- lib/attractor/calculators/ruby_calculator.rb
 - lib/attractor/cli.rb
 - lib/attractor/detectors/base_detector.rb
-- lib/attractor/detectors/js_detector.rb
-- lib/attractor/detectors/ruby_detector.rb
 - lib/attractor/duration_parser.rb
+- lib/attractor/gem_names.rb
+- lib/attractor/registry_entry.rb
 - lib/attractor/reporters/.keep
 - lib/attractor/reporters/base_reporter.rb
 - lib/attractor/reporters/console_reporter.rb

data/lib/attractor/calculators/js_calculator.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-module Attractor
-  class JsCalculator < BaseCalculator
-    def initialize(file_prefix: '', minimum_churn_count: 3, start_ago: 365 * 5)
-      super(file_prefix: file_prefix, file_extension: '(js|jsx)', minimum_churn_count: minimum_churn_count, start_ago: start_ago)
-      @type = "JavaScript"
-    end
-
-    def calculate
-      super do |change|
-        complexity, details = JSON.parse(`node #{__dir__}/../../../dist/calculator.bundle.js #{Dir.pwd}/#{change[:file_path]}`)
-
-        [complexity, details]
-      end
-    end
-  end
-end

data/lib/attractor/calculators/ruby_calculator.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-require 'flog'
-
-module Attractor
-  class RubyCalculator < BaseCalculator
-    def initialize(file_prefix: '', minimum_churn_count: 3, start_ago: 365 * 5)
-      super(file_prefix: file_prefix, file_extension: 'rb', minimum_churn_count: minimum_churn_count, start_ago: start_ago)
-      @type = "Ruby"
-    end
-
-    def calculate
-      super do |change|
-        flogger = Flog.new(all: true)
-        flogger.flog(change[:file_path])
-        complexity = flogger.total_score
-        details = flogger.totals
-        [complexity, details]
-      end
-    end
-  end
-end

data/lib/attractor/detectors/js_detector.rb

@@ -1,11 +0,0 @@
-module Attractor
-  class JsDetector < BaseDetector
-    def detect
-      package_json_exists?
-    end
-    
-    def package_json_exists?
-      File.exist? File.expand_path("package.json", Dir.pwd)
-    end
-  end 
-end

data/lib/attractor/detectors/ruby_detector.rb

@@ -1,11 +0,0 @@
-module Attractor
-  class RubyDetector < BaseDetector
-    def detect
-      gemfile_exists?
-    end
-    
-    def gemfile_exists?
-      File.exist? File.expand_path("Gemfile", Dir.pwd)
-    end
-  end 
-end