zubat 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f4eb5790313a7a672cad41fcf05c8c5515659f265a60952efbf3bb28fad7fb1
-  data.tar.gz: 0b94a1a09d207f79c9a32414655c4ec9706f47323659fc64d7f433f60ded012b
+  metadata.gz: baa42361d5aa2f8268e3d5be1e21cc2e0ae7e6b1ce839b43fe9b410f8678e92c
+  data.tar.gz: da15e758d143aa4ae0521d2281577e33cbd08dccd209de20e116068846bc715c
 SHA512:
-  metadata.gz: 52c4ba88c4e15d3e947c0022b15f3da7477f7e8d5d7fbda9a0b43d7e8e61e13da446c59b7b6e54f425e32c31bf008bdbe1e3f19021f25c3c9ce728630e4eb586
-  data.tar.gz: 34b2ad121d67f463e93f1cb19153dba16764e33b59e73aef0a7e7704610b695d6a5320fd8a19bb4108787973aa19cc4ad1a3a2b56aa6e4e76835df034de8138c
+  metadata.gz: 824f35f0dbaa6fa6ddb9cb37bf47f2f8d3221c393beae470465a979fa6773a807c07a305dfd737e81c53935c7f6cb6f7daba525c1204243803d8d36096656625
+  data.tar.gz: abd8a26623ed6a4d60bec503551463de0c9cbb7e551b57e6c69702d37280f616fd2158cecfe78906252de3db40ccc6b0f2d8aeeb28154a25e67ea78e061c7033

data/exe/zubat

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require 'zubat/cli'
+require 'zubat/cli/app'
 
-Zubat::CLI.new.start(ARGV)
+Zubat::CLI::App.new.start(ARGV)

data/lib/zubat/analizer.rb

@@ -2,7 +2,7 @@
 
 module Zubat
   class Analizer
-    AnalizedResult = Data.define(:label, :stat)
+    AnalizedResult = Data.define(:label, :commit, :stat)
 
     # @param stat [Hash<String, Hash<String, Integer>>]
     Stat = Data.define(:stat) do
@@ -24,6 +24,10 @@ module Zubat
         stat.fetch(file).fetch(:smells).fetch(label, 0)
       end
 
+      def diff(file)
+        stat.fetch(file, {}).fetch(:diff, nil)
+      end
+
       def each(*, **, &block)
         stat.each(*, **, &block)
       end
@@ -33,24 +37,31 @@ module Zubat
       stat = {}
 
       files.each do |file|
-        next unless commit.exists?(file:)
+        diff = commit.diff(file:)
+
+        next if diff.empty?
+
+        stat[file] = {}
+
+        stat[file].merge!(diff:)
 
         code = commit.show(file:)
 
         next unless RubyCode.new(code:).valid?
 
-        stat[file] = FlogWrapper.new.examine(code).then do |examined|
-          { average: examined.average, total_score: examined.total_score }
+        FlogWrapper.new.examine(code).then do |examined|
+          stat[file][:average] = examined.average
+          stat[file][:total_score] = examined.average
         end
 
         stat[file][:smells] = ReekWrapper.new.examine(code).map(&:smell_type).tally
       end
 
-      # return if smells.empty? && stat.empty?
-
       stat = Stat.new(stat:)
 
-      AnalizedResult.new(label: "#{commit.time.iso8601} (#{commit.sha})", stat:)
+      AnalizedResult.new(label: "#{commit.time.iso8601} (#{commit.sha})",
+                         commit:,
+                         stat:)
     end
   end
 end

data/lib/zubat/cli/app.rb

