tdx 0.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '094427fce2f4adf7f7771fddcd9e743e8be40e7a'
-  data.tar.gz: 8da46abf56734d823cfd518bba1d7a19ff0a745e
+  metadata.gz: 75b7cfed6e48c402e1cedd1ab7ce10c236ebeacf
+  data.tar.gz: 637915bd109fd8cdf192ac58f3019cf114dc3ca2
 SHA512:
-  metadata.gz: ea8b250773f7ae8b0e53a69d8e35ef928be212b6a82767d00baecc2989b4d39fd87cce3ad1764f9309ad82d798116013448629ae84cd34339cbefb0e0b4bea31
-  data.tar.gz: 425317f013b2af729caec57079b05489c92e5af8fccee1c722d6b1327cba5c4269b98971452eeb13e102d5307fb2097480add320909c939c17a9140ec73bd032
+  metadata.gz: 357dbf0825dd394eb54c29a6ed89dedaa5d076f16cf5c5e3e2130bceb1ac4963fe389b2718f6f5a83f41da96527e662beb01063074ef42599b4181b7de7c8eb9
+  data.tar.gz: 7c79c8861cfb785ecca4d1da8dbe76675be1e730ffa2530d86a868feb81b468b4abd890ffeed38bcec8dacbe4d95ece15f567bca4ed550ec42f638e8badbd3d1

data/.rubocop.yml

@@ -6,4 +6,12 @@ Metrics/MethodLength:
 Metrics/ClassLength:
   Max: 150
 Metrics/AbcSize:
-  Max: 37
+  Max: 50
+Style/MultilineMethodCallIndentation:
+  Enabled: false
+Style/IndentationWidth:
+  Enabled: false
+Style/ElseAlignment:
+  Enabled: false
+Lint/EndAlignment:
+  Enabled: false

data/bin/tdx

@@ -28,46 +28,17 @@ require 'tdx'
 
 args = ARGV
 
-opts = Slop.parse(args, strict: true, help: true) do
-  banner "Usage (#{TDX::VERSION}): tdx [options]"
-  on('version', 'Show current version')
-  on(
-    'r',
-    'repo',
-    'Repository URI, e.g. "git@github.com:yegor256/tdx.git"',
-    type: String,
-    argument: :required,
-    limit: 1
-  )
-  on(
-    'tests',
+opts = Slop.parse(args, strict: true, help: true) do |o|
+  o.banner = "Usage (#{TDX::VERSION}): tdx [options] <GitHub URI> <SVG path>"
+  o.bool '-h', '--help', 'Show usage summary'
+  o.bool '-v', '--version', 'Show current version'
+  o.array(
+    '--tests',
     'Comma-separated list of relative paths with test-related files',
-    type: String,
-    argument: :required,
-    limit: 1
-  )
-  on(
-    'login',
-    'GitHub login',
-    argument: :required,
-    type: String,
-    limit: 1
-  )
-  on(
-    'password',
-    'GitHub password',
-    argument: :required,
-    type: String,
-    limit: 1
-  )
-  on(
-    's',
-    'svg',
-    'Full path of the SVG file to generate (STDOUT otherwise)',
-    argument: :required,
-    type: String,
-    limit: 1
+    delimiter: ','
   )
+  o.string '--login', 'GitHub login'
+  o.string '--password', 'GitHub password'
 end
 
 if opts.help?
@@ -80,11 +51,12 @@ if opts.version?
   exit
 end
 
+if opts.arguments.length < 2
+  puts 'URI and SVG path are required'
+  exit
+end
+
 Encoding.default_external = Encoding::UTF_8
 Encoding.default_internal = Encoding::UTF_8
-output = TDX::Base.new(opts).svg
-if opts[:svg]
-  File.new(opts[:svg], 'w') << output
-else
-  puts output
-end
+output = TDX::Base.new(opts.arguments[0], opts).svg
+File.new(opts.arguments[1], 'w') << output

data/features/cli.feature

@@ -13,8 +13,7 @@ Feature: Command Line Processing
 
   Scenario: Simple SVG is built
     Given I have a Git repository in ./repo
-    When I run bin/tdx with "--svg pic.svg --repo file://$(pwd)/repo"
-    Then Stdout is empty
+    When I run bin/tdx with "file://$(pwd)/repo pic.svg"
     Then Exit code is zero
     And SVG is valid in "pic.svg"
 

data/lib/tdx/base.rb

@@ -20,8 +20,11 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+require 'date'
 require 'yaml'
+require 'octokit'
 require 'fileutils'
+require 'English'
 
 # TDX main module.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -30,12 +33,13 @@ require 'fileutils'
 module TDX
   # Base class
   class Base
-    def initialize(opts)
+    def initialize(uri, opts)
+      @uri = uri
       @opts = opts
     end
 
     def svg
-      dat = Tempfile.new('tdx.dat')
+      dat = Tempfile.new('tdx')
       version = `git --version`.split(/ /)[2]
       raise "git version #{version} is too old, upgrade it to 2.0+" unless
         Gem::Version.new(version) >= Gem::Version.new('2.0')
@@ -45,13 +49,17 @@ module TDX
         .split(/\n/)
         .map { |c| c.split(' ') }
       issues = issues(commits)
+      puts "Date\t\tTest\tHoC\tFiles\tLoC\tIssues\tSHA"
       commits.each do |sha, date|
         `cd "#{path}" && git checkout --quiet #{sha}`
-        dat << "#{date} #{tests(path)} #{hoc(path)} #{files(path)}"
-        dat << " #{loc(path)} #{issues[sha]}\n"
+        raise 'Failed to checkout' unless $CHILD_STATUS.exitstatus == 0
+        line = "#{date[0, 10]}\t#{tests(path)}\t#{hoc(path)}\t#{files(path)}\t\
+#{loc(path)}\t#{issues[sha]}\t#{sha[0, 7]}"
+        dat << "#{line}\n"
+        puts line
       end
       dat.close
-      svg = Tempfile.new('tdx.svg')
+      svg = Tempfile.new('tdx')
       gpi = [
         "set output \"#{svg.path}\"",
         'set terminal svg size 700, 260',
@@ -64,10 +72,17 @@ module TDX
         'set autoscale',
         'set style fill solid',
         'set boxwidth 0.75 relative',
-        "plot \"#{dat.path}\" using 1:2 with boxes \
-title \"Test HoC\" linecolor rgb \"#81b341\""
+        [
+          "plot \"#{dat.path}\" using 1:2 with boxes",
+          '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"'
+        ].join(' ')
       ]
-      `gnuplot -e '#{gpi.join(';')}' 2>/dev/null`
+      `gnuplot -e '#{gpi.join('; ')}'`
+      raise 'Failed to run Gnuplot' unless $CHILD_STATUS.exitstatus == 0
       FileUtils.rm_rf(path)
       File.delete(dat)
       xml = File.read(svg)
@@ -79,7 +94,12 @@ title \"Test HoC\" linecolor rgb \"#81b341\""
 
     def checkout
       dir = Dir.mktmpdir
-      `cd #{dir} && git clone --quiet #{@opts[:repo]} .`
+      `cd #{dir} && git clone --quiet #{@uri} .`
+      raise 'Failed to clone repository' unless $CHILD_STATUS.exitstatus == 0
+      size = Dir.glob(File.join(dir, '**/*'))
+        .map(&:size)
+        .inject(0) { |a, e| a + e }
+      puts "Cloned #{@uri} (#{size / 1024}Kb) into temporary directory"
       dir
     end
 
@@ -88,7 +108,8 @@ title \"Test HoC\" linecolor rgb \"#81b341\""
     end
 
     def loc(path)
-      cloc = `cd "#{path}" && cloc . --yaml --quiet 2>/dev/null`
+      cloc = `cd "#{path}" && cloc . --yaml --quiet`
+      raise 'Failed to run cloc' unless $CHILD_STATUS.exitstatus == 0
       yaml = YAML.load(cloc)
       if yaml
         yaml['SUM']['code']
@@ -98,17 +119,37 @@ title \"Test HoC\" linecolor rgb \"#81b341\""
     end
 
     def hoc(path)
-      `cd "#{path}" && hoc`
+      hoc = `cd "#{path}" && hoc`
+      raise 'Failed to run hoc' unless $CHILD_STATUS.exitstatus == 0
+      hoc
     end
 
     def tests(path)
-      `cd "#{path}" && hoc`
+      hoc = `cd "#{path}" && hoc`
+      raise 'Failed to run hoc' unless $CHILD_STATUS.exitstatus == 0
+      hoc
     end
 
     def issues(commits)
-      dates = []
-      # dates = github.issues.map{ |i| i.created_at }
-      commits.map { |sha, date| [sha, dates.select { |d| d < date }.size] }.to_h
+      dates = if @uri.include?('github.com')
+        client = if @opts[:login]
+          Octokit::Client.new(login: @opts[:login], password: @opts[:password])
+        else
+          Octokit::Client.new
+        end
+        repo = if @uri.start_with?('git@')
+          @uri.gsub(/^git@github\.com:|\.git$/, '')
+        else
+          @uri.gsub(%r{^https://github\.com/|\.git$}, '')
+        end
+        client.list_issues(repo, state: :all).map(&:created_at)
+      else
+        []
+      end
+      commits.map do |sha, date|
+        iso = Time.parse(date)
+        [sha, dates.select { |d| d < iso }.size]
+      end.to_h
     end
   end
 end

data/lib/tdx/version.rb

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

data/tdx.gemspec

@@ -44,11 +44,13 @@ Gem::Specification.new do |s|
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
   s.rdoc_options = ['--charset=UTF-8']
   s.extra_rdoc_files = ['README.md', 'LICENSE.txt']
-  s.add_runtime_dependency 'slop', '~>3.6'
+  s.add_runtime_dependency 'slop', '~>4.4.1'
+  s.add_runtime_dependency 'octokit', '~>4.6.2'
   s.add_development_dependency 'rake', '12.0.0'
   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'
   s.add_development_dependency 'nokogiri', '1.7.0.1'

data/test/test_tdx.rb

@@ -35,7 +35,6 @@ class TestPDD < Minitest::Test
     Dir.mktmpdir 'test' do |dir|
       opts = opts(
         [
-          '--repo', "file:///#{File.join(dir, 'repo')}",
           '--tests', 'tests'
         ]
       )
@@ -51,18 +50,27 @@ class TestPDD < Minitest::Test
         mkdir tests
         echo 'c = 3' > tests/3.py && git add tests/3.py && git commit -qam '3'
       ")
-      assert(TDX::Base.new(opts).svg.include?('<path '))
+      assert(
+        TDX::Base.new(
+          "file:///#{File.join(dir, 'repo')}", opts
+        ).svg.include?('<path ')
+      )
     end
   end
 
+  def test_real_github_repo
+    assert(
+      TDX::Base.new(
+        'https://github.com/yegor256/tdx.git', opts([])
+      ).svg.include?('<path ')
+    )
+  end
+
   private
 
   def opts(args)
-    Slop.parse args do
-      on 'p', 'path', argument: :required
-      on 's', 'svg', argument: :required
-      on 'r', 'repo', argument: :required
-      on 't', 'tests', argument: :required
+    Slop.parse args do |o|
+      o.string '-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.1'
+  version: '0.2'
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: 4.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: 4.4.1
+- !ruby/object:Gem::Dependency
+  name: octokit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.6.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.6.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +94,20 @@ 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