tdx 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95245c7a074cd4558a7a747c309708e6f27a214a
-  data.tar.gz: 20f7390a431a3fb77823a0777197124abf559671
+  metadata.gz: 2766078e04e0d81fd9017e362c86f3a8a9f5fef6
+  data.tar.gz: 0752b9c0baa666bfaad9dda3023695196ee11886
 SHA512:
-  metadata.gz: c792a91dabb0e941dc8c26c48fec04d344d9cbe5be3062430227836f5fc0c77f9421adc72ba84b4f62478d7d5852602a195269cf4e25d314d929d3209b2c8b65
-  data.tar.gz: 732b553ff646c0a292eac7928a63bd03cf93ab63fbde25d46609464d5fc25e78e2f8d9fd4ed229f12fee86d20a540770c952d53dee050a59d75e74f885e26439
+  metadata.gz: 82426a60cdfaed678185ad17f07e5e5fc76fc8c5d0cfeab1127dd8e30758aec78acabb76a5afa75889fe1dee032008fe571d4981d42446d2fb8349bd1b55ad07
+  data.tar.gz: e5c1f836bbb0153debf140fee05ff6929eb6728c0b23e14dbc9391a8482f940ef467764413e432dc23ff6b4d0be164a5acf45079e6acca0d488dcec9acca7fd6

data/.rubocop.yml

@@ -2,11 +2,11 @@ AllCops:
   DisplayCopNames: true
 
 Metrics/MethodLength:
-  Max: 50
+  Max: 150
 Metrics/ClassLength:
   Max: 150
 Metrics/AbcSize:
-  Max: 50
+  Max: 100
 Style/MultilineMethodCallIndentation:
   Enabled: false
 Style/IndentationWidth:

data/bin/tdx

@@ -34,7 +34,7 @@ opts = Slop.parse(args, strict: true, help: true) do |o|
   o.bool '-v', '--version', 'Show current version'
   o.array(
     '--tests',
-    'Comma-separated list of relative paths with test-related files',
+    'Comma-separated list of glob masks with test-related files',
     delimiter: ','
   )
   o.string '--login', 'GitHub login'

data/lib/tdx/base.rb

@@ -41,22 +41,52 @@ module TDX
     end
 
     def svg
-      dat = Tempfile.new('tdx')
       version = Exec.new('git --version').stdout.split(/ /)[2]
       raise "git version #{version} is too old, upgrade it to 2.0+" unless
         Gem::Version.new(version) >= Gem::Version.new('2.0')
       path = checkout
-
       commits = Exec.new('git log "--pretty=format:%H %cI" --reverse', path)
         .stdout.split(/\n/).map { |c| c.split(' ') }
       issues = issues(commits)
       puts "Date\t\t\tTest\tHoC\tFiles\tLoC\tIssues\tSHA"
-      commits.each do |sha, date|
+      metrics = commits.map do |sha, date|
         Exec.new("git checkout --quiet #{sha}", path).stdout
-        line = "#{date[0, 16]}\t#{tests(path)}\t#{hoc(path)}\t#{files(path)}\t\
-#{loc(path)}\t#{issues[sha]}\t#{sha[0, 7]}"
-        dat << "#{line}\n"
-        puts line
+        {
+          date: date,
+          pure: pure(path),
+          hoc: hoc(path),
+          files: files(path),
+          loc: loc(path),
+          issues: issues[sha],
+          sha: sha
+        }
+      end
+      metrics.each do |m|
+        puts "#{m[:date][0, 16]}\t#{m[:pure]}\t#{m[:hoc]}\t#{m[:files]}\t\
+#{m[:loc]}\t#{m[:issues]}\t#{m[:sha][0, 7]}"
+      end
+      max = { pure: 0, hoc: 0, files: 0, loc: 0, issues: 0 }
+      max = metrics.inject(max) do |m, t|
+        {
+          pure: [m[:pure], t[:pure], 1].max,
+          hoc: [m[:hoc], t[:hoc], 1].max,
+          files: [m[:files], t[:files], 1].max,
+          loc: [m[:loc], t[:loc], 1].max,
+          issues: [m[:issues], t[:issues], 1].max
+        }
+      end
+      dat = Tempfile.new('tdx')
+      metrics.each do |m|
+        dat << [
+          m[:date],
+          100.0 * m[:pure] / max[:pure],
+          100.0 * (m[:pure] - m[:hoc]) / (max[:pure] - max[:hoc]),
+          100.0 * m[:hoc] / max[:hoc],
+          100.0 * m[:files] / max[:files],
+          100.0 * m[:loc] / max[:loc],
+          100.0 * m[:issues] / max[:issues],
+          m[:sha]
+        ].join(' ') + "\n"
       end
       dat.close
       svg = Tempfile.new('tdx')
