mps 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8ae3859e4782a907b27a5e50e630cb9a4f4c1ee4cb6a995302144ff7e710b5d
-  data.tar.gz: e28971415998d6ab59761c48b148e4209e4adfe3b11cca0549a468a09fcc35a0
+  metadata.gz: 96b0eac30435621ea7ca9d0575d3a3285a074cb2707d453075ced7e1535ca288
+  data.tar.gz: 647d49ad9cffd798858318dd712d4653df718e37d05a8f52803be367e423c17c
 SHA512:
-  metadata.gz: 4a991ff844ef540c3e155e8d676b1ca6602367dfe7be385d5cbef2cce6478b850cf63e4fdf6a314f09913e2d5f6fc367c40def4236d6b1d3cb52992295a2a8ee
-  data.tar.gz: 69891a0155275f35a0060dc5bada88fb124d13c6d5b1b22dff84308db38c48b2d7371d304de6d1dd93eb9da8b75018c5a2853afaa8e483ae15aac93b30358640
+  metadata.gz: e1204e48c493e45f0dc226b1a7a4de0751b4821774ab5984c54f56cf53e91ac99cb09a17fb5cf777de0cf665ebefd69289913de935baf5655d3afd76f80da9bf
+  data.tar.gz: bbb938d0b337b652c07cca9983949a830c13fd9180ab037df87bd75feda68a6e11dfbc091689fa96546edc1e6f5f02e770b98a6d896c32b90de2b95b0fcaae00

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mps (1.0.0)
+    mps (1.0.1)
       chronic (~> 0.10.2)
       cli-ui (~> 2.2)
       thor (~> 1.3)

data/lib/mps/cli/commands/list.rb

@@ -20,11 +20,16 @@ MPS::CLI::MPS.class_eval do
   def list(datesign = "today")
     init
     begin
-      dates = if options[:all]
-        store.all_files.map { |f| Date.strptime(File.basename(f)[0, 8], "%Y%m%d") }.uniq.sort
+      all_dates = store.all_files
+                       .map { |f| Date.strptime(File.basename(f)[0, 8], "%Y%m%d") }
+                       .uniq.sort
+      dates = if options[:all] && options[:since]
+        since_date = ::MPS.get_date(options[:since]).to_date
+        all_dates.select { |d| d >= since_date }
+      elsif options[:all]
+        all_dates
       elsif options[:since]
-        date  = ::MPS.get_date(datesign)
-        date_range(options[:since], date)
+        date_range(options[:since], ::MPS.get_date(datesign))
       else
         [::MPS.get_date(datesign).to_date]
       end

data/lib/mps/cli/commands/stats.rb

@@ -2,13 +2,25 @@
 
 MPS::CLI::MPS.class_eval do
   desc "stats [DATESIGN]", "Show element counts and log durations"
-  method_option :since, type: :string, aliases: "-S",
-                        desc: "Stats from SINCE up to DATESIGN"
+  method_option :since,  type: :string,  aliases: "-S", desc: "Stats from SINCE up to DATESIGN"
+  method_option :all,    type: :boolean, aliases: "-a", default: false,
+                         desc: "Stats across all dates"
   def stats(datesign = "today")
     init
     begin
-      date  = ::MPS.get_date(datesign)
-      dates = options[:since] ? date_range(options[:since], date) : [date.to_date]
+      dates = if options[:all] && options[:since]
+        since_date = ::MPS.get_date(options[:since]).to_date
+        store.all_files.map { |f| Date.strptime(File.basename(f)[0, 8], "%Y%m%d") }
+             .uniq.sort.select { |d| d >= since_date }
+      elsif options[:all]
+        store.all_files.map { |f| Date.strptime(File.basename(f)[0, 8], "%Y%m%d") }.uniq.sort
+      elsif options[:since]
+        date  = ::MPS.get_date(datesign)
+        date_range(options[:since], date)
+      else
+        date  = ::MPS.get_date(datesign)
+        [date.to_date]
+      end
 
       total          = Hash.new(0)
       total_log_mins = 0

data/lib/mps/cli/commands/tags.rb

@@ -1,17 +1,28 @@
 # frozen_string_literal: true
 
 MPS::CLI::MPS.class_eval do
-  desc "tags [DATESIGN]", "Show tag usage counts (equivalent to mps list tags)"
-  method_option :type,  type: :string, aliases: "-t", desc: "Filter by element type"
-  method_option :since, type: :string, aliases: "-S", desc: "From SINCE up to DATESIGN"
-  method_option :status, type: :string, aliases: "-s", desc: "Filter tasks by status"
+  desc "tags [DATESIGN]", "Show tag usage table with frequency bars"
+  method_option :type,   type: :string,  aliases: "-t", desc: "Filter by element type"
+  method_option :since,  type: :string,  aliases: "-S", desc: "From SINCE up to DATESIGN"
+  method_option :status, type: :string,  aliases: "-s", desc: "Filter tasks by status"
+  method_option :all,    type: :boolean, aliases: "-a", default: false,
+                         desc: "Count tags across all dates"
   def tags(datesign = "today")
     init
     begin
-      date  = ::MPS.get_date(datesign)
-      dates = options[:since] ? date_range(options[:since], date) : [date.to_date]
-      q     = ::MPS::Query.new(options)
+      dates = if options[:all] && options[:since]
+        since_date = ::MPS.get_date(options[:since]).to_date
+        store.all_files.map { |f| Date.strptime(File.basename(f)[0, 8], "%Y%m%d") }
+             .uniq.sort.select { |d| d >= since_date }
+      elsif options[:all]
+        store.all_files.map { |f| Date.strptime(File.basename(f)[0, 8], "%Y%m%d") }.uniq.sort
+      elsif options[:since]
+        date_range(options[:since], ::MPS.get_date(datesign))
+      else
+        [::MPS.get_date(datesign).to_date]
+      end
 
+      q      = ::MPS::Query.new(options)
       counts = Hash.new(0)
       dates.each do |d|
         q.apply(store.parse_date(d)).each_value do |el|
@@ -21,11 +32,24 @@ MPS::CLI::MPS.class_eval do
 
       if counts.empty?
         say set_color("(no tags found)", :yellow)
-      else
-        counts.sort_by { |_, v| -v }.each do |tag, n|
-          say "  #{set_color(tag, :white)} (#{n})"
-        end
+        return
+      end
+
+      sorted  = counts.sort_by { |_, v| -v }
+      max_cnt = sorted.first[1]
+      max_tag = sorted.map(&:first).map(&:length).max
+      bar_max = 24
+
+      say set_color("  #{"Tag".ljust(max_tag)}  Count  Frequency", :white)
+      say set_color("  #{"-" * max_tag}  -----  #{"-" * bar_max}", :white)
+      sorted.each do |tag, n|
+        bar_len = (n.to_f / max_cnt * bar_max).ceil
+        bar     = set_color("█" * bar_len, :cyan)
+        say "  #{set_color(tag.ljust(max_tag), :white)}  #{n.to_s.rjust(5)}  #{bar}"
       end
+      total = counts.values.sum
+      say ""
+      say set_color("  #{sorted.size} tag#{sorted.size == 1 ? '' : 's'}, #{total} total uses", :white)
     rescue StandardError => e
       raise Thor::Error, e
     end

data/lib/mps/cli/commands/update.rb

@@ -1,17 +1,20 @@
 # frozen_string_literal: true
 
-# Collect all schema-declared attribute flags for the update command.
-# This runs at class-load time so options are available to Thor.
-_all_schema_attrs = ::MPS::Elements.constants
-  .map    { |k| ::MPS::Elements.const_get(k) }
-  .select { |x| x.class == Class }
-  .flat_map { |klass| klass.schema.to_a }
-  .uniq { |name, _| name }
-  .select { |_, defn| defn[:flag] }
-
 MPS::CLI::MPS.class_eval do
+  # Returns all schema-declared attribute definitions across every element type.
+  # Called at class-load time (for method_option registration) and at call time
+  # (inside the update method body). A class method survives both contexts.
+  def self._schema_update_attrs
+    ::MPS::Elements.constants
+      .map    { |k| ::MPS::Elements.const_get(k) }
+      .select { |x| x.class == Class }
+      .flat_map { |klass| klass.schema.to_a }
+      .uniq { |name, _| name }
+      .select { |_, defn| defn[:flag] }
+  end
+
   desc "update REFPATH", "Update an element's attributes in-place"
-  _all_schema_attrs.each do |_name, defn|
+  _schema_update_attrs.each do |_name, defn|
     method_option defn[:flag], type: :string, desc: "Set #{defn[:flag]}"
   end
   method_option :date, type: :string, aliases: "-d",
@@ -21,7 +24,7 @@ MPS::CLI::MPS.class_eval do
     begin
       date = options[:date] ? ::MPS.get_date(options[:date]).to_date : Date.today
       new_attrs = {}
-      _all_schema_attrs.each do |name, defn|
+      self.class._schema_update_attrs.each do |name, defn|
         flag_sym = defn[:flag].tr("-", "_").to_sym
         new_attrs[name] = options[flag_sym] if options[flag_sym]
       end

data/lib/mps/mps.rb

@@ -2,7 +2,9 @@
 
 module MPS
   def self.get_date(str)
-    Chronic.parse(str).to_date
+    result = Chronic.parse(str)
+    raise ArgumentError, "Cannot parse date: #{str.inspect}" unless result
+    result.to_date
   end
 
   def self.get_filename_from_date(date)

data/lib/mps/ref_resolver.rb

@@ -56,6 +56,7 @@ module MPS
         next if depth <= 0  # skip synthetic root wrapper
 
         if depth == 1
+          next if el.is_a?(Engines::Parser::Unknown)
           type_name = el.class::SIGNATURE_STAMP
           type_counters[type_name] += 1
           human = "#{type_name}-#{type_counters[type_name]}"

data/lib/mps/store.rb

@@ -140,7 +140,7 @@ module MPS
       new_args        = (new_attr_parts + existing_tags).join(", ")
 
       if raw.empty?
-        old_pat  = /@#{Regexp.escape(type)}\s*\{/
+        old_pat  = /@#{Regexp.escape(type)}(?:\[\])?\s*\{/
         new_open = "@#{type}[#{new_args}]{"
       else
         old_pat  = /@#{Regexp.escape(type)}\[#{Regexp.escape(raw)}\]\s*\{/

data/lib/mps/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MPS
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mps
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - mash-97