astropanel 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a158fe0fa70e2dfac28d4a6a2173f7004e5a380838110eacd0c6788070470ed
-  data.tar.gz: e151830dfe26f406a7248597ebddccafb632ba6f8395f8157384a17545b32e13
+  metadata.gz: d9868bc13e6a6ee12c977d549646731414134fa1a3efcc369011f4ab905ac19e
+  data.tar.gz: eeecdb2b16dafa1d5fb7c7eed003786ade001843be356051ccaa3d9093e19c4d
 SHA512:
-  metadata.gz: d29cb83902e206efc8debf85825b7d9b44abcf9a757f792d0ea4ab49a5e37e4bf26162e510ad0aae26ac8188a35e4a4e85ec9355b66e7476c1925b6927229641
-  data.tar.gz: 524612c6ca90cded7b63dacce28e0fbb8351cf511ce902b86b5ed2e914002ab849488bf93ed44a0bd59cb7fc4e281a8de4042d7be245c722aa877317c024e993
+  metadata.gz: f63cb7786331c386cb05cf098fb70f6e22722e2ec56c020d84fac57840769420342d16f36cd4335e199044bb1aa70d3f8880e97c3a9496509659c28d0b56fed0
+  data.tar.gz: 3363eab644b0fde17f2dbf0c4f5b9d2982e48527edb9355510ae3fc5c2566d90cedbec9fd76fb84719cdc733bd11a73d8042ad46e81b7758d52242720defd94e

data/bin/astropanel

@@ -14,7 +14,7 @@
 #             for any damages resulting from its use. Further, I am under no
 #             obligation to maintain or extend this software. It is provided 
 #             on an 'as is' basis without any expressed or implied warranty.
-# Version:    4.1.0: Modern image display using termpix gem
+# Version:    4.1.1: Add network error handling & input validation
 #             for Ruby 3.4+ compatibility
 
 # LOAD MODULES {{{1
@@ -559,19 +559,19 @@ class AstroPanelApp
       end
     end
 
-    # 8) Bortle scale (0.0–9.0) {{{3
+    # 8) Bortle scale (1..9) {{{3
     loop do
-      input = @footer.ask("Bortle scale (0.0–9.0): ", "")
+      input = @footer.ask("Bortle scale (1..9): ", "")
       if input.strip.empty?
         @footer.say("Bortle value is required")
         next
       end
       val = input.to_f
-      if (0.0..9.0).include?(val)
+      if (1.0..9.0).include?(val)
         @bortle = val
         break
       else
-        @footer.say("Enter a number between 0.0 and 9.0")
+        @footer.say("Enter a number between 1 and 9")
       end
     end
   end
@@ -667,7 +667,7 @@ class AstroPanelApp
           # Display new image using termpix (same positioning as original)
           @termpix.show(file,
             x: @main.x - 1,
-            y: 24,
+            y: 27,
             max_width: @main.w - 3,
             max_height: rows - 26)
           @current_image = file
@@ -719,9 +719,15 @@ class AstroPanelApp
   end
 
   def apod # {{{2
-    html = Net::HTTP.get(URI('https://apod.nasa.gov/apod/astropix.html'))
+    begin
+      html = Net::HTTP.get(URI('https://apod.nasa.gov/apod/astropix.html'))
+    rescue SocketError, Socket::ResolutionError, Timeout::Error,
+           Net::OpenTimeout, Net::ReadTimeout, Errno::ECONNREFUSED,
+           Errno::EHOSTUNREACH, Errno::ENETUNREACH, OpenURI::HTTPError => e
+      return @footer.say("APOD unavailable (network error: #{e.class})")
+    end
     img  = html[/IMG SRC="(.*?)"/,1]
-    return @footer.say("⚠️ could not parse APOD URL") unless img
+    return @footer.say("Could not parse APOD URL") unless img
 
     full = "https://apod.nasa.gov/apod/#{img}"
     tmp  = "/tmp/apod.jpg"
@@ -731,10 +737,10 @@ class AstroPanelApp
         @current_image = tmp
         show_image(@current_image)
       else
-        @footer.say("⚠️ empty apod.jpg")
+        @footer.say("Empty apod.jpg")
       end
     else
-      @footer.say("⚠️ curl APOD failed")
+      @footer.say("APOD download failed")
     end
   end
 
@@ -844,8 +850,9 @@ class AstroPanelApp
     if @main.update
       update_main
       @main.update = false
+      show_image(@current_image) if @current_image
     end
-    
+
     update_titles # Always update titles as they're lightweight
   end
 
@@ -1056,13 +1063,31 @@ class AstroPanelApp
     when 'END'     then @index = @weather.size - 1
     when '?'       then @main.say(HELP); getchr; @main.update = true
     when 'l'       then @loc           = @footer.ask('Loc? ', @loc); @header.update = @footer.update = true
-    when 'a'       then @lat           = @footer.ask('Lat? ', @lat.to_s).to_f; @header.update = @footer.update = true
-    when 'o'       then @lon           = @footer.ask('Lon? ', @lon.to_s).to_f; @header.update = @footer.update = true
+    when 'a'
+      val = @footer.ask('Lat? (-90..90) ', @lat.to_s).to_f
+      if (-90.0..90.0).include?(val)
+        @lat = val; @header.update = @footer.update = true
+      else
+        @footer.say("Latitude must be -90..90"); @footer.update = true
+      end
+    when 'o'
+      val = @footer.ask('Lon? (-180..180) ', @lon.to_s).to_f
+      if (-180.0..180.0).include?(val)
+        @lon = val; @header.update = @footer.update = true
+      else
+        @footer.say("Longitude must be -180..180"); @footer.update = true
+      end
     when 'c'       then @cloudlimit    = @footer.ask('Maximum Cloud coverage? ', @cloudlimit.to_s).to_i; @footer.update = true
     when 'h'       then @humiditylimit = @footer.ask('Maximum Humidity? ', @humiditylimit.to_s).to_i; @footer.update = true
     when 't'       then @templimit     = @footer.ask('Minimum Temperature? ', @templimit.to_s).to_i; @footer.update = true
     when 'w'       then @windlimit     = @footer.ask('Maximum Wind? ', @windlimit.to_s).to_i; @footer.update = true
-    when 'b'       then @bortle        = @footer.ask('Bortle? ', @bortle.to_s).to_f; @footer.update = true
+    when 'b'
+      val = @footer.ask('Bortle? (1..9) ', @bortle.to_s).to_f
+      if (1.0..9.0).include?(val)
+        @bortle = val; @footer.update = true
+      else
+        @footer.say("Bortle must be 1..9"); @footer.update = true
+      end
     when 'e'       then show_all_events; @main.update = true
     when 's'       then starchart; @main.update = true
     when 'S'       then system("xdg-open /tmp/starchart.jpg &")
@@ -1197,7 +1222,14 @@ class AstroPanelApp
       "https://in-the-sky.org/rss.php?feed=dfan"\
       "&latitude=#{@lat}&longitude=#{@lon}&timezone=#{@loc}"
     )
-    raw = Net::HTTP.get(uri)
+    begin
+      raw = Net::HTTP.get(uri)
+    rescue SocketError, Socket::ResolutionError, Timeout::Error,
+           Net::OpenTimeout, Net::ReadTimeout, Errno::ECONNREFUSED,
+           Errno::EHOSTUNREACH, Errno::ENETUNREACH, OpenURI::HTTPError => e
+      @footer.say("Events unavailable (network error: #{e.class})")
+      return
+    end
 
     raw.scan(/<item>(.*?)<\/item>/m).each do |match|
       item = match.first
@@ -1233,9 +1265,10 @@ end
 # START PROGRAM {{{1
 begin
   # a single quick DNS + TCP check
-  TCPSocket.new('api.met.no', 443).close
-rescue SocketError, Socket::ResolutionError => e
-  $stderr.puts "FATAL: can't resolve api.met.no – network appears down (#{e.message})"
+  Timeout.timeout(5) { TCPSocket.new('api.met.no', 443).close }
+rescue SocketError, Socket::ResolutionError, Timeout::Error,
+       Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::ENETUNREACH => e
+  $stderr.puts "Cannot reach api.met.no, network appears down (#{e.class}: #{e.message})"
   $stdin.cooked!
   $stdin.echo = true
   exit!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: astropanel
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.1
 platform: ruby
 authors:
 - Geir Isene
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-10-27 00:00:00.000000000 Z
+date: 2026-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rcurses
@@ -38,7 +38,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
-description: 'AstroPanel v4.1.0: Modern image display using termpix gem with Sixel
+description: 'AstroPanel v4.1.1: Modern image display using termpix gem with Sixel
   and w3m protocol support. This program shows essential data in order to plan your
   observations: 9 days weather forecast, full ephemeris for the Sun, the Moon and
   all major planets, complete with graphic representation of rise/set times, detailed