@@ -0,0 +1,101 @@
+# frozen_string_literal: true
+
+require 'zubat'
+require 'optparse'
+
+module Zubat
+  module CLI
+    class App
+      Argv = Data.define(:files, :silent, :root) do
+        def self.parse!(argv)
+          opt = OptionParser.new
+
+          root = nil
+          silent = false
+
+          opt.on('--silent', '-s') { silent = true }
+          opt.on('--root=ROOT') { |v| root = v }
+
+          files = opt.parse!(argv).uniq
+
+          abort 'no files to process, aborting.' if argv.empty?
+
+          new(files:, silent:, root:)
+        end
+      end
+
+      class GitRepo
+        URL_FORMATS = [
+          %r[https://(.+)/(.+)/(.+).git],
+          %r[git@(.+):(.+)/(.+).git],
+          %r[ssh://(.+)/(.+)/(.+)],
+        ]
+
+        def self.guess
+          url = GitCommandWrapper.new.remote_origin_url
+
+          matched = URL_FORMATS
+            .find { |format| format.match?(url) }
+            &.match(url)
+
+          return unless matched
+
+          new(hostname: matched[1], org: matched[2], repo: matched[3])
+        end
+
+        def initialize(hostname:, org:, repo:)
+          @hostname = hostname
+          @org = org
+          @repo = repo
+        end
+
+        def site_url
+          "https://#{@hostname}/#{@org}/#{@repo}"
+        end
+      end
+
+      class Progress
+        include Enumerable
+
+        def initialize(enum, silent:)
+          @enum = enum
+          @silent = silent
+        end
+
+        def each(&block)
+          @enum.each_with_index do |elem, i|
+            $stderr.print "\r#{%w[| / - \\][i % 4]} Analyzing... #{100 * i / @enum.size}%" unless @silent
+
+            block.call(elem)
+          end
+
+          warn "\r✨ Analized                      \n\n" unless @silent
+
+          @enum
+        end
+      end
+
+      def start(argv)
+        argv = Argv.parse!(argv)
+
+        files = argv.files
+
+        repo = nil
+
+        results = Dir.chdir(argv.root || Dir.pwd) do
+          repo = GitRepo.guess
+
+          commits = Zubat::Commit.find(files:)
+
+          Progress
+            .new(commits, silent: argv.silent)
+            .map { |commit| Zubat::Analizer.new.analize(files:, commit:) }
+        end
+
+        file = Generator.new.generate(results:, site_url: repo&.site_url)
+
+        puts "Generated - #{file}\n"
+      end
+    end
+  end
+end

data/lib/zubat/commit.rb

@@ -26,5 +26,9 @@ module Zubat
     def show(file:)
       GitCommandWrapper.new.show(sha: @sha, file:)
     end
+
+    def diff(file:)
+      GitCommandWrapper.new.diff(sha: @sha, file:)
+    end
   end
 end

data/lib/zubat/generator.rb

@@ -4,8 +4,10 @@ module Zubat
   class Generator
     FILE = 'tmp/zubat/index.html'
 
-    def generate(results:)
-      erb = Zubat.root.join('templates/chart.html.erb').read
+    TEMPLATE = 'templates/chart.html.erb'
+
+    def generate(results:, site_url:)
+      erb = Zubat.root.join(TEMPLATE).read
 
       ylabels = []
 
@@ -33,14 +35,16 @@ module Zubat
 
           dataset[:data] << {
             label: xlabel,
+            commit_sha: result.commit.sha,
+            commit_diff: result.stat.diff(ylabel),
             complexity_total: result.stat.complexity_total(ylabel),
             complexity_average: result.stat.complexity_average(ylabel),
-            smells_scores: result.stat.smell_scores(ylabel).map { |type, value| { type:, value: } }
+            smells_scores: result.stat.smell_scores(ylabel).map { |type, value| { type:, value: } },
           }
         end
       end
 
-      html = ERB.new(erb).result_with_hash(datasets:)
+      html = ERB.new(erb).result_with_hash(datasets:, site_url:)
 
       file = File.expand_path(FILE)
 

data/lib/zubat/git_command_wrapper.rb

@@ -7,6 +7,10 @@ require 'securerandom'
 module Zubat
   class GitCommandWrapper
     module Stub
+      def remote_origin_url
+        "https://github.com/mizoR/zubat.git"
+      end
+
       def log(files:)
         logs = files.map do
           Log.new(sha: SecureRandom.hex(3), time: Time.at(rand(1_900_000_000..1_900_999_999)))
@@ -32,6 +36,17 @@ module Zubat
           end
         SCRIPT
       end
+
+      def diff(sha:, file:) # rubocop:disable Lint/UnusedMethodArgument
+        <<~SCRIPT
+          diff --git a/hello_world.rb b/hello_world.rb
+            class HelloWorld
+              def show
+          +      puts "Hello World"
+              end
+            end
+        SCRIPT
+      end
     end
 
     Log = Data.define(:sha, :time)
@@ -42,6 +57,10 @@ module Zubat
       instance
     end
 
+    def remote_origin_url
+      `git config --get remote.origin.url`.chomp
+    end
+
     def log(files:)
       logs = `git log --oneline --pretty=format:'{ "sha": "%h", "time": "%ad" }' -- #{files.join(' ')}`.split("\n")
 
@@ -65,5 +84,9 @@ module Zubat
     def show(sha:, file:)
       `git show #{sha}:#{file}`
     end
+
+    def diff(sha:, file:)
+      `git show #{sha} -- #{file}`
+    end
   end
 end

data/lib/zubat/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Zubat
-  VERSION = '0.0.1'
+  VERSION = '0.0.3'
 end

data/templates/chart.html.erb

@@ -4,6 +4,10 @@
     <meta name="robots" content="noindex,nofollow">
     <meta charset="UTF-8">
 
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.9.0/styles/default.min.css" integrity="sha512-hasIneQUHlh06VNBe7f6ZcHmeRTLIaQWFd43YriJ0UND19bvYRauxthDg8E4eVNPm9bRUhr5JGeqH7FRFXQu5g==" crossorigin="anonymous" referrerpolicy="no-referrer" />
+
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.9.0/highlight.min.js" integrity="sha512-D9gUyxqja7hBtkWpPWGt9wfbfaMGVt9gnyCvYa+jojwwPHLCzUm5i8rpk7vD7wNee9bA35eYIjobYPaQuKS1MQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/purecss@3.0.0/build/pure-min.css" integrity="sha384-X38yfunGUhNzHpBaEBsWLO+A0HDYOQi8ufWDkZ0k9e0eXz/tH3II7uKZ9msv++Ls" crossorigin="anonymous">
 
     <style>
@@ -253,6 +257,12 @@
         left: 200px;
       }
     }
