attractor 2.0.2 → 2.2.0

data/lib/attractor/reporters/html_reporter.rb~

@@ -0,0 +1,48 @@
+module Attractor
+  # HTML reporter
+  class HtmlReporter < BaseReporter
+    def report
+      super
+
+      puts 'Generating an HTML report'
+      @serve_static = true
+
+      FileUtils.mkdir_p './attractor_output'
+      FileUtils.mkdir_p './attractor_output/stylesheets'
+      FileUtils.mkdir_p './attractor_output/images'
+      FileUtils.mkdir_p './attractor_output/javascripts'
+
+      File.open('./attractor_output/images/attractor_logo.svg', 'w') { |file| file.write(logo) }
+      File.open('./attractor_output/stylesheets/main.css', 'w') { |file| file.write(css) }
+      File.open('./attractor_output/javascripts/index.js', 'w') { |file| file.write(javascript) }
+      File.open('./attractor_output/javascripts/index.pack.js', 'w') { |file| file.write(javascript_pack) }
+      
+      File.open('./attractor_output/index.html', 'w') { |file| file.write(render) }
+      puts "Generated HTML report at #{File.expand_path './attractor_output/index.html'}"
+
+      Launchy.open(File.expand_path('./attractor_output/index.html'))
+    end
+
+    def logo
+      File.read(File.expand_path('../../../app/assets/images/attractor_logo.svg', __dir__))
+    end
+
+    def css
+      File.read(File.expand_path('../../../app/assets/stylesheets/main.css', __dir__))
+    end
+
+    def javascript_pack
+      File.read(File.expand_path('../../../app/assets/javascripts/index.pack.js', __dir__))
+    end
+
+    def javascript
+      template = Tilt.new(File.expand_path('../../../app/assets/javascripts/index.js.erb', __dir__))
+      template.render self
+    end
+
+    def render
+      template = Tilt.new(File.expand_path('../../../app/views/index.html.erb', __dir__))
+      template.render self
+    end
+  end
+end

data/lib/attractor/reporters/sinatra_reporter.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'rack/livereload'
-require 'rack'
-require 'sinatra/base'
+require "rack/livereload"
+require "rack"
+require "sinatra/base"
 
 module Attractor
   # skeleton sinatra app
@@ -13,30 +13,31 @@ module Attractor
     end
 
     enable :static
-    set :public_folder, File.expand_path('../../../app/assets', __dir__)
+    set :public_folder, File.expand_path("../../../app/assets", __dir__)
     set :show_exceptions, :after_handler
 
-    get '/' do
+    get "/" do
       @types = @reporter.types
-      erb File.read(File.expand_path('../../../app/views/index.html.erb', __dir__))
+      erb File.read(File.expand_path("../../../app/views/index.html.erb", __dir__))
     end
 
-    get '/file_prefix' do
-      { file_prefix: @reporter.file_prefix }.to_json
+    get "/file_prefix" do
+      {file_prefix: @reporter.file_prefix}.to_json
     end
 
-    get '/values' do
-      type = params[:type] || 'rb'
+    get "/values" do
+      type = params[:type] || "rb"
       @reporter.values(type: type).to_json
     end
 
-    get '/suggestions' do
+    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
-      { error: env['sinatra.error'].message }.to_json
+      {error: env["sinatra.error"].message}.to_json
     end
   end
 
@@ -47,10 +48,10 @@ module Attractor
 
       app = AttractorApp.new(self)
 
-      puts 'Serving attractor at http://localhost:7890'
+      puts "Serving attractor at http://localhost:7890"
 
       if @open_browser
-        Launchy.open('http://localhost:7890') if @open_browser
+        Launchy.open("http://localhost:7890") if @open_browser
         puts "Opening browser window..."
       end
 
@@ -62,20 +63,13 @@ module Attractor
 
       app = AttractorApp.new(self)
 
