giterm 2.0.1 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 229379dde6560a251c0f3fa707cdff309ce89f88995de14e99e45677555b4d68
-  data.tar.gz: 07f66329742e50a817683c73a196989c400b6dbf6083eb7e2eccfaa2108052a4
+  metadata.gz: 2a819be71e11539fa2d3745023e362f954b1dca51aaea25ad4af4c1636ef7d50
+  data.tar.gz: f5a4aa8801cf06cddf6f3b75ef19b0fac8b755537fe5402772353e3e98174b7f
 SHA512:
-  metadata.gz: 47193398f0cb94ef112bad6d2619928b56566b5c00befb9a5a67432e6d29ac13f18a020a6a88dbc540d18d5e55773ebac124813e4be2746b4893f89a216dbbb7
-  data.tar.gz: 4c6e0492c0b70772b42fb494cce31e3108fab5e0fa7c642327f61941c8fc89c9ae908c300e3cb516e09d25aa0673eda73cfad8a1154e3200a7dbb24b372039da
+  metadata.gz: 18f086fa4d30035af2c9c2264488ca02dcb247b159f67c84acf8978ac6f8268276d590dfa447b1521c90b7e6d0380b0df6a03faff3778306b99be73a7258159a
+  data.tar.gz: e79072c30b13faee5e19096c93aba231163f52259cf055ac027422aaf240983204a95529d77a10031d4bc54075e45709957da4644b1e3ac9b71631018d888407

data/README.md

@@ -1,6 +1,7 @@
 # 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)

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.1'
+@version = '2.0.3'
 
 # SAVE & STORE TERMINAL {{{1
 ORIG_STTY = `stty -g 2>/dev/null`.chomp rescue ''
@@ -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
@@ -1170,17 +1225,40 @@ rescue => e
   log_debug("Error in extended fetch: #{e.message}")
 end
 
+def filter_markdown_clutter(text)
+  # Remove badge markdown (both simple and nested)
+  # Matches: ![text](url) and [![text](url)](link)
+  text = text.gsub(/!\[(?:[^\]]*\[[^\]]*\][^\]]*|[^\]]*)\]\([^\)]+\)/, '')
+
+  # Remove HTML image tags
+  text = text.gsub(/<img[^>]*>/, '')
+
+  # Remove HTML break tags
+  text = text.gsub(/<br[^>]*>/, '')
+
+  # Remove lines that are only badges/links (leftover clutter)
+  text = text.lines.reject { |line| line.strip.match?(/^[\[\]():\/.a-zA-Z0-9_-]+$/) && line.include?('](') }.join
+
+  # Remove excessive blank lines (more than 2 consecutive)
+  text = text.gsub(/\n{3,}/, "\n\n")
+
+  # Remove lines that are only whitespace
+  text = text.lines.reject { |line| line.strip.empty? && line != "\n" }.join
+
+  text.strip
+end
+
 def fetch_readme(repo_full_name)
   return nil unless repo_full_name
-  
+
   # Try different README variations
   readme_files = ['README.md', 'readme.md', 'README.txt', 'README', 'readme.txt']
-  
+
   readme_files.each do |filename|
     begin
       result = github_request("/repos/#{repo_full_name}/contents/#{filename}")
       next if result.is_a?(Hash) && result[:error]
-      
+
       # Decode base64 content
       if result.is_a?(Hash) && result['content'] && result['encoding'] == 'base64'
         decoded = Base64.decode64(result['content'].gsub(/\s/, ''))
@@ -1189,15 +1267,16 @@ def fetch_readme(repo_full_name)
         unless decoded.valid_encoding?
           decoded = decoded.encode('UTF-8', 'binary', invalid: :replace, undef: :replace, replace: '?')
         end
-        # Limit README display to avoid overwhelming the pane
-        return decoded.lines.first(20).join.strip
+        # Filter markdown clutter and limit README display
+        filtered = filter_markdown_clutter(decoded)
+        return filtered.lines.first(20).join.strip
       end
     rescue => e
       log_debug("Error fetching README #{filename}: #{e.message}")
       next
     end
   end
-  
+
   nil
 end
 
@@ -1227,20 +1306,19 @@ def fetch_repo_files(repo_full_name, path = '')
     # Show directories first, then files
     (dirs + files).each do |item|
       icon = case item['type']
-             when 'dir' then '📁'
+             when 'dir' then '▶'
              when 'file'
                case File.extname(item['name']).downcase
-               when '.md' then '📄'
-               when '.rb' then '💎'
-               when '.py' then '🐍'
-               when '.js' then '📜'
-               when '.json' then '⚙️'
-               when '.yml', '.yaml' then '⚙️'
-               else '📄'
+               when '.md' then '•'
+               when '.rb' then '★'
+               when '.py' then '▪'
+               when '.js' then '▷'
+               when '.json', '.yml', '.yaml' then '⚙'
+               else '◦'
                end
-             else '❓'
+             else '?'
              end
-      
+
       size_info = item['size'] ? " (#{format_file_size(item['size'])})" : ""
       content += "#{icon} #{item['name']}#{size_info}\n"
     end
@@ -2127,8 +2205,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)
@@ -2259,7 +2362,7 @@ def update_right_pane(fast_update = false)
   when :log
     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.1
+  version: 2.0.3
 platform: ruby
 authors:
 - Geir Isene
 autorequire:
 bindir: "."
 cert_chain: []
-date: 2025-08-19 00:00:00.000000000 Z
+date: 2025-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rcurses
@@ -54,8 +54,8 @@ 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.1: Fixed macOS log display issue and added alternative keybindings for
-  PageUp/PageDown.'
+  Version 2.0.3: Improved README display with markdown filtering and urxvt-compatible
+  symbols.'
 email:
 - g@isene.com
 executables: