tdx 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef5e18a4802efc6489e237ca91d8f658babe17ec
-  data.tar.gz: f55674b137c243f48cfdf53e5ec7d34cc2cd08ce
+  metadata.gz: 68d11ea43666fcba743422938f2601d134729df8
+  data.tar.gz: 9010264c48eaa44be853ba28429b6791d7fc3025
 SHA512:
-  metadata.gz: a96917b41359f944b2e382689fc1f4790390206a84f9e8b696f1d4ab308cb85008ebd9dceff178bb06c8371416d2f19d3c790420236f592d7f3c51e845d95a03
-  data.tar.gz: bda57e4def1b0070e3c846c934adfe5d23a34d6ff59e603241bd0ddbdf228593d0442a8435746a6740305f18cd17e7e10b32b201874aad52100657d9da26bd43
+  metadata.gz: 61a83ceae6741bb1dceecb7b25d9b8843360bc24ffd93e9d67e782df9c4667da6f1b995f74018861265de997a2c22b28f8080bf413a8c4311b6129971319ec9a
+  data.tar.gz: aa159cf35de15d1e93d4ef80d7f9fb2d422672463e33113a0b74dc9b43021000a622c0ae02e11dcf8ba584957a655bff7e768df5611771bf9d6d50936f40f1a5

data/.rubocop.yml

@@ -4,9 +4,12 @@ AllCops:
 Metrics/MethodLength:
   Max: 150
 Metrics/ClassLength:
-  Max: 150
+  Max: 300
 Metrics/AbcSize:
   Max: 200
+Metrics/PerceivedComplexity:
+  Max: 10
+
 Style/MultilineMethodCallIndentation:
   Enabled: false
 Style/IndentationWidth:

data/README.md

@@ -15,8 +15,7 @@ I will tell you later...
 ## How to Install?
 
 First, install
-[gnuplot](http://www.gnuplot.info/),
-[cloc](http://cloc.sourceforge.net/),
+[gnuplot](http://www.gnuplot.info/)
 and
 [hoc](https://github.com/yegor256/hoc).
 

data/bin/tdx

@@ -35,7 +35,7 @@ opts = Slop.parse(args, strict: true, help: true) do |o|
   o.array(
     '-t', '--tests',
     'Comma-separated list of glob masks with test-related files',
-    delimiter: ','
+    delimiter: ',', default: []
   )
   o.string '-d', '--data', 'Path of .dat file for Gnuplot'
   o.string '--sha', 'The SHA to start from'

data/lib/tdx/base.rb

@@ -38,6 +38,11 @@ module TDX
     def initialize(uri, opts)
       @uri = uri
       @opts = opts
+      @issues = nil
+      @pure = nil
+      @hoc = nil
+      @logopts = '--ignore-space-change --no-color --find-copies-harder \
+--ignore-all-space --ignore-submodules -M --diff-filter=ACDM'
     end
 
     def svg
@@ -46,51 +51,36 @@ module TDX
         Gem::Version.new(version) >= Gem::Version.new('2.0')
       path = checkout
       commits = Exec.new(
-        'git log "--pretty=format:%H %cI" ' +
+        "git log '--pretty=format:%H %cI' #{@logopts} " +
         (@opts[:sha] ? @opts[:sha] : 'HEAD'),
         path
       ).stdout.split(/\n/).map { |c| c.split(' ') }
-      issues = issues(commits)
-      puts "Date\t\t\tTest\tHoC\tFiles\tLoC\tIssues\tSHA\tIdx"
+      puts "Date\t\t\tCode\tTests\tIssues\tSHA\tIdx"
       metrics = commits.each_with_index.map do |c, i|
-        Exec.new("git checkout --quiet #{c[0]}", path).stdout
+        Exec.new("git checkout --quiet --force #{c[0]}", path).stdout
+        pure = pure(path, c[0])
         m = {
           date: c[1],
-          pure: pure(path),
-          hoc: hoc(path),
-          files: files(path),
-          loc: loc(path),
-          issues: issues[c[0]],
+          code: pure,
+          tests: hoc(path, c[0]) - pure,
+          issues: issues(commits)[c[0]],
           sha: c[0]
         }
-        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]}\t#{i}/#{commits.size}"
+        puts "#{m[:date][0, 16]}\t#{m[:code]}\t#{m[:tests]}\t\
+#{m[:issues]}\t#{m[:sha][0, 7]}\t#{i}/#{commits.size}"
         m
       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 = if @opts[:data]
         File.new(@opts[:data], 'w+')
       else
         Tempfile.new('tdx')
       end
-      metrics.each do |m|
+      metrics.select { |m| m[:code] > 0 }.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[:code],
+          m[:tests],
+          m[:issues],
           m[:sha]
         ].join(' ') + "\n"
       end
@@ -102,17 +92,18 @@ module TDX
         'set termoption font "monospace,10"',
         'set xdata time',
         'set timefmt "%Y-%m"',
-        'set ytics format "%.0f%%" textcolor rgb "black"',
+        'set ytics format "%.0f" textcolor rgb "black"',
+        'set y2tics format "%.0f" textcolor rgb "orange"',
         'set grid linecolor rgb "gray"',
         'set xtics format "%b/%y" font "monospace,8" textcolor rgb "black"',
-        'set autoscale',
+        'set autoscale y',
+        'set autoscale y2',
         'set style fill solid',
         'set boxwidth 0.75 relative',
         [
-          "plot \"#{dat.path}\" using 1:3 with lines",
-          'title "Test HoC" linecolor rgb "#81b341"',
-          ', "" using 1:4 with lines title "HoC" linecolor rgb "red"',
-          ', "" using 1:7 with lines title "Issues" linecolor rgb "orange"'
+          "plot \"#{dat.path}\" u 1:2 w l t \"code\" lc rgb \"#81b341\"",
+          ', "" u 1:3 w l t "tests" lc rgb "red"',
+          ', "" u 1:4 w l t "Issues" lc rgb "orange" axes x1y2'
         ].join(' ')
       ]
       Exec.new("gnuplot -e '#{gpi.join('; ')}'").stdout