-      puts 'Serving attractor at http://localhost:7890'
+      puts "Serving attractor at http://localhost:7890"
       if @open_browser
-        Launchy.open('http://localhost:7890')
+        Launchy.open("http://localhost:7890")
         puts "Opening browser window..."
       end
 
       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
@@ -13,7 +15,7 @@ module Attractor
       quantile = products.percentile(threshold.to_i)
 
       @values.select { |val| val.churn * val.complexity > quantile }
-             .sort_by { |val| val.churn * val.complexity }.reverse
+        .sort_by { |val| val.churn * val.complexity }.reverse
     end
   end
 end

data/lib/attractor/tmp/churn/9f86bc9b7ec6bf59cbf7a111ce8b1159ae128347.json

@@ -0,0 +1 @@
+{"churn":{"changes":[{"file_path":"app/assets/javascripts/index.pack.js","times_changed":21},{"file_path":"src/javascript/functions.js","times_changed":16},{"file_path":"src/javascript/index.js","times_changed":4}],"class_churn":[],"method_churn":[],"changed_files":[".gitignore","Rakefile","attractor.gemspec","lib/attractor.rb","lib/attractor/calculators/js_calculator.rb","lib/attractor/cli.rb","src/javascript/calculator/index.js","src/javascript/calculator/package-lock.json","src/javascript/calculator/package.json","src/javascript/calculator/webpack.config.js"],"changed_classes":[],"changed_methods":[]}}

data/lib/attractor/value.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'json'
+require "json"
 
 module Attractor
   # holds a churn/complexity value
   class Value
     attr_reader :file_path, :churn, :complexity, :details, :history
 
-    def initialize(file_path: '', churn: 1, complexity: 0, details: [], history: [])
+    def initialize(file_path: "", churn: 1, complexity: 0, details: [], history: [])
       @file_path = file_path
       @churn = churn
       @complexity = complexity
@@ -15,12 +15,16 @@ module Attractor
       @history = history
     end
 
+    def current_commit
+      history&.first&.first
+    end
+
     def to_s
-      format('%-64s%8.1f%8i', @file_path, @complexity, @churn)
+      format("%-64s%8.1f%8i", @file_path, @complexity, @churn)
     end
 
     def to_h
-      { file_path: file_path, x: churn, y: complexity, details: details, history: history }
+      {file_path: file_path, x: churn, y: complexity, details: details, history: history}
     end
 
     def to_json(_opt)

data/lib/attractor/value.rb~

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require "json"
+
+module Attractor
+  # holds a churn/complexity value
+  class Value
+    attr_reader :file_path, :churn, :complexity, :details, :history
+
+    def initialize(file_path: "", churn: 1, complexity: 0, details: [], history: [])
+      @file_path = file_path
+      @churn = churn
+      @complexity = complexity
+      @details = details
+      @history = history
+    end
+
+    def to_s
+      format("%-64s%8.1f%8i", @file_path, @complexity, @churn)
+    end
+
+    def to_h
+      {file_path: file_path, x: churn, y: complexity, details: details, history: history}
+    end
+
+    def to_json(_opt)
+      to_h.to_json
+    end
+  end
+end

data/lib/attractor/version.rb

@@ -1,3 +1,3 @@
 module Attractor
-  VERSION = "2.0.2"
+  VERSION = "2.2.0"
 end

data/lib/attractor/watcher.rb

@@ -1,19 +1,23 @@
 # frozen_string_literal: true
 
+require "listen"
+
 module Attractor
   # functionality for watching file system changes
   class Watcher
-    def initialize(file_prefix, callback)
+    def initialize(file_prefix, ignores, callback)
       @file_prefix = file_prefix
       @callback = callback
+      @ignores = ignores.split(",").map(&:strip)
     end
 
     def watch
       @callback.call
+      ignore = @ignores + [/^attractor_output/]
 
-      listener = Listen.to(@file_prefix, ignore: /^attractor_output/) do |modified, _added, _removed|
+      listener = Listen.to(File.absolute_path(@file_prefix), ignore: ignore) do |modified, _added, _removed|
         if modified
-          puts "#{modified.map(&:to_s).join(', ')} modified, recalculating..."
+          puts "#{modified.map(&:to_s).join(", ")} modified, recalculating..."
           @callback.call
         end
       end

data/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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: attractor
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.2.0
 platform: ruby
 authors:
 - Julian Rubisch
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-05-05 00:00:00.000000000 Z
+date: 2021-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: churn
@@ -154,30 +154,30 @@ dependencies:
   name: attractor-javascript
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: attractor-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: autoprefixer-rails
   requirement: !ruby/object:Gem::Requirement
@@ -358,13 +358,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".babelrc"
-- ".eslintrc.json"
-- ".gitignore"
-- ".rubocop.yml"
-- CHANGELOG.md
-- Gemfile
-- Guardfile
 - LICENSE
 - README.md
 - Rakefile
@@ -376,32 +369,37 @@ files:
 - app/assets/javascripts/index.pack.js
 - app/assets/stylesheets/main.css
 - app/views/index.html.erb
-- attractor.gemspec
-- bin/console
-- bin/setup
-- bin/standardize
-- bin/test
-- dist/calculator.bundle.js
 - exe/attractor
 - lib/attractor.rb
+- lib/attractor.rb~
+- lib/attractor/#duration_parser.rb#
+- lib/attractor/cache.rb
+- lib/attractor/cache.rb~
 - lib/attractor/calculators/base_calculator.rb
+- lib/attractor/calculators/base_calculator.rb~
 - lib/attractor/cli.rb
 - lib/attractor/detectors/base_detector.rb
+- lib/attractor/detectors/base_detector.rb~
 - lib/attractor/duration_parser.rb
+- lib/attractor/duration_parser.rb~
 - lib/attractor/gem_names.rb
+- lib/attractor/gem_names.rb~
 - lib/attractor/registry_entry.rb
-- lib/attractor/reporters/.keep
+- lib/attractor/registry_entry.rb~
 - lib/attractor/reporters/base_reporter.rb
+- lib/attractor/reporters/base_reporter.rb~
 - lib/attractor/reporters/console_reporter.rb
+- lib/attractor/reporters/console_reporter.rb~
 - lib/attractor/reporters/html_reporter.rb
+- lib/attractor/reporters/html_reporter.rb~
 - lib/attractor/reporters/sinatra_reporter.rb
 - lib/attractor/suggester.rb
+- lib/attractor/tmp/churn/9f86bc9b7ec6bf59cbf7a111ce8b1159ae128347.json
 - lib/attractor/value.rb
+- lib/attractor/value.rb~
 - lib/attractor/version.rb
 - lib/attractor/watcher.rb
-- package-lock.json
-- package.json
-- webpack.config.js
+- lib/attractor/watcher.rb~
 homepage: https://github.com/julianrubisch/attractor
 licenses:
 - MIT
@@ -410,7 +408,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
@@ -425,8 +423,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Churn vs Complexity Chart Generator
 test_files: []

data/.babelrc

@@ -1,4 +0,0 @@
-{
-  "presets": ["@babel/preset-env", "@babel/preset-react"],
-  "plugins": ["@babel/plugin-transform-runtime"]
-}

data/.eslintrc.json

@@ -1,25 +0,0 @@
-{
-  "rules": {},
-  "env": {
-    "es6": true,
-    "browser": true
-  },
-  "parserOptions": {
-    "ecmaVersion": 2018,
-    "sourceType": "module",
-    "ecmaFeatures": {
-      "jsx": true
-    }
-  },
-  "extends": [
-    "eslint:recommended",
-    "plugin:prettier/recommended"
-  ],
-  "globals": {
-    "Atomics": "readonly",
-    "SharedArrayBuffer": "readonly"
-  },
-  "plugins": [
-    "react"
-  ]
-}