giterm 2.0.2 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff35951790433a2f8aee112a5f1da5753a64076def68327e1a2cf02bd99c0e18
-  data.tar.gz: fc8c53303b5b678b21e99b6312f3d93587f83ddb0c809dc51069f9c0b16bc883
+  metadata.gz: a01a43a0c33b199d4c4295839aeaa21accde4c8e9dee216c635ecc7835176e53
+  data.tar.gz: 1f0ac3d3d407e7e25e1e13513b67fff172b84d82d3ca15a70067941c4b685128
 SHA512:
-  metadata.gz: b4a1045fe19fbafe0f26a99a0da543d6c0c723d49189ac76fae28c941cd6c357bd8929c1a1e3b6b6f561f58d7fcf6129c82093b6be952467addf6759a8b7ff10
-  data.tar.gz: 333992ec11e581dd6821430a30250c32113a58480bb752bb81988296cf9578840e9940be8041e393a39ae1c83403e2ef91cfa37db14855b1b01d8d4354b25211
+  metadata.gz: 5c421275ade0738dbe055be7e0b2581471610111d125dfee77e99fb8a6a711e8416f5cf2d225a7fda1b745ebf2c41dc0c23159d37f861d2fcd09f29f20e0f1da
+  data.tar.gz: 003f4737089d19deecbac244b25201ca5fcacb97642c64abdb0f100c9b97c3abbe6519dd201f4e15e9940e0448d02f075419085f6499a1d81661ed2054c1b128

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.4'
 
 # SAVE & STORE TERMINAL {{{1
 ORIG_STTY = `stty -g 2>/dev/null`.chomp rescue ''
@@ -911,7 +911,26 @@ def github_request_http(endpoint)
 
         JSON.parse(body)
       else
-        { error: "GitHub API error: #{response.code} - #{response.message}" }
+        error_msg = case response.code
+                    when '401'
+                      'Authentication failed (token expired or invalid). Press T to update token.'
+                    when '403'
+                      remaining = response['X-RateLimit-Remaining']
+                      if remaining == '0'
+                        reset_time = response['X-RateLimit-Reset']
+                        reset_in = reset_time ? ((reset_time.to_i - Time.now.to_i) / 60.0).ceil : '?'
+                        "GitHub API rate limit exceeded. Resets in ~#{reset_in} minutes."
+                      else
+                        "Access forbidden (403). Check token permissions."
+                      end
+                    when '404'
+                      'Resource not found (404). Repository may be private or deleted.'
+                    when '429'
+                      'Too many requests (429). Please wait a moment and retry.'
+                    else
+                      "GitHub API error: #{response.code} - #{response.message}"
+                    end
+        { error: error_msg }
       end
     end
   rescue JSON::ParserError => e
@@ -931,33 +950,62 @@ end
 
 def github_request_curl(endpoint)
   begin
-    # Build curl command as a string to ensure proper formatting
+    # Build curl command with separate connect and total timeouts
     url = "https://api.github.com#{endpoint}"
-    curl_cmd = "curl -s -f --max-time 10 " \
+    curl_cmd = "curl -s --connect-timeout 10 --max-time 20 " \
+               "-w '\\n%{http_code}' " \
                "-H 'Authorization: token #{@github_token}' " \
                "-H 'Accept: application/vnd.github.v3+json' " \
                "-H 'User-Agent: GiTerm/1.0' " \
                "'#{url}'"
-    
+
     # Debug: log the curl command (without showing full token)
     debug_cmd = curl_cmd.sub(@github_token, "#{@github_token[0..10]}...")
     log_debug("Executing curl: #{debug_cmd}")
-    
+
     # Capture both stdout and stderr for better debugging
-    result = `#{curl_cmd} 2>&1`
+    raw_result = `#{curl_cmd} 2>&1`
     exit_code = $?.exitstatus