@@ -128,39 +119,43 @@ module TDX
     def checkout
       dir = Dir.mktmpdir
       Exec.new("git clone --quiet #{@uri} .", dir).stdout
-      size = Dir.glob(File.join(dir, '**/*'))
-        .map(&:size)
-        .inject(0) { |a, e| a + e }
+      size = Dir.glob(File.join(dir, '**', '*')).map(&:size).inject(:+)
       puts "Cloned #{@uri} (#{size / 1024}Kb) into temporary directory"
       dir
     end
 
-    def files(path)
-      Dir.glob("#{path}/**/*").size
+    def pure(path, sha)
+      @pure = hashes(path, @opts[:tests]) if @pure.nil?
+      sum(@pure, sha)
     end
 
-    def loc(path)
-      Nokogiri::XML.parse(Exec.new('cloc . --xml --quiet', path).stdout)
-        .xpath('/results/languages/total/@code')[0].to_s.to_i
+    def hoc(path, sha)
+      @hoc = hashes(path, []) if @hoc.nil?
+      sum(@hoc, sha)
     end
 
-    def pure(path)
-      exclude = if @opts[:tests]
-        @opts[:tests].map { |e| "--exclude=#{e}" }
-      else
-        []
-      end
+    def hashes(path, excludes)
       Exec.new(
-        'hoc ' + exclude.join(' '),
+        "git log --pretty=tformat:%H --numstat #{@logopts} -- . " +
+excludes.map { |e| "':(exclude,glob)#{e}'" }.join(' '),
         path
-      ).stdout.strip.to_i
+      ).stdout.split(/(?=[0-9a-f]{40})/m).map do |t|
+        lines = t.split("\n")
+        [
+          lines[0],
+          lines.drop(2).map do |n|
+            n.split(/\s+/).take(2).map(&:to_i).inject(:+)
+          end.inject(:+) || 0
+        ]
+      end
     end
 
-    def hoc(path)
-      Exec.new('hoc', path).stdout.strip.to_i
+    def sum(hashes, sha)
+      hashes.drop_while { |c| c[0] != sha }.map { |c| c[1] }.inject(:+) || 0
     end
 
     def issues(commits)
+      return @issues unless @issues.nil?
       dates = if @uri.include?('github.com')
         client = if @opts[:login]
           Octokit::Client.new(login: @opts[:login], password: @opts[:password])
@@ -172,13 +167,23 @@ module TDX
         else
           @uri.gsub(%r{^https://github\.com/|\.git$}, '')
         end
-        list = client.list_issues(repo, state: :all).map(&:created_at)
+        list = []
+        p = 1
+        loop do
+          page = client.list_issues(
+            repo, state: 'all', page: p
+          ).map(&:created_at)
+          break if page.empty?
+          list.concat(page)
+          puts "+#{page.length}/#{list.size} issues from GitHub"
+          p += 1
+        end
         puts "Loaded #{list.length} issues from GitHub repo '#{repo}'"
         list
       else
         []
       end
-      commits.map do |sha, date|
+      @issues = commits.map do |sha, date|
         iso = Time.parse(date)
         [sha, dates.select { |d| d < iso }.size]
       end.to_h

data/lib/tdx/exec.rb

@@ -36,11 +36,14 @@ module TDX
     def initialize(cmd, dir = '.')
       @cmd = cmd
       @dir = dir
+      @log = false
     end
 
     def stdout
-      out = `cd #{@dir} && #{@cmd} 2>/dev/null`
+      puts "+ #{@cmd}" if @log
+      out = `cd #{@dir} && #{@cmd}`
       raise "This one failed: #{@cmd}" unless $CHILD_STATUS.exitstatus == 0
+      puts out if @log
       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.5'.freeze
+  VERSION = '0.2.6'.freeze
 end

data/tdx.gemspec

@@ -51,7 +51,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'cucumber', '1.3.17'
   s.add_development_dependency 'coveralls', '0.7.2'
   s.add_development_dependency 'rubocop', '0.41.2'
-  s.add_development_dependency 'hoc', '0.8'
   s.add_development_dependency 'rubocop-rspec', '1.5.1'
   s.add_development_dependency 'minitest', '5.10.1'
 end

data/test/test__helper.rb

@@ -24,4 +24,6 @@ require 'simplecov'
 require 'tdx'
 require 'minitest/autorun'
 
+ENV['RACK_ENV'] = 'test'
+
 STDOUT.sync = true

data/test/test_tdx.rb

@@ -41,6 +41,7 @@ class TestPDD < Minitest::Test
         git config user.email yegor256@gmail.com
         git config user.name 'Mr. Tester'
         echo 'a = 1' > 1.rb && git add 1.rb && git commit -qam '1'
+        rm 1.rb
         echo '<?php b = 2' > 2.php && git add 2.php && git commit -qam '2'
         mkdir tests
         echo 'c = 3' > tests/3.py && git add tests/3.py && git commit -qam '3'
@@ -58,7 +59,7 @@ class TestPDD < Minitest::Test
     assert(
       TDX::Base.new(
         'https://github.com/yegor256/empty.git',
-        opts(['--tests', 'src/test/**/*', '--sha', '7c7000d'])
+        opts(['--tests', 'src/test/**/*'])
       ).svg.include?('<path ')
     )
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tdx
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -108,20 +108,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.41.2
-- !ruby/object:Gem::Dependency
-  name: hoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: '0.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement