Handy banner method; allow for empty notice file

lib/whimsy/asf/status.rb

@@ -77,12 +77,29 @@ def self.activeIP # intended for CLI testing
   def self.notice
     path =  '/srv/whimsy/www/notice.txt'
     if File.exist? path
-      File.open(path) do |fh|
-        return fh.readline.chomp, '/notice.txt'
+      begin
+        File.open(path) do |fh|
+          return fh.readline.chomp, '/notice.txt'
+        end
+      rescue EOFError
       end
     end
     nil
   end
+
+  # return message and href path suitable for page banner
+  # Returns: {text: message, href: link} where
+  # message and link are derived from updates_disallowed_reason,
+  # failing that, notice.txt
+  # If neither are set, returns nil
+  def self.banner
+    link = nil
+    msg = updates_disallowed_reason
+    return {msg: msg, href: nil} if msg
+    msg, link = notice
+    return {msg: msg, href: link} if msg
+    return nil
+  end
 end
 
 # for debugging purposes