-    
-    if exit_code == 0 && !result.empty?
-      JSON.parse(result)
+
+    if exit_code == 0
+      # Extract HTTP status code from the last line (-w appends it)
+      lines = raw_result.rstrip.split("\n")
+      http_code = lines.last.strip
+      body = lines[0...-1].join("\n")
+
+      if http_code == '200' && !body.empty?
+        JSON.parse(body)
+      elsif body.empty?
+        { error: 'Empty response body from GitHub API.' }
+      else
+        error_msg = case http_code
+                    when '401'
+                      'Authentication failed (token expired or invalid). Press T to update token.'
+                    when '403'
+                      parsed = JSON.parse(body) rescue {}
+                      if parsed['message']&.include?('rate limit')
+                        'GitHub API rate limit exceeded. Wait a few minutes and retry.'
+                      else
+                        "Access forbidden (403). Check token permissions."
+                      end
+                    when '404'
+                      'Resource not found (404). Repository may be private or deleted.'
+                    when '429'
+                      'Too many requests (429). Please wait a moment and retry.'
+                    else
+                      "GitHub API error (HTTP #{http_code})."
+                    end
+        { error: error_msg }
+      end
     else
       error_msg = case exit_code
-                  when 22 then 'HTTP error (likely 401/403 - check token)'
-                  when 6 then 'Could not resolve host (network issue)'
-                  when 7 then 'Failed to connect (network issue)'
-                  when 28 then 'Operation timeout'
-                  else "curl failed (exit code: #{exit_code})"
+                  when 6 then 'Could not resolve host. Check network connection.'
+                  when 7 then 'Failed to connect to GitHub. Check network connection.'
+                  when 28 then 'Request timed out. GitHub may be slow or unreachable.'
+                  when 35 then 'SSL/TLS connection error.'
+                  else "Network error (curl exit code: #{exit_code})."
                   end
-      { error: "#{error_msg}. Response: #{result[0..100]}" }
+      { error: error_msg }
     end
   rescue JSON::ParserError => e
     { error: "Invalid JSON from curl: #{e.message}" }
@@ -1225,17 +1273,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/, ''))
@@ -1244,15 +1315,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
 
@@ -1282,20 +1354,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
@@ -1325,15 +1396,21 @@ def github_issues
   return if @selected_repo.empty?
   
   result = github_request("/repos/#{@selected_repo}/issues?state=open&per_page=50")
-  
-  if result[:error]
+
+  if result.is_a?(Hash) && result[:error]
     @p_left.say(result[:error].fg(196))
+    @p_bottom.say('Failed to load issues.')
     return
   end
-  
+
+  unless result.is_a?(Array)
+    @p_left.say('Unexpected response format from GitHub API.'.fg(196))
+    return
+  end
+
   result.each do |issue|
     next if issue['pull_request']  # Skip PRs
-    
+
     @github_issues << {
       number: issue['number'],
       title: issue['title'],
@@ -1412,12 +1489,18 @@ def github_pull_requests
   return if @selected_repo.empty?
   
   result = github_request("/repos/#{@selected_repo}/pulls?state=open&per_page=50")
-  
-  if result[:error]
+
+  if result.is_a?(Hash) && result[:error]
     @p_left.say(result[:error].fg(196))
+    @p_bottom.say('Failed to load pull requests.')
     return
   end
-  
+
+  unless result.is_a?(Array)
+    @p_left.say('Unexpected response format from GitHub API.'.fg(196))
+    return
+  end
+
   result.each do |pr|
     @github_prs << {
       number: pr['number'],
@@ -1534,14 +1617,14 @@ def github_search_repositories
   # Perform the search
   result = github_request("/search/repositories?q=#{CGI.escape(query)}&sort=stars&order=desc&per_page=50")
   
-  if result[:error]
+  if result.is_a?(Hash) && result[:error]
     @p_left.clear
     @p_left.say("Search Error: #{result[:error]}".fg(196))
     return
   end
-  
+
   # Process search results
-  if result['items'] && result['items'].any?
+  if result.is_a?(Hash) && result['items'] && result['items'].any?
     result['items'].each do |repo|
       @github_search_results << {
         id: repo['id'],

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: giterm
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.4
 platform: ruby
 authors:
 - Geir Isene
 autorequire:
 bindir: "."
 cert_chain: []
-date: 2025-08-19 00:00:00.000000000 Z
+date: 2026-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rcurses
@@ -54,7 +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.2: Fixed macOS branch selection and commit diff display issues.'
+  Version 2.0.4: Improved GitHub API error recovery with specific messages for auth,
+  rate-limit, and network failures.'
 email:
 - g@isene.com
 executables: