lib/notifaction/notify.rb in notifaction-0.0.9 vs lib/notifaction/notify.rb in notifaction-0.2.0

@@ -1,77 +1,69 @@
 class Notify
   # Display a notification bubble
   def self.bubble(message, title)
-    begin
-      if Utils.os == :macosx
-        if !osx_notification(message, title)
-          raise "No handler found, cannot show bubble notification"
-        end
-      else
-        if !notifysend(message, title)
-          raise "No handler found, cannot show bubble notification"
-        #elsif zenity(message, title)
-        #  raise "No handler found, cannot show bubble notification"
-        end
-      end
-    rescue Exception => e
-      warning("[self.bubble] #{e.message}")
+    if Utils.os == :macosx
+      handler = Notifaction::Type::OSX.new
+    else
+      handler = Notifaction::Type::Linux.new
     end
+
+    handler.bubble(message, title)
+    handler.quit
   end
 
   def self.modal(message, title)
-    begin
-      if Utils.os == :macosx
-        if !osx_modal(message, title)
-          raise "No handler found, cannot show system popup"
-        end
-      end
-    rescue Exception => e
-      warning("[self.bubble] #{e.message}")
+    if Utils.os == :macosx
+      handler = Notifaction::Type::OSX.new
+    else
+      handler = Notifaction::Type::Linux.new
     end
+
+    handler.modal(message, title)
+    handler.quit
   end
 
   # Prints a pre-formatted error message to the console
-  def self.error(message, config = [])
-    # message = message.split("\n").join("\n\u2716 ")
-    # inline("\u2716 #{message} - #{Utils.formatted_time}", :red)
-    # inline("\u2716 Exiting...", :red)
-
-    # exit(1)
+  def self.error(message, config = {})
     handler = Notifaction::Type::Terminal.new
     handler.error(message, config)
-    handler.quit
+    handler.quit unless config[:auto_quit] == false
   end
 
   # Prints a pre-formatted warning message to the console
-  def self.warning(message)
-    message = message.split("\n").join("\n\u2011 ")
-    inline("\u2011 #{message} - #{Utils.formatted_time}", :yellow)
+  def self.warning(message, config = {})
+    handler = Notifaction::Type::Terminal.new
+    handler.warning(message, config)
   end
 
   # Prints a pre-formatted informational message to the console
   def self.info(message, config = {})
     handler = Notifaction::Type::Terminal.new
     handler.info(message, config)
-    #inline("#{message} - #{Utils.formatted_time}", :blue)
   end
 
   # Prints a pre-formatted secondary informational message to the console
-  def self.sinfo(message)
-    message = message.split("\n").join("\n\u2011 ")
-    inline("\u2011 #{message} - #{Utils.formatted_time}", :cyan)
+  def self.sinfo(message, config = {})
+    handler = Notifaction::Type::Terminal.new
+    handler.note(message, config)
   end
 
+  def self.note(message, config = {})
+    handler = Notifaction::Type::Terminal.new
+    handler.note(message, config)
+  end
+
   # Prints a pre-formatted success message to the console
-  def self.success(message)
-    message = message.split("\n").join("\n\u2713 ")
-    inline("\u2713 #{message} - #{Utils.formatted_time}", :green)
+  def self.success(message, config = {})
+    handler = Notifaction::Type::Terminal.new
+    handler.success(message, config)
   end
 
   # Prints a pre-formatted unstyled message to the console
-  def self.spit(message)
-    inline(message, :null)
+  def self.spit(message, config = {})
+    handler = Notifaction::Type::Terminal.new
+    handler.spit(message, config)
   end
 
   # Send status updates to WorkingOn
   def self.workingon(message, print_info_message = false)
     begin
@@ -85,12 +77,13 @@
       error("Error notifying WO - #{e.message}")
     end
   end
 
   # pretty-print a spacer
-  def self.spacer
-    inline("\u2011 =============", :magenta)
+  def self.spacer(config = {})
+    handler = Notifaction::Type::Terminal.new
+    handler.spacer(config)
   end
 
   def self.configure
     yield self if block_given?
   end
@@ -113,55 +106,6 @@
         instance_variable_set("@#{plugin}_key".to_sym, key)
       end
     end
   end
 
-  private
-  
-  # Collate colour and style, build message string in format of 
-  # "\e[#{style};#{colour}m#{text}\e[0m"
-  def self.inline(message, colour = nil, style = nil)
-    puts Style.format(message, colour, style)
-  end
-
-  def self.osx_notification(message, title)
-    begin
-      @response = `osascript -e 'display notification "#{message}" with title "#{title}"'`
-
-      $?.exitstatus == 0
-    rescue SystemExit, Interrupt
-      error("Interrupt caught, exiting")
-    end
-  end
-
-  # OSX system modal popup
-  def self.osx_modal(message, title, icon = :caution)
-    begin
-      @response = `osascript -e 'tell app "System Events" to display dialog "#{message}" buttons {"OK"} default button 1 with title "#{title}" with icon #{icon}'`
-
-      $?.exitstatus == 0
-    rescue SystemExit, Interrupt
-      error("Interrupt caught, exiting")
-    end
-  end
-
-  # Linux system notification
-  def self.notifysend(message, title)
-    begin
-      @response = `notify-send "#{title}" "#{message}"`
-
-      $?.exitstatus == 0
-    rescue SystemExit, Interrupt
-      error("Interrupt caught, exiting")
-    end
-  end
-
-  def self.zenity(message, title)
-    begin
-      @response = `echo "message:#{message}" | zenity --notification --listen`
-
-      $?.exitstatus == 0
-    rescue SystemExit, Interrupt
-      error("Interrupt caught, exiting")
-    end
-  end
 end