+
+    #diffArea {
+      max-height: 400px;
+      overflow: auto;
+    }
+
     </style>
     <title>zubat</title>
   </head>
@@ -284,23 +294,17 @@
         </div>
 
         <div class="content">
+          <p><pre id="diffArea"></pre></p>
+
           <h2 id="complexity_total" class="content-subhead">Complexity Total</h2>
-          <p>
-          <canvas id="chart_of_code_complexity_total_trend" width="400" height="300"></canvas>
-          </p>
+          <p><canvas id="chart_of_code_complexity_total_trend" width="400" height="200"></canvas></p>
 
           <h2 id="complexity_average" class="content-subhead">Complexity Average <small>- Complexity score per methods</small></h2>
-          <p>
-          <canvas id="chart_of_code_complexity_average_trend" width="400" height="300"></canvas>
-          </p>
+          <p><canvas id="chart_of_code_complexity_average_trend" width="400" height="200"></canvas></p>
 
           <h2 id="code_smells" class="content-subhead">Code smells</h2>
-          <p>
-            <div id="select_of_code_smell_scores_trend"></div>
-          </p>
-          <p>
-          <canvas id="chart_of_code_smell_scores_trend" width="400" height="300"></canvas>
-          </p>
+          <p><div id="select_of_code_smell_scores_trend"></div></p>
+          <p><canvas id="chart_of_code_smell_scores_trend" width="400" height="200"></canvas></p>
         </div>
       </div>
     </div>
@@ -308,11 +312,34 @@
     <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
 
     <script>
+      var siteUrl =  <%= site_url.to_json %>;
+
       var datasets =  <%= datasets.to_json %>;
 
+      var onClickWith = function (chart) {
+        return function (e) {
+          const points = chart.getElementsAtEventForMode(e, 'nearest', { intersect: true }, true);
+
+          if (points.length === 0) return;
+
+          const point = points[0];
+          const label = chart.data.labels[point.index];
+          const value = chart.data.datasets[point.datasetIndex].data[point.index];
+
+          const code = document.createElement('code');
+          code.classList.add('language-diff');
+          code.textContent = value.commit_diff;
+          hljs.highlightBlock(code);
+
+          const diffArea = document.getElementById('diffArea');
+          diffArea.innerHTML = '';
+          diffArea.appendChild(code);
+        };
+      };
+
       var ctx0 = document.getElementById("chart_of_code_complexity_total_trend");
 
