giterm 2.0.3 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a819be71e11539fa2d3745023e362f954b1dca51aaea25ad4af4c1636ef7d50
-  data.tar.gz: f5a4aa8801cf06cddf6f3b75ef19b0fac8b755537fe5402772353e3e98174b7f
+  metadata.gz: 53b5e1ec2107115bc1d1b4ab6f65a466b65aa5a5702855d96439c16e14428fd0
+  data.tar.gz: a3fdd847c3d070482cf3454223c48db5106d7ea06e26e5cbe0b36b5dec2953d7
 SHA512:
-  metadata.gz: 18f086fa4d30035af2c9c2264488ca02dcb247b159f67c84acf8978ac6f8268276d590dfa447b1521c90b7e6d0380b0df6a03faff3778306b99be73a7258159a
-  data.tar.gz: e79072c30b13faee5e19096c93aba231163f52259cf055ac027422aaf240983204a95529d77a10031d4bc54075e45709957da4644b1e3ac9b71631018d888407
+  metadata.gz: da1850c2c21cc3665464754db30ff51f7ea23f50578ba405425cab78ed4c03e5ccc246325d3a51b69a5474dc7ae5b45ba056efa2e8ceb53eb03bd4a009806978
+  data.tar.gz: 9d765a7501cb42d820a85dfb45a14e1c1f320f47ce36bb349f5a2b2a7803c4a8ced05da83c82649625110833e83bf8773a93802f5100ea9fbf778b45b30d3bd4

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.3'
+@version = '2.0.4'
 
 # SAVE & STORE TERMINAL {{{1
 ORIG_STTY = `stty -g 2>/dev/null`.chomp rescue ''
@@ -555,7 +555,7 @@ def show_repo_overview
     return
   end
   
-  content = "Repository Overview\n".b.fg(156)
+  content = "Repository Overview\n".bd.fg(156)
   content += ('=' * 30) + "\n\n"
   
   # Get repository information
@@ -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}" }
@@ -970,7 +1018,7 @@ def show_github_setup_in_nongit
   @mode = :status  # Use status mode but show special message
   @status_items = []  # Empty items list
   
-  content = "GiTerm - GitHub Terminal UI\n".b.fg(156)
+  content = "GiTerm - GitHub Terminal UI\n".bd.fg(156)
   content += ('=' * 35) + "\n\n"
   
   content += "Not in a Git repository\n".fg(196)
@@ -997,7 +1045,7 @@ def show_github_setup_in_nongit
   
   @p_right.clear
   if @github_token.empty?
-    help_text = "GitHub Setup Guide\n".b.fg(156)
+    help_text = "GitHub Setup Guide\n".bd.fg(156)
     help_text += ('=' * 25) + "\n\n"
     help_text += "1. Press 'T' to start token setup\n".fg(249)
     help_text += "2. Follow the instructions\n".fg(249)
@@ -1037,7 +1085,7 @@ def github_repos
   @p_bottom.say('Loading GitHub repositories...')
   
   if @github_token.empty?
-    content = "GitHub Integration Setup\n".b.fg(156)
+    content = "GitHub Integration Setup\n".bd.fg(156)
     content += ('=' * 35) + "\n\n"
     content += "[!] No GitHub token found\n\n".fg(196)
     
@@ -1160,9 +1208,9 @@ def show_repo_details(repo, immediate_extended_fetch = false)
 end
 
 def display_basic_repo_info(repo)
-  content = (repo[:full_name] || 'Unknown repository').b.fg(156) + "\n"
+  content = (repo[:full_name] || 'Unknown repository').bd.fg(156) + "\n"
   content += ('=' * 60) + "\n\n"
-  
+
   # Basic repo info with nil protection (always shown immediately)
   content += 'Description: '.fg(249) + (repo[:description] || 'No description') + "\n"
   content += 'Private: '.fg(249) + (repo[:private] ? 'Yes' : 'No') + "\n"
@@ -1190,9 +1238,9 @@ def fetch_and_display_extended_content(repo)
   log_debug("EXECUTING fetch_and_display_extended_content for: #{repo[:full_name]}")
   
   # Build the basic content again
-  content = (repo[:full_name] || 'Unknown repository').b.fg(156) + "\n"
+  content = (repo[:full_name] || 'Unknown repository').bd.fg(156) + "\n"
   content += ('=' * 60) + "\n\n"
-  
+
   content += 'Description: '.fg(249) + (repo[:description] || 'No description') + "\n"
   content += 'Private: '.fg(249) + (repo[:private] ? 'Yes' : 'No') + "\n"
   content += 'Language: '.fg(249) + (repo[:language] || 'Not specified') + "\n"
@@ -1205,7 +1253,7 @@ def fetch_and_display_extended_content(repo)
   # Fetch README
   readme_content = fetch_readme(repo[:full_name])
   if readme_content
-    content += "README.md".b.fg(154) + "\n"
+    content += "README.md".bd.fg(154) + "\n"
     content += ('-' * 20) + "\n"
     content += readme_content + "\n\n"
   end
@@ -1213,7 +1261,7 @@ def fetch_and_display_extended_content(repo)
   # Fetch directory structure
   files_content = fetch_repo_files(repo[:full_name])
   if files_content
-    content += "Repository Files".b.fg(154) + "\n" 
+    content += "Repository Files".bd.fg(154) + "\n" 
     content += ('-' * 20) + "\n"
     content += files_content
   end
@@ -1348,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'],
@@ -1405,7 +1459,7 @@ def display_github_issues
 end
 
 def show_issue_details(issue)
-  content = "##{issue[:number]} #{issue[:title]}".b.fg(156) + "\n"
+  content = "##{issue[:number]} #{issue[:title]}".bd.fg(156) + "\n"
   content += ('=' * 60) + "\n\n"
   content += 'Author: '.fg(249) + issue[:user] + "\n"
   content += 'Created: '.fg(249) + issue[:created_at] + "\n"
@@ -1435,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'],
@@ -1491,7 +1551,7 @@ def display_github_prs
 end
 
 def show_pr_details(pull_request)
-  content = "##{pull_request[:number]} #{pull_request[:title]}".b.fg(156) + "\n"
+  content = "##{pull_request[:number]} #{pull_request[:title]}".bd.fg(156) + "\n"
   content += ('=' * 60) + "\n\n"
   content += 'Author: '.fg(249) + pull_request[:user] + "\n"
   content += 'Created: '.fg(249) + pull_request[:created_at] + "\n"
@@ -1557,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'],
@@ -1633,9 +1693,9 @@ def show_search_repo_details(repo, immediate_extended_fetch = false)
 end
 
 def display_basic_search_repo_info(repo)
-  content = (repo[:full_name] || 'Unknown repository').b.fg(156) + "\n"
+  content = (repo[:full_name] || 'Unknown repository').bd.fg(156) + "\n"
   content += ('=' * 60) + "\n\n"
-  
+
   # Basic repo info with more details for search results (always shown immediately)
   content += 'Owner: '.fg(249) + (repo[:owner] || 'Unknown') + "\n"
   content += 'Description: '.fg(249) + (repo[:description] || 'No description') + "\n"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: giterm
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.5
 platform: ruby
 authors:
 - Geir Isene
 autorequire:
 bindir: "."
 cert_chain: []
-date: 2025-10-27 00:00:00.000000000 Z
+date: 2026-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rcurses
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -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.3: Improved README display with markdown filtering and urxvt-compatible
-  symbols.'
+  Version 2.0.4: Improved GitHub API error recovery with specific messages for auth,
+  rate-limit, and network failures.'
 email:
 - g@isene.com
 executables: