obst 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1ea9ec553aec1048f197a4313bb6f5bdb82767e78fe793764127e1b798ee5b7
-  data.tar.gz: 8cfa17989074c75b146f5979cd30e33ea05a062cc3e1347efb1677dd6c4c2a44
+  metadata.gz: a5789a008e6c945b5ec70d5e7fc26f14ddebde0a68bb7439e1b1d7cb704a430a
+  data.tar.gz: c765b723bb0761c7b99511d27138dccb0df126197b1d322fef9a5f8c655dc096
 SHA512:
-  metadata.gz: 13b20ea98bc4cedacfee5a11b267f3f2a263fbcadd9d7a3de83061c17af55257701801dca6cabb687236b2c193bd2accfd99d53a9a8ed121471486e6484473c8
-  data.tar.gz: a2cda68907af8dd8c15f1f31d00afb977e297e3461bf5bbafc7adbccfc9c06801407dd7a68c0898b19a6585e0c8d6ffa86e598e7be2961e09d5a40cb8d1f8df6
+  metadata.gz: ea12a1c66ba26cea6744579da6954119bdb9902899e6903430349b36fab3b9ee464b1b0e1acdcd73b6e3e7f364dbdc595f9c115654989a98d1a4cdd440d902c3
+  data.tar.gz: 03b54cfde71edf09ffc5629be69633195c6b51ec1ffed1fa7fc132263a644e7cc61342de951ab217eb93e81c692d2de591748350f8f3d84cba9717d6b1edd1f5

data/exe/obst

@@ -11,5 +11,9 @@ end
 
 obst_md = File.join(path, 'obst.md')
 File.open(obst_md, 'w') do |f|
+  f.puts Obst::Chart::DailyCount.new(C: path).to_s
+  f.puts "\n"
+  f.puts Obst::Chart::DailyChange.new(C: path).to_s
+  f.puts "\n"
   f.puts Obst::TouchedFiles.new(C: path).to_s
 end

data/lib/obst/chart.rb

@@ -0,0 +1,71 @@
+module Obst
+  class Chart
+    class DailyCount
+      def initialize(**opts)
+        @daily_gauge = Obst::DailyGauge.new(C: opts[:C]).lazy
+      end
+
+      def to_s
+        labels, data = [], []
+        @daily_gauge.take(28 * 3).each do |time_count|
+          labels << time_count.time.strftime('%F %a')
+          data << time_count.count
+        end
+
+        <<~EOF
+        # Daily count
+
+        ```chart
+        type: line
+        width: 98%
+        legendPosition: bottom
+        labels: #{labels.reverse!}
+        series:
+          - title: current #{data[0]}
+            data: #{data.reverse!}
+        ```
+        EOF
+      end
+    end
+
+    class DailyChange
+      def initialize(**opts)
+        @daily = Obst::GroupByDays.new(C: opts[:C]).lazy
+      end
+
+      def to_s
+        labels = []
+        datas = {a: [], m: [], d: [], nil => []}
+
+        @daily.take(28 * 3).each do |record|
+          labels << record.date_wday
+          datas.each_value{ |data| data << 0 }
+
+          record.file_changes.each_value do |changes|
+            datas[changes.final][-1] += 1
+          end
+        end
+
+        <<~EOF
+        # Daily change
+
+        ```chart
+        type: line
+        width: 98%
+        legendPosition: bottom
+        labels: #{labels.reverse!}
+        series:
+          - title: del
+            data: #{datas[:d].reverse!}
+          - title: nil
+            data: #{datas[nil].reverse!}
+          - title: mod
+            data: #{datas[:m].reverse!}
+          - title: new
+            data: #{datas[:a].reverse!}
+        ```
+        EOF
+      end
+    end
+  end
+end

data/lib/obst/daily_gauge.rb

@@ -0,0 +1,35 @@
+require "open3"
+require "obst/daily_increment"
+
+module Obst
+  class DailyGauge
+    include Enumerable
+
+    def initialize(**opts)
+      @path = opts[:C] || '.'
+    end
+
+    ONE_DAY = 60 * 60 * 24
+    TimeCount = Struct.new(:time, :count)
+
+    def each(&block)
+      return self unless block
+
+      time = Time.parse(Time.now.strftime('%F'))
+      tot = total_now
+      block.call(TimeCount.new(time, tot))
+
+      DailyIncrement.new(C: @path).each do |incr|
+        time -= ONE_DAY
+        tot -= incr
+        block.call(TimeCount.new(time, tot))
+      end
+    end
+
+    def total_now
+      total = 0
+      Open3.pipeline_r(['git', '-C', @path, 'ls-files'], ['wc', '-l']){ |stdout| total = stdout.read.to_i }
+      total
+    end
+  end
+end

data/lib/obst/daily_increment.rb

@@ -0,0 +1,19 @@
+require "obst/group_by_days"
+
+module Obst
+  class DailyIncrement
+    include Enumerable
+
+    def initialize(**opts)
+      @group_by_day = GroupByDays.new(**opts)
+    end
+
+    def each(&block)
+      return self unless block
+
+      @group_by_day.each do |pack_log_record|
+        block.call(pack_log_record.increment)
+      end
+    end
+  end
+end

data/lib/obst/group_by_days.rb

@@ -28,6 +28,8 @@ module Obst
     end
 
     def each(&block)
+      return self unless block
+
       current_time = @timeline.next
       record = @log.next
 

data/lib/obst/pack_log.rb

@@ -9,7 +9,7 @@ module Obst
       @time_fix = block
     end
 
-    class Statuses
+    class Changes
       def <<(st)
         @arr ||= []
         @arr << st if @arr.last != st
@@ -20,34 +20,48 @@ module Obst
       end
 
       def final
-        return :d if @arr[0] == :d
-        return :a if @arr[-1] == :a
-        :m
+        if @arr[0] == :d
+          return @arr[-1] == :a ? nil : :d
+        end
+
+        @arr[-1] == :a ? :a : :m
       end
     end
 
-    Record = Struct.new(:time, :statuses) do
-      def status_sum
-        sum = Hash.new{ |h, k| h[k] = 0 }
-        statuses.each_value do |status|
-          sum[status.final] += 1
-        end
-        sum
+    Record = Struct.new(:time, :file_changes) do
+      def date_wday
+        Time.parse(time).strftime('%F %a')
       end
 
-      def str_status_sum
-        sb = []
-        status_sum.each_pair do |st, count|
-          sb << "#{st}: #{count}"
+      def increment
+        file_changes.each_value.reduce(0) do |sum, changes|
+          sum +=
+            case changes.final
+            when :a
+              1
+            when :d
+              -1
+            else
+              0
+            end
         end
-        sb.join(', ')
       end
     end
 
+    # yield PackLog::Record(
+    #   time:Any,
+    #   file_changes:Hash{
+    #     name1 => [:m, :a],
+    #     name2 => [:d, :m],
+    #     ...
+    #   }
+    # )
     def each(&block)
+      return self unless block
+
       current_time = nil
       renames = {}
-      files_in_one_day = Hash.new{ |files, name| files[name] = Statuses.new }
+      files_in_one_day = Hash.new{ |files, name| files[name] = Changes.new }
 
       @commits.each do |commit|
         committed_at = @time_fix.call(commit.committed_at)

data/lib/obst/touched_files.rb

@@ -4,24 +4,21 @@ module Obst
   class TouchedFiles
     def initialize(**opts)
       @path = opts[:C]
-      @buffer = []
+      @buffer = ["# Touch files in periods\n"]
     end
 
     def to_s
       last_7_days
-      @buffer << ''
       last_4_weeks_without_last_7_days
-      @buffer << ''
       last_3_months_without_last_4_weeks
       @buffer.join("\n")
     end
 
     def last_7_days
-      @buffer << "# Last 7 days\n"
+      @buffer << "- Last 7 days"
 
       GroupByDays.new(C: @path).take(7).each do |record|
-        wday = Time.parse(record.time).strftime('%a')
-        @buffer << "- #{record.time} #{wday} (#{record.statuses.size})"
+        @buffer << "\t- #{record.date_wday} (#{record.file_changes.count})"
         list_files(record)
       end
     end
@@ -29,10 +26,10 @@ module Obst
     def last_4_weeks_without_last_7_days
       before = (Time.now - (60 * 60 * 24 * 7)).strftime('%FT23:59:59')
 
-      @buffer << "# 3 weeks earlier\n"
+      @buffer << "- 1 week ago"
 
-      GroupByDays.new(C: @path, before: before, days: 7).take(3).each do |record|
-        @buffer << "- #{record.time} (#{record.statuses.size})"
+      GroupByDays.new(C: @path, before: before, days: 7).take(3).each_with_index do |record, i|
+        @buffer << "\t- #{record.time} is #{1+i}.week#{suffix_s(i)}.ago (#{record.file_changes.count})"
         list_files(record)
       end
     end
@@ -40,32 +37,37 @@ module Obst
     def last_3_months_without_last_4_weeks
       before = (Time.now - (60 * 60 * 24 * 28)).strftime('%FT23:59:59')
 
-      @buffer << "# 1 month earlier\n"
+      @buffer << "- 1 month ago"
 
-      GroupByDays.new(C: @path, before: before, days: 28).take(2).each do |record|
-        @buffer << "- #{record.time} (#{record.statuses.size})"
+      GroupByDays.new(C: @path, before: before, days: 28).take(2).each_with_index do |record, i|
+        @buffer << "\t- #{record.time} is #{1+i}.month#{suffix_s(i)}.ago (#{record.file_changes.count})"
         list_files(record)
       end
     end
 
     def list_files(record)
       group_by_final_status = Hash.new{ |h, k| h[k] = [] }
-      record.statuses.each_pair{ |name, status| group_by_final_status[status.final] << name }
+      record.file_changes.each_pair{ |file, status| group_by_final_status[status.final] << file }
 
       [
         [:new, :a, '#2db7b5'],
         [:mod, :m, '#d3be03'],
-        [:del, :d, '#c71585']
+        [:del, :d, '#c71585'],
+        [:nil, nil, 'grey']
       ].each do |long, short, color|
         files = group_by_final_status[short]
         next if files.empty?
         inline_str = inline(files)
-        @buffer << "\t- <font color='#{color}'>#{long} #{files.count}:</font> #{inline_str}"
+        @buffer << "\t\t- <font color='#{color}'>#{long} #{files.count}:</font> #{inline_str}"
       end
     end
 
     def inline(files)
       files.sort!.map{ |name| "[[#{name}]]" }.join(' / ')
     end
+
+    def suffix_s(i)
+      i == 0 ? '' : 's'
+    end
   end
 end

data/lib/obst/version.rb

@@ -1,3 +1,3 @@
 module Obst
-  VERSION = "0.1.4"
+  VERSION = "0.1.6"
 end

data/lib/obst.rb

@@ -2,6 +2,8 @@ require "obst/version"
 require "obst/git_log"
 require "obst/group_by_days"
 require "obst/touched_files"
+require "obst/daily_gauge"
+require "obst/chart"
 
 module Obst
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: obst
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - ken
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-11-26 00:00:00.000000000 Z
+date: 2022-11-27 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -29,6 +29,9 @@ files:
 - bin/setup
 - exe/obst
 - lib/obst.rb
+- lib/obst/chart.rb
+- lib/obst/daily_gauge.rb
+- lib/obst/daily_increment.rb
 - lib/obst/git_log.rb
 - lib/obst/group_by_days.rb
 - lib/obst/pack_log.rb