-      new Chart(ctx0, {
+      var chart0 = new Chart(ctx0, {
         type: 'line',
         data: {
           datasets: datasets
@@ -333,9 +360,11 @@
         }
       });
 
+      ctx0.addEventListener('click', onClickWith(chart0));
+
       var ctx1 = document.getElementById("chart_of_code_complexity_average_trend");
 
-      new Chart(ctx1, {
+      var chart1 = new Chart(ctx1, {
         type: 'line',
         data: {
           datasets: datasets
@@ -356,6 +385,8 @@
         }
       });
 
+      ctx1.addEventListener('click', onClickWith(chart1));
+
       var ctx2 = document.getElementById("chart_of_code_smell_scores_trend");
 
       var select = document.createElement('select');
@@ -369,8 +400,6 @@
         select.add(option);
       });
 
-
-
       select.addEventListener('change', function () {
         var file = select.value;
 
@@ -379,7 +408,7 @@
 
       document.getElementById("select_of_code_smell_scores_trend").appendChild(select);
 
-      var chart3 = null;
+      var chart2 = null;
 
       var showCodeSmellChartFor = function (file) {
         var data = datasets.find(item => item.label === file).data;
@@ -400,9 +429,9 @@
           };
         });
 
-        if (chart3) chart3.destroy();
+        if (chart2) chart2.destroy();
 
-        chart3 = new Chart(ctx2, {
+        chart2 = new Chart(ctx2, {
           type: 'line',
           data: {
             datasets: smellsets
@@ -422,6 +451,8 @@
             }
           }
         });
+
+        ctx2.addEventListener('click', onClickWith(chart2));
       };
 
       showCodeSmellChartFor(datasets[0].label);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zubat
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - mizokami
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-11-08 00:00:00.000000000 Z
+date: 2023-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: flog
@@ -54,7 +54,7 @@ files:
 - exe/zubat
 - lib/zubat.rb
 - lib/zubat/analizer.rb
-- lib/zubat/cli.rb
+- lib/zubat/cli/app.rb
 - lib/zubat/commit.rb
 - lib/zubat/flog_wrapper.rb
 - lib/zubat/generator.rb

data/lib/zubat/cli.rb

@@ -1,73 +0,0 @@
-# frozen_string_literal: true
-
-require 'zubat'
-require 'optparse'
-
-module Zubat
-  class CLI
-    Argv = Data.define(:files, :silent, :root) do
-      def self.parse!(argv)
-        opt = OptionParser.new
-
-        root = nil
-        silent = false
-
-        opt.on('--silent', '-s') { silent = true }
-        opt.on('--root=ROOT') { |v| root = v }
-
-        files = opt.parse!(argv)
-
-        abort 'no files to process, aborting.' if files.empty? && argv.empty?
-
-        Dir.chdir(root || Dir.pwd) do
-          files = files.uniq
-        end
-
-        new(files:, silent:, root:)
-      end
-    end
-
-    class Progress
-      include Enumerable
-
-      def initialize(enum, silent:)
-        @enum = enum
-        @silent = silent
-      end
-
-      def each(&block)
-        @enum.each_with_index do |elem, i|
-          $stderr.print "\r#{%w[| / - \\][i % 4]} Analyzing... #{100 * i / @enum.size}%" unless @silent
-
-          block.call(elem)
-        end
-
-        warn "\r✨ Analized                      \n\n" unless @silent
-
-        @enum
-      end
-    end
-
-    def start(argv)
-      argv = Argv.parse!(argv)
-
-      generator = Generator.new
-
-      results = Dir.chdir(argv.root || Dir.pwd) do
-        files = argv.files
-
-        analizer = Zubat::Analizer.new
-
-        commits = Zubat::Commit.find(files:)
-
-        progress = Progress.new(commits, silent: argv.silent)
-
-        progress.map { |commit| analizer.analize(files:, commit:) }
-      end
-
-      file = generator.generate(results:)
-
-      puts "Generated - #{file}\n"
-    end
-  end
-end