attractor 1.2.0 → 2.0.4

data/lib/attractor/cli.rb

@@ -17,6 +17,14 @@ module Attractor
                         [:no_open_browser, type: :boolean],
                         [:ci, type: :boolean]]
 
+    desc "version", "Prints Attractor's version information"
+    map %w(-v --version) => :version
+    def version
+      puts "Attractor version #{Attractor::VERSION}"
+    rescue RuntimeError => e
+      puts "Runtime error: #{e.message}"
+    end
+
     desc 'calc', 'Calculates churn and complexity for all ruby files in current directory'
     shared_options.each do |shared_option|
       option(*shared_option)

data/lib/attractor/gem_names.rb

@@ -0,0 +1,18 @@
+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.reject do |gem|
+        gem.name =~ /attractor-rails/
+      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/reporters/base_reporter.rb

@@ -2,6 +2,7 @@
 
 require 'descriptive_statistics/safe'
 require 'fileutils'
+require 'forwardable'
 require 'launchy'
 require 'tilt'
 
@@ -27,7 +28,8 @@ module Attractor
       raise 'There was a problem gathering churn changes'
     end
 
-    def suggestions(quantile)
+    def suggestions(quantile:, type: 'rb')
+      @suggester.values = values(type: type)
       @suggestions = @suggester.suggest(quantile)
       @suggestions
     end
@@ -40,5 +42,12 @@ module Attractor
     def render
       'Attractor'
     end
+
+    def values(type: 'rb')
+      @values = @calculators[type].calculate
+      @values
+    rescue NoMethodError => e
+      puts "No calculator for type #{type}"
+    end
   end
 end

data/lib/attractor/reporters/html_reporter.rb

@@ -22,8 +22,7 @@ module Attractor
       if @calculators.size > 1
         @calculators.each do |calc|
           @short_type = calc.first
-          @values = calc.last.calculate
-          suggester = Suggester.new(values)
+          suggester = Suggester.new(values(type: @short_type))
           @suggestions = suggester.suggest
 
           File.open("./attractor_output/javascripts/index.#{@short_type}.js", 'w') { |file| file.write(javascript) }

data/lib/attractor/reporters/sinatra_reporter.rb

@@ -32,7 +32,8 @@ module Attractor
 
     get '/suggestions' do
       threshold = params[:t] || 95
-      @reporter.suggestions(threshold).to_json
+      type = params[:type] || 'rb'
+      @reporter.suggestions(quantile: threshold, type: type).to_json
     end
 
     error NoMethodError do
@@ -70,12 +71,5 @@ module Attractor
 
       Rack::Handler::WEBrick.run Rack::LiveReload.new(app), Port: 7890
     end
-
-    def values(type: 'rb')
-      @values = @calculators[type].calculate
-      @values
-    rescue NoMethodError => e
-      puts "No calculator for type #{type}"
-    end
   end
 end

data/lib/attractor/suggester.rb

@@ -3,6 +3,8 @@
 module Attractor
   # makes suggestions for refactorings
   class Suggester
+    attr_accessor :values
+    
     def initialize(values)
       @values = values || []
     end

data/lib/attractor/version.rb

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

data/package-lock.json

@@ -1186,9 +1186,9 @@
       "dev": true
     },
     "acorn": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.3.0.tgz",
-      "integrity": "sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz",
+      "integrity": "sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==",
       "dev": true
     },
     "acorn-jsx": {
@@ -2833,14 +2833,6 @@
         "acorn": "^7.0.0",
         "acorn-jsx": "^5.0.2",
         "eslint-visitor-keys": "^1.1.0"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.0.tgz",
-          "integrity": "sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ==",
-          "dev": true
-        }
       }
     },
     "esprima": {
@@ -6731,6 +6723,12 @@
         "webpack-sources": "^1.4.1"
       },
       "dependencies": {
+        "acorn": {
+          "version": "6.4.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz",
+          "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==",
+          "dev": true
+        },
         "serialize-javascript": {
           "version": "1.9.1",
           "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.9.1.tgz",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: attractor
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.0.4
 platform: ruby
 authors:
 - Julian Rubisch
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-01-15 00:00:00.000000000 Z
+date: 2020-06-25 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
@@ -351,17 +379,17 @@ files:
 - attractor.gemspec
 - bin/console
 - bin/setup
+- bin/standardize
+- bin/test
 - dist/calculator.bundle.js
 - 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
@@ -382,7 +410,7 @@ metadata:
   source_code_uri: https://github.com/julianrubisch/attractor
   bug_tracker_uri: https://github.com/julianrubisch/attractor/issues
   changelog_uri: https://github.com/julianrubisch/attractor/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -397,8 +425,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Churn vs Complexity Chart Generator
 test_files: []

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