giterm 2.0.0 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d08422f350db0a6c412976efa59390a7656c829d2b1824727b6ddc0bf2791d95
-  data.tar.gz: f062623e119308431c2c03223f8cb83c0e3bcbacf6d1c0262e813b6234038e65
+  metadata.gz: ff35951790433a2f8aee112a5f1da5753a64076def68327e1a2cf02bd99c0e18
+  data.tar.gz: fc8c53303b5b678b21e99b6312f3d93587f83ddb0c809dc51069f9c0b16bc883
 SHA512:
-  metadata.gz: 4dbec9b0e38d2137f9722222caa0daf0fad5e12589296cf7d4560720a1a7f551ba4b3501460a3623ee4e9040c22634180d4964cbbcb5661903f37721f62c5688
-  data.tar.gz: 267e784b7651610f26afdbd1da8ca106eac503d77abc19aac35fc1b74ee4dc17d43e4788e61eb99b26dcc96dd6ab31a8e1fd3f016d7c8279a98453a2a57e7a24
+  metadata.gz: b4a1045fe19fbafe0f26a99a0da543d6c0c723d49189ac76fae28c941cd6c357bd8929c1a1e3b6b6f561f58d7fcf6129c82093b6be952467addf6759a8b7ff10
+  data.tar.gz: 333992ec11e581dd6821430a30250c32113a58480bb752bb81988296cf9578840e9940be8041e393a39ae1c83403e2ef91cfa37db14855b1b01d8d4354b25211

data/README.md

@@ -1,4 +1,11 @@
-# GiTerm - Git & GitHub Terminal User Interface
+# GiTerm - Git & GitHub Terminal User Interface
+
+<img src="img/giterm_logo.svg" align="left" width="150" height="150">
+<br clear="left"/>
+
+[![License](https://img.shields.io/badge/License-Public%20Domain-brightgreen.svg)](https://unlicense.org/)
+[![GitHub stars](https://img.shields.io/github/stars/isene/GiTerm.svg)](https://github.com/isene/GiTerm/stargazers)
+[![Stay Amazing](https://img.shields.io/badge/Stay-Amazing-blue.svg)](https://isene.org)
 
 ![Ruby](https://img.shields.io/badge/language-Ruby-red) [![Gem Version](https://badge.fury.io/rb/giterm.svg)](https://badge.fury.io/rb/giterm) ![License](https://img.shields.io/badge/license-Public_Domain-green)
 
@@ -201,4 +208,4 @@ Public Domain - Use freely for any purpose.
 ## See Also
 
 - [RTFM](https://github.com/isene/RTFM) - Ruby Terminal File Manager
-- [rcurses](https://github.com/isene/rcurses) - Ruby curses library used by GiTerm
+- [rcurses](https://github.com/isene/rcurses) - Ruby curses library used by GiTerm

data/giterm

@@ -7,7 +7,7 @@
 # Author:     Geir Isene <g@isene.com> (adapted from RTFM)
 # Github:     https://github.com/isene/GiTerm
 # License:    Public domain
-@version = '2.0.0'
+@version = '2.0.1'
 
 # SAVE & STORE TERMINAL {{{1
 ORIG_STTY = `stty -g 2>/dev/null`.chomp rescue ''
@@ -236,9 +236,9 @@ def handle_popup_scrolling(popup)
       popup.linedown
     when 'k', 'UP'
       popup.lineup
-    when 'PgDOWN'
+    when 'PgDOWN', 'f'  # 'f' as alternative for keyboards without PgDn
       popup.pagedown
-    when 'PgUP'
+    when 'PgUP', 'F'  # 'F' as alternative for keyboards without PgUp
       popup.pageup
     when 'ENTER', ' ', 'q', 'ESCAPE'
       break
@@ -310,8 +310,8 @@ end
     l/RIGHT = Enter/view details
     g/HOME  = Go to top
     G/END   = Go to bottom
-    PgDown  = Page down in right pane
-    PgUp    = Page up in right pane
+    f/PgDn  = Page down in left pane
+    F/PgUp  = Page up in left pane
     S-RIGHT = Page down in right pane
     S-LEFT  = Page up in right pane
 
@@ -416,7 +416,7 @@ end
 
 def update_bottom_legends
   # Show key legends in bottom pane
-  legends = 'j/k:Nav  PgUp/PgDn:Page  g/G:Top/End  J/K:Scroll  d:Diff  l:Log  b:Branches  TAB:GitHub  q:Quit'
+  legends = 'j/k:Nav  f/F:Page  g/G:Top/End  J/K:Scroll  d:Diff  l:Log  b:Branches  TAB:GitHub  q:Quit'
   @p_bottom.say(legends)
 end
 
@@ -708,12 +708,67 @@ def display_log
 end
 
 def show_commit_details(hash)
-  details = `git show --stat #{hash} 2>/dev/null`
+  # Show full commit with diff, not just stats
+  details = `git show #{hash} 2>/dev/null`
   
   @p_right.clear
   @p_right.say(details)
 end
 
+def show_branch_details(branch)
+  return unless branch
+  
+  @p_right.clear
+  
+  branch_name = branch[:name]
+  
+  # Show branch information
+  info = "Branch: #{branch_name}\n\n"
+  
+  if branch[:current]
+    info += "Status: Currently checked out\n\n"
+  else
+    info += "Status: Not checked out\n\n"
+  end
+  
+  # Show last 10 commits on this branch
+  info += "Recent commits:\n" + '─' * 40 + "\n\n"
+  
+  # Get commit log for this branch
+  if branch_name.start_with?('remotes/')
+    # For remote branches, use the full name
+    log_output = `git log --oneline -10 #{branch_name} 2>/dev/null`
+  else
+    # For local branches
+    log_output = `git log --oneline -10 #{branch_name} 2>/dev/null`
+  end
+  
+  if log_output.empty?
+    info += "No commits found on this branch\n"
+  else
+    info += log_output
+  end
+  
+  # Show branch tracking info if available
+  if !branch_name.start_with?('remotes/')
+    tracking = `git rev-parse --abbrev-ref #{branch_name}@{upstream} 2>/dev/null`.strip
+    unless tracking.empty?
+      info += "\n" + '─' * 40 + "\n"
+      info += "Tracking: #{tracking}\n"
+      
+      # Show ahead/behind status
+      ahead_behind = `git rev-list --left-right --count #{branch_name}...#{tracking} 2>/dev/null`.strip
+      unless ahead_behind.empty?
+        ahead, behind = ahead_behind.split("\t")
+        info += "Ahead: #{ahead} commits\n" if ahead.to_i > 0
+        info += "Behind: #{behind} commits\n" if behind.to_i > 0
+      end
+    end
+  end
+  
+  @p_right.say(info)
+end
+
 def git_branches
   unless @is_git_repo
     @p_left.clear
@@ -1707,7 +1762,7 @@ def handle_key(chr)
     
     # Use fast update for major jumps to avoid extended fetch delays
     update_right_pane(true)
-  when 'PgDOWN'
+  when 'PgDOWN', 'f'  # 'f' as alternative to PageDown for keyboards without PgDn key
     # Page down in left pane
     old_index = @index
     @index = [@index + @p_left.h - 3, @max_index].min
@@ -1743,7 +1798,7 @@ def handle_key(chr)
     
     # Show basic info immediately, schedule extended fetch for when user pauses  
     update_right_pane(true)
-  when 'PgUP'
+  when 'PgUP', 'F'  # 'F' as alternative to PageUp for keyboards without PgUp key
     # Page up in left pane
     old_index = @index
     @index = [@index - @p_left.h + 3, @min_index].max
@@ -2127,8 +2182,33 @@ def update_log_selection(old_index, new_index)
 end
 
 def update_branches_selection(old_index, new_index)
-  # Implement if needed for branches mode
-  refresh_view
+  return if @branches.empty?
+  
+  lines_to_update = []
+  
+  # Update old selection (remove marker)
+  if old_index >= 0 && old_index < @branches.length
+    branch = @branches[old_index]
+    if branch[:current]
+      old_line = '  * ' + branch[:name].fg(154)
+    else
+      old_line = '    ' + branch[:name]
+    end
+    lines_to_update << { index: old_index, content: old_line }
+  end
+  
+  # Update new selection (add marker)
+  if new_index >= 0 && new_index < @branches.length
+    branch = @branches[new_index]
+    if branch[:current]
+      new_line = '→ * ' + branch[:name].fg(154)
+    else
+      new_line = '→   ' + branch[:name]
+    end
+    lines_to_update << { index: new_index, content: new_line }
+  end
+  
+  update_pane_lines(lines_to_update)
 end
 
 def update_github_search_selection(old_index, new_index)
@@ -2257,9 +2337,9 @@ def update_right_pane(fast_update = false)
       end
     end
   when :log
-    show_commit_details(@log_entries[@index]) if @index >= 0 && @index < @log_entries.length
+    show_commit_details(@log_entries[@index][:hash]) if @index >= 0 && @index < @log_entries.length
   when :branches
-    # Handle branch details if needed
+    show_branch_details(@branches[@index]) if @index >= 0 && @index < @branches.length
   when :github_repos
     log_debug("GitHub repos mode: showing repo #{@index}/#{@github_repos.length}")
     show_repo_details(@github_repos[@index], !fast_update) if @index >= 0 && @index < @github_repos.length

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: giterm
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.2
 platform: ruby
 authors:
 - Geir Isene
 autorequire:
 bindir: "."
 cert_chain: []
-date: 2025-08-15 00:00:00.000000000 Z
+date: 2025-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rcurses
@@ -54,8 +54,7 @@ dependencies:
         version: '13.0'
 description: 'GiTerm is a powerful terminal interface for Git and GitHub, providing
   an intuitive TUI for repository management, issue tracking, and pull request handling.
-  Version 2.0.0: Breaking change - requires rcurses 6.0.0+ with explicit initialization
-  for Ruby 3.4+ compatibility.'
+  Version 2.0.2: Fixed macOS branch selection and commit diff display issues.'
 email:
 - g@isene.com
 executables: