notifaction 0.0.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 514d8e96cf96f632d010335afd0347b2de5025e5
-  data.tar.gz: 478edc696fc6ec139e9040d2f83c404ee5e10a34
+  metadata.gz: 28a65b85fb1a825f7af8225c38e01d8d614aa2a3
+  data.tar.gz: 664caaee8dd66d0a045d381d5bddaca4823e44b1
 SHA512:
-  metadata.gz: ee30e73c53dd80cdacdeffae606899e29e8c55bd606d5847b541515c37ef48c495d61aab121e6daf90f1d4decaefff58e95758b133d7066d7eec5eeb8ab78d29
-  data.tar.gz: e4a13582cd36cae2de6cb2ba18a9a35d5bee0d87b802c2b87b7971f85bebd93b7dad3587636fa122b99f3f90505551c96d885cdcd0cc982f07431bf5885643bf
+  metadata.gz: 5db2dd9639e975b4b6a22ba4562f654f01ba9fd27c88bbe1437378178d63d1aa3ff0f50b52aea40f0af657c5a2b8780c558c381fdf3dbd0f81c3fab1c7a4d56e
+  data.tar.gz: 12f6946a537c61dec18da6f78b9a070cb9252231e8d2915e90ea665496fac8634bcefedfc7c7cb06c0485132f871dca982943444808e0ec9c4463d468767722b

data/lib/notifaction/notify.rb

@@ -1,75 +1,67 @@
 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
@@ -87,8 +79,9 @@ class Notify
   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
@@ -115,53 +108,4 @@ class Notify
     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

data/lib/notifaction/types/linux.rb

@@ -3,11 +3,12 @@ module Notifaction
     class Linux < Type::Base
 
       def bubble(message, title)
-
+        @response = `notify-send "#{title}" "#{message}"`
+        $?.exitstatus == 0
       end
 
       def modal(message, title)
-
+        nil
       end
 
     end

data/lib/notifaction/types/osx.rb

@@ -3,11 +3,13 @@ module Notifaction
     class OSX < Type::Base
 
       def bubble(message, title)
-
+        @response = `osascript -e 'display notification "#{message}" with title "#{title}"'`
+        $?.exitstatus == 0
       end
 
-      def modal(message, title)
-
+      def modal(message, title, icon = :caution)
+        @response = `osascript -e 'tell app "System Events" to display dialog "#{message}" buttons {"OK"} default button 1 with title "#{title}" with icon #{icon}'`
+        $?.exitstatus == 0
       end
 
     end

data/lib/notifaction/types/terminal.rb

@@ -6,24 +6,28 @@ module Notifaction
       #
       # @since 0.2.8
       def error(message, config)
+        config[:symbol] = "\u2716"
         inline(message, config, :red)
       end
 
       #
       # @since 0.2.8
       def warning(message, config)
+        config[:symbol] = "\u2011"
         inline(message, config, :yellow)
       end
 
       #
       # @since 0.2.8
       def success(message, config)
+        config[:symbol] = "\u2713"
         inline(message, config, :green)
       end
 
       #
       # @since 0.2.8
       def info(message, config)
+        config[:symbol] = "\u2011"
         inline(message, config, :blue)
       end
 
@@ -38,31 +42,41 @@ module Notifaction
       #
       # @since 0.2.8
       def note(message, config)
+        config[:symbol] = "\u2011"
         inline(message, config, :cyan)
       end
 
       #
       # @since 0.2.8
       def spit(message, config)
+        config[:fancy] = false
         inline(message, config)
       end
 
       #
       # @since 0.2.8
-      def spacer
-        inline("\u2011 =============", {}, :magenta)
+      def spacer(config)
+        config[:symbol] = "\u2011"
+        inline("=============", config, :magenta)
       end
 
       private
 
       #
       # @since 0.2.8
-      def inline(message, config = [], colour = nil, style = nil)
-        # formatting options
-        message += " - #{Utils.formatted_time}" if config[:show_time]
-        message = "#{config[:symbol]} #{message}" if config[:fancy]
+      def inline(message, config, colour = nil, style = nil)
+        if config.empty?
+          # no configuration provided, default to showing all config options
+          message += " - #{Utils.formatted_time}"
+        else
+          # update message content based on configuration variables
+          message += " - #{Utils.formatted_time}" if config[:show_time]
+          message = "#{config[:symbol]} #{message}" if config[:symbol] || config[:fancy]
+        end
 
-        puts Style.format(message, colour, style)
+        puts Style.format(message, colour, style) unless config[:print] == false
+
+        true
       end
 
     end

data/lib/notifaction/version.rb

@@ -1,3 +1,3 @@
 module Notifaction
-  VERSION = "0.0.9"
+  VERSION = "0.2.0"
 end

data/notifaction.gemspec

@@ -9,13 +9,10 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Яyan Priebe"]
   spec.email         = ["rpriebe@me.com"]
 
-  spec.summary       = %q{Include terminal and OS notifications in your ruby projects}
-  spec.description   = %q{Include terminal and OS notifications in your ruby projects}
+  spec.summary       = "Output status messages from your scripts/programs"
   spec.homepage      = "https://rubygems.org/gems/notifaction"
   spec.license       = "MIT"
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.11"

metadata

@@ -1,66 +1,66 @@
 --- !ruby/object:Gem::Specification
 name: notifaction
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.2.0
 platform: ruby
 authors:
 - Яyan Priebe
 autorequire: 
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2016-04-19 00:00:00.000000000 Z
+date: 2016-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.11'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '5.0'
-description: Include terminal and OS notifications in your ruby projects
+description: 
 email:
 - rpriebe@me.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -89,12 +89,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -102,5 +102,5 @@ rubyforge_project:
 rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
-summary: Include terminal and OS notifications in your ruby projects
+summary: Output status messages from your scripts/programs
 test_files: []