hiiro 0.1.325 → 0.1.327

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a61e29cf5753cc2154058877c0d6a4a5c5abff6a09ba8933ba25011dcbc580f4
-  data.tar.gz: ac848fa9c6d775348d4c52d6a015e14415029e115bc29db01c9f8134dcbdb4fc
+  metadata.gz: 5b59bf7d57b8661136281afe559d7fb3afd1e7fa090483f556074be405aa69a4
+  data.tar.gz: '08e9ff25437d1991c0f75007cabeb0bc993fb8e8a98225538fbd39b9e0baf71d'
 SHA512:
-  metadata.gz: b3625f77565d8090239e7dc71d90b8b55f1f844e9020c3f180238410a3a17a443fc2481adf89875ab2b960f79e9f8223b8e6651a7af58ee21b1d3640c4d0ce5f
-  data.tar.gz: 606b45991e1ecda0a01c634483d9064ae85e912c97e7386c793e7580bf92eaaf52387e00aa23ea330cd3b2af8e4d9843e7308ad299c64dc2af3dbf2c35a4fac7
+  metadata.gz: 2e4cc0a15c2216ebd6f4a3159b72b1a9cb9b2beda9fb47f0aede821c4024f8f95743838df19d0068edd5e0b1ec37001e5d4f68bbce4f3aa09fa15383376b9066
+  data.tar.gz: 103b722f78dbd84c6680ba171f3c60c69cf3848017b79ccb42a1e30f6eab10645cc1ace1e6edbec1280199dad00e1f55dc22f0e4f19f20990ff3723fcbe233fd

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## [0.1.327] - 2026-04-02
+
+### Added
+- `h branch save --tag <tag>` (repeatable) — apply tags to branches during save operation
+
+## [0.1.326] - 2026-04-02
+
+### Changed
+- Improve tag display formatting in link output by mapping individual tags to colored badges
+- Refactor `h link tags` filtering logic to use `Hiiro::Tag` helpers for cleaner code
+- Relocate `taggable` accessor method in `Hiiro::Tag` model
+
+### Added
+- `Hiiro::Tag.tagged_by_type` helper method to query tagged objects by tag name and type
+
 ## [0.1.325] - 2026-04-02
 
 ### Fixed

data/bin/h-branch

@@ -245,7 +245,17 @@ Hiiro.run(*ARGV) do
   }
 
   add_subcmd(:edit) { edit_files(__FILE__) }
-  add_subcmd(:save) { |branch_name = nil| manager.save(branch_name) }
+  add_subcmd(:save) do |*save_args|
+    opts        = Hiiro::Options.parse(save_args) { option(:tag, short: 't', desc: 'Tag to apply (repeatable)', multi: true) }
+    branch_name = opts.args.first
+    manager.save(branch_name)
+    tags = Array(opts.tag).reject(&:empty?)
+    if tags.any?
+      branch_name ||= git.branch
+      tag_store.add(branch_name, *tags)
+      puts "Tagged with: #{tags.join(', ')}"
+    end
+  end
 
   add_subcmd(:saved) do |*saved_args|
     data = manager.load_data

data/bin/h-link

@@ -528,22 +528,11 @@ Hiiro.run(*ARGV, plugins: [Pins], links_file: lm.links_file) do
   end
 
   add_subcmd(:tags) do |*tag_args|
-    all_known = Hiiro::Tag.tags_by_type('Link')
-    filtered = all_known.select{|t|
-      tag_args.any?{|ta| t.start_with?(ta) }
-    }
-
-    if filtered.empty?
-      puts "No tags found."
-    else
-      filtered.each do |tag_name|
-        ids = Hiiro::Tag.where(taggable_type: 'Link', name: tag_name).select(:taggable_id).map(&:taggable_id).map(&:to_i)
-        # links = lm.load_links.select  |link| tagged_ids.include?(link.id) }
-        links = Hiiro::Link.where(id: ids)
-        puts "#{tag_name}:"
-        links.each { |link| puts "  #{link.display_string(exclude_tags: [tag_name])}" }
-      end
-    end
+    Hiiro::Tag.search(tag_args, type: 'Link').each do |tag|
+      links = Hiiro::Tag.tagged_by_type(tag, 'Link')
+      puts "#{tag}:"
+      links.each { |link| puts "  #{link.display_string(exclude_tags: [tag])}" }
+    end.empty? && puts("No tags found!")
   end
 
   add_subcmd(:paste) do |*paste_args|

data/bin/h-tags

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+
+require 'hiiro'
+
+Hiiro.run do
+  add_subcmd(:tags_by_type) do |*args|
+    # use options to determine if we want a tag or the object?
+    tags = Hiiro::Tag.tags_by_type(args)
+    puts tags
+
+    tagged = tags.flat_map{|tag|
+      Hiiro::Tag.tagged_by_type(tag, args)
+    }
+    puts tagged
+    binding.pry
+  end
+end
+

data/lib/hiiro/link.rb

@@ -45,7 +45,7 @@ class Hiiro
       shorthand_str = shorthand ? " [#{shorthand}]" : ""
       desc_str = description.to_s.empty? ? "" : " - #{description}"
       link_tags = tags - Array(exclude_tags)
-      tags_str = link_tags.any? ? " \e[30;104m#{link_tags.join(' ')}\e[0m" : ""
+      tags_str = link_tags.any? ? " " + link_tags.map { |t| "\e[30;104m#{t}\e[0m" }.join(' ') : ""
       "#{num}#{shorthand_str} #{url}#{desc_str}#{tags_str}".strip
     end
 

