obst 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5789a008e6c945b5ec70d5e7fc26f14ddebde0a68bb7439e1b1d7cb704a430a
-  data.tar.gz: c765b723bb0761c7b99511d27138dccb0df126197b1d322fef9a5f8c655dc096
+  metadata.gz: 33dbda872356a5eaec6905a2054093af4a49555183ad517160a8bcb27f0b7ddd
+  data.tar.gz: 77d38fa97ae8e8319b05f85c3106e3fda15a7c14bb3b737a9ecae874c0a81599
 SHA512:
-  metadata.gz: ea12a1c66ba26cea6744579da6954119bdb9902899e6903430349b36fab3b9ee464b1b0e1acdcd73b6e3e7f364dbdc595f9c115654989a98d1a4cdd440d902c3
-  data.tar.gz: 03b54cfde71edf09ffc5629be69633195c6b51ec1ffed1fa7fc132263a644e7cc61342de951ab217eb93e81c692d2de591748350f8f3d84cba9717d6b1edd1f5
+  metadata.gz: e22696c10025df791b9d11e4b6dac10e3deb965d093bb1b511d8d12cfa22019dee5f8794f0f129da60be3782ed7585afc585880f1dbd5ec49ae5f175cb03cf4d
+  data.tar.gz: 85721a438531b6028efc7f1680e47a9be127fe199196371cf8459cfd95091bbe1e6d957f39048574575b98a6b826d9cdd09a26e4c4f5cfb0c1b2341fe0d4ab6e

data/README.md

@@ -38,6 +38,21 @@ Group by Days
 Obst::GroupByDays.new(C: '/path/to/local/git/repo', after: '2022-10-20T00:00:00', days: 7)
 ```
 
+## Config
+
+Place .obst.json under dir where you run obst. Content for example:
+
+```json
+{
+  // for all stats
+  "pathspec": [":!.obsidian", ":!calendar"],
+  // for specific stats
+  "long_time_no_see": {
+    "pathspec": [":!.obsidian", ":!calendar"]
+  }
+}
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/exe/obst

@@ -4,16 +4,23 @@ require "obst"
 
 path = ARGV[0] || '.'
 
+# setup .gitignore
 gitignore = File.join(path, '.gitignore')
 File.open(gitignore, 'a+') do |f|
   f.puts("# Obst\nobst.md") unless f.read =~ /# Obst/
 end
 
+# read config
+cfg = Obst::Config.new(path)
+
+# print stats
 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 Obst::Chart::DailyChange.new(C: path, cfg: cfg).to_s
+  f.puts "\n"
+  f.puts Obst::LongTimeNoSee.new(C: path, cfg: cfg).to_s
   f.puts "\n"
-  f.puts Obst::TouchedFiles.new(C: path).to_s
+  f.puts Obst::TouchedFiles.new(C: path, cfg: cfg).to_s
 end

data/lib/obst/chart.rb

@@ -2,7 +2,8 @@ module Obst
   class Chart
     class DailyCount
       def initialize(**opts)
-        @daily_gauge = Obst::DailyGauge.new(C: opts[:C]).lazy
+        pathspec = opts[:cfg]&.dig_any(['pathspec'], ['chart_daily_count', 'pathspec'])
+        @daily_gauge = Obst::DailyGauge.new(C: opts[:C], pathspec: pathspec).lazy
       end
 
       def to_s
@@ -30,7 +31,8 @@ module Obst
 
     class DailyChange
       def initialize(**opts)
-        @daily = Obst::GroupByDays.new(C: opts[:C]).lazy
+        pathspec = opts[:cfg]&.dig_any(['pathspec'], ['chart_daily_change', 'pathspec'])
+        @daily = Obst::GroupByDays.new(C: opts[:C], pathspec: pathspec).lazy
       end
 
       def to_s

data/lib/obst/config.rb

@@ -0,0 +1,27 @@
+require "json"
+
+module Obst
+  class Config
+    def initialize(dir)
+      @cfg = nil
+      location = File.join(dir, '.obst.json')
+      return @cfg = {} unless File.exist?(location)
+
+      File.open(location) do |f|
+        @cfg = JSON.parse(f.read)
+      end
+    end
+
+    def dig(*path)
+      @cfg.dig(*path)
+    end
+
+    def dig_any(*paths)
+      paths.each do |path|
+        v = dig(*path)
+        return v if v
+      end
+      nil
+    end
+  end
+end

data/lib/obst/git_log.rb

@@ -7,6 +7,7 @@ module Obst
       @cmd = ['git', '-C', path, 'log', '--name-status', '--pretty=format:%ad', "--date=format:'%Y-%m-%dT%H:%M:%S'"]
       @cmd << '--after' << opts[:after] if opts[:after]
       @cmd << '--before' << opts[:before] if opts[:before]
+      Array(opts[:pathspec]).each{ |s| @cmd << s }
     end
 
     def to_s
@@ -58,6 +59,9 @@ module Obst
           raise 'fail to loop git log' unless status_thread.value.success?
         end
         y << Commit.new(batch)
+      rescue => e
+        puts @cmd
+        raise e
       end
     end
   end

data/lib/obst/last_seen.rb

@@ -0,0 +1,28 @@
+require "set"
+require "obst/group_by_days"
+
+module Obst
+  class LastSeen
+    include Enumerable
+
+    def initialize(**opts)
+      @groups = Obst::GroupByDays.new(**opts)
+    end
+
+    def each(&block)
+      return self unless block
+
+      seen = Set.new
+      @groups.each do |record|
+        record.file_changes.keys.each do |file|
+          if seen.include?(file)
+            record.file_changes.delete(file)
+          else
+            seen << file
+          end
+        end
+        block.call(record)
+      end
+    end
+  end
+end

data/lib/obst/long_time_no_see.rb

@@ -0,0 +1,34 @@
+require "obst/last_seen"
+
+module Obst
+  class LongTimeNoSee
+    def initialize(**opts)
+      opts = opts.merge(days: 7)
+      if cfg = opts[:cfg]
+        opts[:pathspec] ||= cfg.dig('long_time_no_see', 'pathspec')
+      end
+      @weekly = LastSeen.new(**opts)
+    end
+
+    def to_s
+      @buffer = ["# Long time no see\n"]
+      @weekly.each_with_index do |record, i|
+        @buffer << "- #{record.time} #{week_count(i)} (#{record.file_changes.count})"
+        list_files(record)
+      end
+      @buffer.join("\n")
+    end
+
+    def list_files(record)
+      record.group_inlines do |line|
+        @buffer << "\t- #{line}"
+      end
+    end
+
+    def week_count(i)
+      return 'today' if i == 0
+      return '1.week.ago' if i == 1
+      "#{i}.weeks.ago"
+    end
+  end
+end

data/lib/obst/pack_log.rb

@@ -46,6 +46,28 @@ module Obst
             end
         end
       end
+
+      def group_by_final_status
+        groups = Hash.new{ |h, k| h[k] = [] }
+        file_changes.each_pair{ |file, changes| groups[changes.final] << file }
+        groups
+      end
+
+      def group_inlines(&block)
+        gbfs = group_by_final_status
+
+        [
+          [:new, :a, '#2db7b5'],
+          [:mod, :m, '#d3be03'],
+          [:del, :d, '#c71585'],
+          [:nil, nil, 'grey']
+        ].each do |long, short, color|
+          files = gbfs[short]
+          next if files.empty?
+          inline_str = files.sort!.map{ |name| "[[#{name}]]" }.join(' / ')
+          block.call("<font color='#{color}'>#{long} #{files.count}:</font> #{inline_str}")
+        end
+      end
     end
 
     # yield PackLog::Record(

data/lib/obst/touched_files.rb

@@ -4,6 +4,12 @@ module Obst
   class TouchedFiles
     def initialize(**opts)
       @path = opts[:C]
+
+      @pathspec =
+        if cfg = opts[:cfg]
+          opts[:pathspec] ||= cfg.dig_any(['pathspec'], ['touched_files', 'pathspec'])
+        end
+
       @buffer = ["# Touch files in periods\n"]
     end
 
@@ -17,7 +23,7 @@ module Obst
     def last_7_days
       @buffer << "- Last 7 days"
 
-      GroupByDays.new(C: @path).take(7).each do |record|
+      GroupByDays.new(C: @path, pathspec: @pathspec).take(7).each do |record|
         @buffer << "\t- #{record.date_wday} (#{record.file_changes.count})"
         list_files(record)
       end
@@ -28,7 +34,7 @@ module Obst
 
       @buffer << "- 1 week ago"
 
-      GroupByDays.new(C: @path, before: before, days: 7).take(3).each_with_index do |record, i|
+      GroupByDays.new(C: @path, before: before, days: 7, pathspec: @pathspec).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
@@ -39,33 +45,18 @@ module Obst
 
       @buffer << "- 1 month ago"
 
-      GroupByDays.new(C: @path, before: before, days: 28).take(2).each_with_index do |record, i|
+      GroupByDays.new(C: @path, before: before, days: 28, pathspec: @pathspec).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.file_changes.each_pair{ |file, status| group_by_final_status[status.final] << file }
-
-      [
-        [:new, :a, '#2db7b5'],
-        [:mod, :m, '#d3be03'],
-        [: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\t- <font color='#{color}'>#{long} #{files.count}:</font> #{inline_str}"
+      record.group_inlines do |line|
+        @buffer << "\t\t- #{line}"
       end
     end
 
-    def inline(files)
-      files.sort!.map{ |name| "[[#{name}]]" }.join(' / ')
-    end
-
     def suffix_s(i)
       i == 0 ? '' : 's'
     end

data/lib/obst/version.rb

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

data/lib/obst.rb

@@ -1,7 +1,9 @@
 require "obst/version"
+require "obst/config"
 require "obst/git_log"
 require "obst/group_by_days"
 require "obst/touched_files"
+require "obst/long_time_no_see"
 require "obst/daily_gauge"
 require "obst/chart"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: obst
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - ken
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-11-27 00:00:00.000000000 Z
+date: 2022-11-29 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -30,10 +30,13 @@ files:
 - exe/obst
 - lib/obst.rb
 - lib/obst/chart.rb
+- lib/obst/config.rb
 - lib/obst/daily_gauge.rb
 - lib/obst/daily_increment.rb
 - lib/obst/git_log.rb
 - lib/obst/group_by_days.rb
+- lib/obst/last_seen.rb
+- lib/obst/long_time_no_see.rb
 - lib/obst/pack_log.rb
 - lib/obst/touched_files.rb
 - lib/obst/version.rb