yamine 0.18.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43b8c059b0635ce4272b806fd2b8f70ae42ed6d591ed87536de9c86ed0419864
-  data.tar.gz: c34fb3a40d5c16442accee4dcbdb32b1b2b5013de5c3a823bade745b6ac65e88
+  metadata.gz: 4f7d162f5c1ad28d48339119a7a5f6c15e1d1b269a8e33a0a6f21b51d24be07f
+  data.tar.gz: 795408acb99c284062307bd7e08217af3b1806ccb0d4b6b47c2b0841e0439a83
 SHA512:
-  metadata.gz: 70495a26f226c3b0dac853c5a4ce1694207f4a9bbb73af92b44b37cc17ff3c13430af7440252102b8acd40f22ee7efdae5dfec26155678a5839e30b10c5c0d1a
-  data.tar.gz: e450abc81d00dad86bf03e540304ad43683e99329a60eb24ddea0122760048c88729e7fe33c9b93056a1840ec871e488ea458d1afdbd655b0dccd477369b8cb5
+  metadata.gz: 05f6fc345aa7a2f2d92194d1c3095b41b16c15b3be3bfc9d5e030eb84b8b589de349129da286242abf41af3a956999946a9f6b88edc34ab87dd8424e17ae06fd
+  data.tar.gz: c33864d1addccc46714f86556310fcd19cad835525d1b3eb800d7badc5987177406f924dcc27e77b04d4363e014042f997b0b04c5a020931e8e0d0d187687b94

data/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 ## [Unreleased]
 
+## [0.19.0] — 2026-09-27
+
+### Added
+
+- **`yamine worktree info <name> [--json]`** — detailed view of a single
+  worktree: branch, HEAD (short SHA + subject), author, commit date,
+  dirty/merged status, and any database claims. `--json` emits the same
+  data as a machine-readable hash. Follows the same safety rails as
+  `list`: main checkout is always clean, detached HEADs report n/a for
+  merged status, and the path is resolved to its real location.
+
 ## [0.18.0] — 2026-09-23
 
 ### Changed

data/lib/yamine/cli/worktree.rb

@@ -52,12 +52,13 @@ module Yamine
         sub = args.first
         case sub
         when "list", nil then list(ctx, args[1..] || [])
+        when "info" then info(ctx, args[1..] || [])
         when "add" then add(ctx, args[1..] || [])
         when "remove" then remove(ctx, args[1..] || [])
         when "clean" then clean(ctx, args[1..] || [])
         else
           raise Error,
-            "Usage: yamine worktree list | add <name> [--dir <path>] [--no-install] | " \
+            "Usage: yamine worktree list | info <name> [--json] | add <name> [--dir <path>] [--no-install] | " \
             "remove <name> [--force] | clean [--all] [--dry-run]"
         end
       end
@@ -110,6 +111,59 @@ module Yamine
         line
       end
 
+      # yamine worktree info <name> [--json]
+      #
+      # Detailed view of a single worktree: branch, HEAD, author, date,
+      # dirty/merged status, and any database claims.
+      def info(ctx, args)
+        opts, rest = take_flags(args, value_flags: [], flags: %w[--json])
+        name = rest.first
+        raise Error, "Usage: yamine worktree info <name> [--json]" unless name
+
+        repo = repo_top || abort_not_in_repo
+        entry = Worktrees.find(repo, name)
+        unless entry
+          raise Error, "no worktree named #{name.inspect} here — `yamine worktree list` shows what exists"
+        end
+
+        map = Database.load_map(ctx.store.dir)
+        claim = claim_for(map, entry.path)
+        default_branch = Worktrees.default_branch(repo)
+
+        result = Worktrees.info(repo, entry, default_branch: default_branch)
+        result[:databases] = database_names(claim)
+
+        if opts[:json]
+          require "json"
+          puts JSON.pretty_generate(result)
+        else
+          print_info(result)
+        end
+      end
+
+      def database_names(claim)
+        return [] unless claim
+
+        info = claim[1]
+        names = info.is_a?(Hash) ? info["names"] : nil
+        return [claim[0]] unless names.is_a?(Hash) && !names.empty?
+
+        names.values
+      end
+
+      def print_info(result)
+        puts "  branch     #{result[:branch]}"
+        puts "  path       #{result[:path]}"
+        puts "  HEAD       #{result[:head]}"
+        puts "  author     #{result[:author]}" if result[:author]
+        puts "  date       #{result[:date]}" if result[:date]
+        puts "  dirty      #{result[:dirty] ? "yes" : "no"}"
+        puts "  merged     #{result[:merged].nil? ? "n/a" : (result[:merged] ? "yes" : "no")}"
+        if result[:databases] && !result[:databases].empty?
+          result[:databases].each { |db| puts "  database   #{db}" }
+        end
+      end
+
       # Every database a claim stands for, one per line under the row —
       # five names inline would unreadable, and hiding them would
       # re-create the "which database is this worktree even using"

data/lib/yamine/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Yamine
-  VERSION = "0.18.0"
+  VERSION = "0.19.0"
 end

data/lib/yamine/worktrees.rb

@@ -52,6 +52,36 @@ module Yamine
       entries
     end
 
+    # Detailed information about a single worktree. Returns a Hash with
+    # keys: :branch, :path, :head, :author, :date, :dirty, :merged.
+    def info(dir, entry, default_branch: nil)
+      repo = dir
+      branch_name = entry.main? ? "main" : (entry.branch || "(detached)")
+
+      head, subject, author_name, author_email, date = commit_info(entry.path)
+
+      dirty = entry.exists? &&
+        !entry.main? &&
+        dirty?(entry.path, ignore: [])
+
+      merged = if entry.detached || entry.main?
+                 nil
+               else
+                 db = default_branch || default_branch_for(repo)
+                 merged?(repo, entry.branch, into: db)
+               end
+
+      {
+        branch: branch_name,
+        path: File.expand_path(entry.path),
+        head: head,
+        author: author_name && author_email ? "#{author_name} <#{author_email}>" : nil,
+        date: date,
+        dirty: dirty,
+        merged: merged
+      }
+    end
+
     # The worktree whose branch or directory basename is `name`.
     def find(dir, name)
       list(dir).find do |entry|
@@ -143,5 +173,30 @@ module Yamine
     rescue SystemCallError, ArgumentError
       ["", nil]
     end
+
+    # Return [short_sha, subject, author_name, author_email, iso_date]
+    # for the HEAD commit of `path`. Any field may be nil when git fails.
+    def commit_info(path)
+      out, status = git(path,
+        "log", "-1", "--format=%h\t%s\t%an\t%ae\t%aI")
+      return [nil, nil, nil, nil, nil] unless status&.success?
+
+      parts = out.strip.split("\t", 5)
+      [parts[0], parts[1], parts[2], parts[3], parts[4]]
+    rescue SystemCallError, ArgumentError
+      [nil, nil, nil, nil, nil]
+    end
+
+    # Resolve the default branch for merging comparisons.
+    def default_branch_for(repo)
+      Variant::DEFAULT_BRANCHES.each do |candidate|
+        return candidate if branch_exists?(repo, candidate)
+      end
+
+      out, status = git(repo, "symbolic-ref", "--quiet", "refs/remotes/origin/HEAD")
+      return out.strip.sub(%r{\Arefs/remotes/origin/}, "") if status&.success? && !out.strip.empty?
+
+      "master"
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yamine
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.19.0
 platform: ruby
 authors:
 - Kaka Ruto