git-age 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4085ff2fcbb2716f679f72390a9f896892a2623fea3635ae234539471cf154a7
-  data.tar.gz: 4666d870907b6aecf5490eb01ddbcb6dfe6957705616ea697d935bc98b2ee6b4
+  metadata.gz: 3ec06da504e9bb782269c3fdbad5e0eb887a935c06557f3ec0b0b2e104898e1e
+  data.tar.gz: f606f81e71b79085eb7d6977236311e7f13b50b51118bb9d97dec35e75f15122
 SHA512:
-  metadata.gz: 7f8636eddb349efa34d91d05cfbf49d165834bf3d22d188bf1160276eb4ff1dfea73761283cac50b49638a158a44582478d09284e626e0843430c6d935489c12
-  data.tar.gz: e9c065d66218683e39b6a3b719e8ae95abfd89163d14505f4221fc0856a9749ae5f4409c6f3cc4e0e255c72c5227136fcdf74a0b153277a0f1033c1d4369bfd0
+  metadata.gz: '09a406545ef14ce5a469b949648049cdade634333f2ca49868580dbd058e554dddf48031130800c90b27879f19fcdfb8681d93104d86a8ed9f605487ab6ecfbf'
+  data.tar.gz: 6fdbc40ef845a5368420d6d4608268bc920f74a81c23a2ad0a25ac1acf59b88f7393f54d46d5adf8ded4dba7b23c62697c905a45ac6b055658437c8ca3699ee8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    git-age (0.1.0)
+    git-age (0.1.4)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -29,6 +29,10 @@ Usage: git-age [options]
     -t, --title=TITLE                Graphic title
     -x, --xtitle=TITLE               X axis title
     -y, --ytitle=TITLE               Y axis title
+    -c, --code=PATTERN               Code dir pattern
+    -e, --test=PATTERN               Test dir pattern
+    -y, --type=TYPE                  Graph type, default to bar
+    -v, --version                    Show version
 ```
 
 Example:
@@ -37,9 +41,25 @@ Example:
 $ git-age -o /tmp/data.csv -t 'Test project' -x 'Dates here' -y 'Lines here' -i /tmp/data.png
 ```
 
+Sending a dir pattern as your test dir, creating a test column to compare:
+
+```
+$ git-age -o /tmp/data.csv -t 'Test project' -x 'Dates here' -y 'Lines here' -i /tmp/data.png -e test
+```
+
+If you're sending a test dir, it can be unfair if you don't also send a dir
+pattern to your code dir, because all other files (configurations, temporary
+files) will count as code and your code to test ratio will implode. So, sending
+a code dir pattern:
+
+```
+$ git-age -o /tmp/data.csv -t 'Test project' -x 'Dates here' -y 'Lines here' -i /tmp/data.png -e test -c app
+```
+
 Supported image processors:
 
 - [graph-cli](https://github.com/mcastorina/graph-cli)
+  Supports bar graphs (`-y bar`, default) and line graphs (`-y line`).
 
 Example image:
 

data/bin/git-age

@@ -48,6 +48,26 @@ opts.on('-y', '--ytitle=TITLE', 'Y axis title') do |title|
   options.ytitle = title
 end
 
+opts.on('-e', '--test=PATTERN', 'Test dir pattern') do |pattern|
+  STDOUT.puts "Using test dir pattern #{pattern}"
+  options.test = pattern
+end
+
+opts.on('-c', '--code=PATTERN', 'Code dir pattern') do |pattern|
+  STDOUT.puts "Using code dir pattern #{pattern}"
+  options.code = pattern
+end
+
+opts.on('-y', '--type=TYPE', 'Graph type, defaults to bar') do |type|
+  STDOUT.puts "Using graph type #{type}"
+  options.type = type
+end
+
+opts.on('-v', '--version', 'Show version') do
+  STDOUT.puts "Version #{Git::Age::VERSION}"
+  return
+end
+
 opts.parse!
 
 Git::Age::Main.new.run

data/lib/git/age/graph_cli.rb

@@ -9,10 +9,12 @@ module Git
 
       def self.create(input)
         options = Git::Age::Options.instance
+        legend  = options.test ? 'code' : ''
+        type    = options.type == 'bar' ? '--bar' : ''
         STDOUT.puts "Creating image #{options.image} ..."
 
-        cmd = "graph #{input} --bar -o #{options.image} --title '#{options.title}' --xlabel='#{options.xtitle}' --ylabel='#{options.ytitle}' --xtick-fontsize 5 --time-format-output '%Y-%m-%d' --legend='' 2> /dev/null"
-        rst = IO.popen(cmd) do |io|
+        cmd = "graph #{input} #{type} -o #{options.image} --title '#{options.title}' --xlabel='#{options.xtitle}' --ylabel='#{options.ytitle}' --xtick-fontsize 5 --time-format-output '%Y-%m-%d' --legend='#{legend}' 2> /dev/null"
+        IO.popen(cmd) do |io|
           io.read
         end
       end

data/lib/git/age/main.rb

@@ -9,9 +9,14 @@ module Git
       def initialize
         STDOUT.puts "Waiting, analysing your repository ..."
 
-        @dates   = Hash.new(0)
-        @files   = files
+        @dates   = Hash.new { |hash, key| hash[key] = { code: 0, test: 0 } }
+        @files   = fill_files
         @winsize = IO.console.winsize
+        @test    = Git::Age::Options.instance.test
+        @code    = Git::Age::Options.instance.code
+
+        @test_regexp = @test ? %r{^#{@test}} : nil
+        @code_regexp = @code ? %r{^#{@code}} : nil
       end
 
       def run
@@ -22,10 +27,19 @@ module Git
         show_stats
       rescue => e
         STDERR.puts "Error: #{e}"
+        puts e.backtrace
       end
 
       private
 
+      def file_type(file)
+        return :t if @test_regexp && file.match(@test_regexp)
+
+        return :c unless @code_regexp
+
+         @code_regexp && file.match(@code_regexp) ? :c : :u
+      end
+
       def read_files
         cnt     = 0
         total   = @files.size
@@ -44,12 +58,14 @@ module Git
               matches = line.match(/[\w^]+\s\([\w\s]+(?<date>\d{4}-\d{2})-\d{2}/)
               next unless matches
 
-              mapfile << "#{file}: #{line}\n" if mapfile
+              type = file_type(file)
+              mapfile << "#{file}[#{type}]: #{line}\n" if mapfile
 
-              @dates[matches[:date]] += 1
+              @dates[matches[:date]][:test] += 1 if type == :t
+              @dates[matches[:date]][:code] += 1 if type == :c
             end
-          rescue => blame
-            print "Error on file: #{file}\r"
+          rescue => exc
+            print "Error on file: #{file}: #{exc}\r"
           end
         end
 
@@ -64,13 +80,17 @@ module Git
 
       def create_csv
         output = Git::Age::Options.instance.output
-        STDOUT.puts "Creating CSV file #{output} ...".ljust(@winsize[1])
+        STDOUT.puts "Creating CSV file #{output} with #{@dates.size} lines ...".ljust(@winsize[1])
 
         File.open(output, 'w') do |file|
-          file << "\"date\",\"lines\"\n"
-
-          @dates.each do |key, value|
-            file << "\"#{key}\",#{value}\n"
+          header = "\"date\",\"code\""
+          header << ",\"test\"" if @test
+          file << "#{header}\n"
+
+          @dates.each do |key, data|
+            line = "\"#{key}\",#{data[:code]}"
+            line << ",#{data[:test]}" if @test
+            file << "#{line}\n"
           end
         end
       rescue => e
@@ -96,7 +116,7 @@ module Git
         processor.create(options.output)
       end
 
-      def files
+      def fill_files
         branch = Git::Age::Options.instance.branch
         STDOUT.puts "Reading files info from #{branch} branch ..."
 
@@ -117,13 +137,18 @@ module Git
         stats  = Git::Age::Stats.new(self)
         first  = Date.parse(stats.first_commit)
         last   = Date.parse(stats.last_commit)
-        diff   = (last - first).to_i
+        diff   = (last - first).to_i + 1
         ustats = stats.unchanged_stats
 
         puts "First commit in: #{first}"
         puts "Last  commit in: #{last}"
-        puts "Repository is #{diff} days old"
-        puts "Month with more lines unchanged: #{ustats[:bigger][:date]} (#{ustats[:bigger][:lines]} lines)"
+        puts "Repository has #{diff} days with commits"
+        puts "Month with more code lines unchanged: #{ustats[:bigger][:date]} (#{ustats[:bigger][:lines]} lines)"
+
+        if @test_regexp && @code_regexp
+          ratio = stats.code_to_test_ratio
+          puts "Code to test ratio: 1:#{ratio[:ratio]} (#{ratio[:code]}/#{ratio[:test]})"
+        end
       end
     end
   end

data/lib/git/age/options.rb

@@ -4,7 +4,7 @@ module Git
   module Age
     class Options
       include Singleton
-      attr_accessor :branch, :output, :title, :processor, :image, :xtitle, :ytitle, :map
+      attr_accessor :branch, :output, :title, :processor, :image, :xtitle, :ytitle, :map, :test, :code, :type
 
       def initialize
         @branch    = 'master'
@@ -14,6 +14,9 @@ module Git
         @image     = 'git-age.png'
         @xtitle    = 'Dates'
         @ytitle    = 'Lines'
+        @test      = nil
+        @code      = nil
+        @type      = 'bar'
         @map       = false
       end
     end

data/lib/git/age/stats.rb

@@ -14,8 +14,20 @@ module Git
       end
 
       def unchanged_stats
-        max = @data.dates.max_by { |key, value| value }
-        { bigger: { date: max[0], lines: max[1] } }
+        max = @data.dates.max_by { |key, value| value[:code] }
+        { bigger: { date: max[0], lines: max[1][:code] } }
+      end
+
+      def code_to_test_ratio
+        stats = @data.dates.reduce({code: 0, test: 0}) do |memo, data|
+          memo[:code] += data[1][:code]
+          memo[:test] += data[1][:test]
+          memo
+        end
+
+        { code: stats[:code], test: stats[:test], ratio: (stats[:test].to_f / stats[:code].to_f).round(2) }
+      rescue
+        { code: 0, test: 0, ratio: 0.0 }
       end
 
       private

data/lib/git/age/version.rb

@@ -1,5 +1,5 @@
 module Git
   module Age
-    VERSION = "0.1.3"
+    VERSION = "0.1.4"
   end
 end

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: git-age
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Eustaquio Rangel
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain:
 - |
@@ -36,7 +36,7 @@ cert_chain:
   7NRJmY9c84Zb3sCf0DV6UH+d2id9Dndp9ewchgDOSwGznt+oJmjDFZ9gYd8IP2Ol
   1eLrW8x4LHV+EVEIaiVTvmKt
   -----END CERTIFICATE-----
-date: 2022-08-25 00:00:00.000000000 Z
+date: 2022-12-22 00:00:00.000000000 Z
 dependencies: []
 description: Check all the repository files lines dates and group it by year and month,
   allowing check how old code is still in use
@@ -70,7 +70,7 @@ licenses: []
 metadata:
   homepage_uri: https://github.com/taq/git-age
   source_code_uri: https://github.com/taq/git-age
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -85,8 +85,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: Create a CSV file with line year and month from your Git repository
 test_files: []