@@ -66,19 +96,17 @@ module TDX
         'set termoption font "monospace,10"',
         'set xdata time',
         'set timefmt "%Y-%m"',
-        'set ytics format "%.0f%%" textcolor rgb "#81b341"',
+        'set ytics format "%.0f%%" textcolor rgb "black"',
         'set grid linecolor rgb "gray"',
         'set xtics format "%b/%y" font "monospace,8" textcolor rgb "black"',
         'set autoscale',
         'set style fill solid',
         'set boxwidth 0.75 relative',
         [
-          "plot \"#{dat.path}\" using 1:2 with boxes",
+          "plot \"#{dat.path}\" using 1:3 with lines",
           'title "Test HoC" linecolor rgb "#81b341"',
-          ', "" using 1:3 with boxes title "HoC" linecolor rgb "red"',
-          ', "" using 1:4 with boxes title "Files" linecolor rgb "black"',
-          ', "" using 1:5 with boxes title "LoC" linecolor rgb "cyan"',
-          ', "" using 1:6 with boxes title "Issues" linecolor rgb "orange"'
+          ', "" using 1:4 with lines title "HoC" linecolor rgb "red"',
+          ', "" using 1:7 with lines title "Issues" linecolor rgb "orange"'
         ].join(' ')
       ]
       Exec.new("gnuplot -e '#{gpi.join('; ')}'").stdout
@@ -107,15 +135,23 @@ module TDX
 
     def loc(path)
       Nokogiri::XML.parse(Exec.new('cloc . --xml --quiet', path).stdout)
-        .xpath('/results/languages/total/@code')
+        .xpath('/results/languages/total/@code')[0].to_s.to_i
     end
 
-    def hoc(path)
-      Exec.new('hoc', path).stdout.strip
+    def pure(path)
+      exclude = if @opts[:tests]
+        @opts[:tests].map { |e| "--exclude=#{e}" }
+      else
+        []
+      end
+      Exec.new(
+        'hoc ' + exclude.join(' '),
+        path
+      ).stdout.strip.to_i
     end
 
-    def tests(path)
-      Exec.new('hoc', path).stdout.strip
+    def hoc(path)
+      Exec.new('hoc', path).stdout.strip.to_i
     end
 
     def issues(commits)

data/lib/tdx/exec.rb

@@ -40,7 +40,7 @@ module TDX
 
     def stdout
       out = `cd #{@dir} && #{@cmd} 2>/dev/null`
-      raise 'Previous command failed' unless $CHILD_STATUS.exitstatus == 0
+      raise "This one failed: #{@cmd}" unless $CHILD_STATUS.exitstatus == 0
       out
     end
   end

data/lib/tdx/version.rb

@@ -25,5 +25,5 @@
 # Copyright:: Copyright (c) 2017 Yegor Bugayenko
 # License:: MIT
 module TDX
-  VERSION = '0.2.3'.freeze
+  VERSION = '0.2.4'.freeze
 end

data/test/test__helper.rb

@@ -23,3 +23,5 @@
 require 'simplecov'
 require 'tdx'
 require 'minitest/autorun'
+
+STDOUT.sync = true

data/test/test_tdx.rb

@@ -33,11 +33,6 @@ class TestPDD < Minitest::Test
   def test_git_repo
     skip if Gem.win_platform?
     Dir.mktmpdir 'test' do |dir|
-      opts = opts(
-        [
-          '--tests', 'tests'
-        ]
-      )
       raise unless system("
         set -e
         cd '#{dir}'
@@ -52,17 +47,20 @@ class TestPDD < Minitest::Test
       ")
       assert(
         TDX::Base.new(
-          "file:///#{File.join(dir, 'repo')}", opts
+          "file:///#{File.join(dir, 'repo')}",
+          opts(['--tests', 'tests/**/*'])
         ).svg.include?('<path ')
       )
     end
   end
 
   def test_real_github_repo
-    assert(
+    File.write(
+      '/tmp/a.svg',
       TDX::Base.new(
-        'https://github.com/yegor256/tdx.git', opts([])
-      ).svg.include?('<path ')
+        'https://github.com/yegor256/jare.git',
+        opts(['--tests', 'src/test/**/*'])
+      ).svg
     )
   end
 
@@ -70,7 +68,7 @@ class TestPDD < Minitest::Test
 
   def opts(args)
     Slop.parse args do |o|
-      o.string '-t', '--tests', argument: :required
+      o.array '-t', '--tests', argument: :required
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tdx
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Yegor Bugayenko