data/lib/hiiro/tags.rb

@@ -4,64 +4,93 @@ class Hiiro
   class Tag < Sequel::Model(:tags)
     Hiiro::DB.register(self)
 
-    def self.create_table!(db)
-      db.create_table?(:tags) do
-        primary_key :id
-        String :name, null: false           # tag value, e.g. "oncall"
-        String :taggable_type, null: false  # e.g. "Branch", "PinnedPr", "Task"
-        String :taggable_id, null: false    # string id of tagged object
-        String :created_at
-        unique [:name, :taggable_type, :taggable_id]
+    class << self
+      def create_table!(db)
+        db.create_table?(:tags) do
+          primary_key :id
+          String :name, null: false           # tag value, e.g. "oncall"
+          String :taggable_type, null: false  # e.g. "Branch", "PinnedPr", "Task"
+          String :taggable_id, null: false    # string id of tagged object
+          String :created_at
+          unique [:name, :taggable_type, :taggable_id]
+        end
       end
-    end
 
-    # Polymorphic accessor — returns the tagged object
-    def taggable
-      klass = Hiiro.const_get(taggable_type) rescue nil
-      klass&.[](taggable_id)
-    end
+      def all_tags
+        select(:name).distinct
+      end
 
-    # Returns all Tag rows for a given object
-    def self.tags_by_type(type)
-      where(taggable_type: type.to_s).select(:name).distinct.map(&:name).sort
-    end
+      def filter(terms, tags=all_tags)
+        $stderr.puts("tags class: #{tags.class}")
+        $stderr.puts("terms count: #{terms.count}")
+        return tags if terms.empty?
 
-    # Returns all Tag rows for a given object
-    def self.for(obj)
-      t = obj.class.name.split('::').last
-      where(taggable_type: t, taggable_id: obj.id.to_s)
-    end
+        conditions = terms.map{|q| Sequel.like(:name, "%#{q}%") }
+        tags.where(Sequel.|(*conditions)).all
 
-    # Returns all Tag rows with a given name
-    def self.named(tag_name)
-      where(name: tag_name.to_s)
-    end
+        # tags.select{|tag|
+        #   terms.any?{|term| tag.start_with?(term) }
+        # }
+      end
 
-    # Returns all tagged objects across all types for a tag name
-    def self.everything_tagged(tag_name)
-      named(tag_name).map(&:taggable).compact
-    end
+      def search(*terms, type: nil)
+          filter(terms.flatten, tags_by_type(type))
+      end
+
+      # Returns all Tag rows for a given object
+      def tags_by_type(type=nil)
+        return all_tags if type.nil?
+
+        where(taggable_type: type).select(:name).distinct.map(&:name).sort
+      end
 
-    # Idempotent tag assignment
-    def self.tag!(obj, *tag_names)
-      t = obj.class.name.split('::').last
-      tag_names.each do |name|
-        find_or_create(
-          name: name.to_s,
+      # Returns all Tag rows for a given object
+      def for(obj)
+        t = obj.class.name.split('::').last
+        where(taggable_type: t, taggable_id: obj.id.to_s)
+      end
+
+      # Returns all Tag rows with a given name
+      def named(tag_name)
+        where(name: tag_name.to_s)
+      end
+
+      def tagged_by_type(tag, type)
+        where(name: tag, taggable_type: type).map(&:taggable)
+      end
+
+      # Returns all tagged objects across all types for a tag name
+      def everything_tagged(tag_name)
+        named(tag_name).map(&:taggable).compact
+      end
+
+      # Idempotent tag assignment
+      def tag!(obj, *tag_names)
+        t = obj.class.name.split('::').last
+        tag_names.each do |name|
+          find_or_create(
+            name: name.to_s,
+            taggable_type: t,
+            taggable_id: obj.id.to_s
+          ) { |tag| tag.created_at = Time.now.iso8601 }
+        end
+      end
+
+      # Remove tags from an object
+      def untag!(obj, *tag_names)
+        t = obj.class.name.split('::').last
+        where(
           taggable_type: t,
-          taggable_id: obj.id.to_s
-        ) { |tag| tag.created_at = Time.now.iso8601 }
+          taggable_id: obj.id.to_s,
+          name: tag_names.map(&:to_s)
+        ).delete
       end
     end
 
-    # Remove tags from an object
-    def self.untag!(obj, *tag_names)
-      t = obj.class.name.split('::').last
-      where(
-        taggable_type: t,
-        taggable_id: obj.id.to_s,
-        name: tag_names.map(&:to_s)
-      ).delete
+    # Polymorphic accessor — returns the tagged object
+    def taggable
+      klass = Hiiro.const_get(taggable_type) rescue nil
+      klass&.[](taggable_id)
     end
   end
 

data/lib/hiiro/version.rb

@@ -1,3 +1,3 @@
 class Hiiro
-  VERSION = "0.1.325"
+  VERSION = "0.1.327"
 end

data/script/diffhome

@@ -2,5 +2,7 @@
 
 diff_bin = File.join(__dir__, 'diff')
 
+puts(diff_bin:,ARGV:)
+
 system(diff_bin, *ARGV)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hiiro
 version: !ruby/object:Gem::Version
-  version: 0.1.325
+  version: 0.1.327
 platform: ruby
 authors:
 - Joshua Toyota
@@ -151,6 +151,7 @@ files:
 - bin/h-session
 - bin/h-sha
 - bin/h-sparse
+- bin/h-tags
 - bin/h-title
 - bin/h-todo
 - bin/h-window