notifaction 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28a65b85fb1a825f7af8225c38e01d8d614aa2a3
-  data.tar.gz: 664caaee8dd66d0a045d381d5bddaca4823e44b1
+  metadata.gz: a1fbf23fc97a9f930d9dd79d440516eb4b33b148
+  data.tar.gz: eaf15cfb3496e21a565ae26d7710edc16a93ede9
 SHA512:
-  metadata.gz: 5db2dd9639e975b4b6a22ba4562f654f01ba9fd27c88bbe1437378178d63d1aa3ff0f50b52aea40f0af657c5a2b8780c558c381fdf3dbd0f81c3fab1c7a4d56e
-  data.tar.gz: 12f6946a537c61dec18da6f78b9a070cb9252231e8d2915e90ea665496fac8634bcefedfc7c7cb06c0485132f871dca982943444808e0ec9c4463d468767722b
+  metadata.gz: 4b733df88dbbda18da7cb2f5e4563b37d918c72032e62f7dbc9481f2b9e94f39d683ac9db93583116fe5e03de6cbcbf1148550155692ed779779583362a0a57c
+  data.tar.gz: 4b63bc5169ee2ee76ffba4b9d79943b5d3d824dce2f36847b53fd861b1ca8f2c2f8cc3ff5feb614ae4eb23edb013437a3301b59ebaca8bcb0656597aefc38286

data/.notifaction.sample.yml

@@ -0,0 +1,7 @@
+plugin_hooks:
+    - "https://api.workingon.co/hooks/incoming?token=derp"
+    - "https://api.test.com/hooks/incoming?token=derp2"
+
+config:
+    show_time: false
+    fancy: true

data/lib/notifaction.rb

@@ -1,16 +1,13 @@
-require 'time'
-require 'rbconfig'
-require 'net/http'
-require 'cgi'
+require "time"
+require "rbconfig"
 
-require 'notifaction/type'
-require 'notifaction/types/linux'
-require 'notifaction/types/osx'
-require 'notifaction/types/terminal'
-require 'notifaction/notify'
-require 'notifaction/plugin'
+require "notifaction/type"
+require "notifaction/types/linux"
+require "notifaction/types/osx"
+require "notifaction/types/terminal"
+require "notifaction/notify"
+require "notifaction/config"
 require "notifaction/version"
-require 'notifaction/utils'
+require "notifaction/utils"
 
-module Notifaction
-end
+$config = Notifaction::Cfg.new

data/lib/notifaction/config.rb

@@ -0,0 +1,16 @@
+require "yaml"
+
+module Notifaction
+  class Cfg
+    attr_accessor :hooks, :conf
+
+    def initialize
+      conf = YAML::load(File.open(Dir.home + '/.notifaction.yml'))
+
+      @hooks = conf["hooks"] || []
+      @conf = conf["config"] || {}
+
+      nil
+    end
+  end
+end

data/lib/notifaction/notify.rb

@@ -26,7 +26,7 @@ class Notify
   def self.error(message, config = {})
     handler = Notifaction::Type::Terminal.new
     handler.error(message, config)
-    handler.quit unless config[:auto_quit] == false
+    handler.quit unless self.auto_quit_enabled(config)
   end
 
   # Prints a pre-formatted warning message to the console
@@ -66,16 +66,7 @@ class Notify
 
   # Send status updates to WorkingOn
   def self.workingon(message, print_info_message = false)
-    begin
-      plugin = Plugin::WorkingOn.new
-      plugin.fire(message)
-
-      if print_info_message
-        info(message)
-      end
-    rescue Exception => e
-      error("Error notifying WO - #{e.message}")
-    end
+    self.deprecation_notice("0.3.0")
   end
 
   # pretty-print a spacer
@@ -85,6 +76,8 @@ class Notify
   end
 
   def self.configure
+    self.deprecation_notice("0.3.0")
+
     yield self if block_given?
   end
 
@@ -98,14 +91,20 @@ class Notify
 
   # register new plugins
   def self.plugins=(plugin_config_arr)
-    plugin_config_arr.each do |hash|
-      hash.each_pair do |plugin, key|
-        # include the requested plugin
-        require_relative "plugins/#{plugin.downcase}.rb"
+    self.deprecation_notice("0.3.0")
+  end
 
-        instance_variable_set("@#{plugin}_key".to_sym, key)
-      end
-    end
+  private_class_method
+
+  #
+  # @since 0.2.8
+  def deprecation_notice(version)
+    puts "Deprecated as of #{version}, current #{Notifaction::VERSION}"
   end
 
+  #
+  # @since 0.3.0
+  def self.auto_quit_enabled(config)
+    config[:auto_quit] == false || $config.conf["auto_quit"] == false
+  end
 end

data/lib/notifaction/style.rb

@@ -1,32 +1,34 @@
-module Style
-  @map = {
-    :colour => {
-      :red => 31,
-      :green => 32,
-      :yellow => 33,
-      :blue => 34,
-      :magenta => 35,
-      :cyan => 36,
-      :white => 37,
-      :null => 0
-    },
-    :style => {
-      :reset => 0,
-      :bold => 1,
-      :underline => 4,
-      :normal => ""
+module Notifaction
+  module Style
+    @map = {
+      colour: {
+        red: 31,
+        green: 32,
+        yellow: 33,
+        blue: 34,
+        magenta: 35,
+        cyan: 36,
+        white: 37,
+        null: 0
+      },
+      style: {
+        reset: 0,
+        bold: 1,
+        underline: 4,
+        normal: ""
+      }
     }
-  }
 
-  def self.format(message, colour = nil, style = nil)
-    c = @map[:colour][colour.to_sym] if !colour.nil?
+    def self.format(message, colour = nil, style = nil)
+      c = @map[:colour][colour.to_sym] unless colour.nil?
 
-    if style.nil?
-      t = 0
-    else
-      t = @map[:style][style.to_sym]
+      if style.nil?
+        t = 0
+      else
+        t = @map[:style][style.to_sym]
+      end
+
+      "\e[#{t};#{c}m#{message}\e[0m"
     end
-    
-    "\e[#{t};#{c}m#{message}\e[0m"
   end
-end
+end

data/lib/notifaction/type.rb

@@ -1,11 +1,13 @@
+require "net/http"
+require "uri"
+
 module Notifaction
   module Type
     class Base
-
       #
       # @since 0.2.8
       def deprecation_notice(version)
-        puts "Deprecated as of #{version}"
+        puts "Deprecated as of #{version}, current #{Notifaction::VERSION}"
       end
 
       #
@@ -14,6 +16,20 @@ module Notifaction
         exit
       end
 
+      #
+      # @since 0.3.0
+      def fire_hooks(payload)
+        hooks = $config.hooks
+
+        return if hooks.nil?
+
+        hooks.each do |uri|
+          uri = URI.parse(uri)
+
+          response = Net::HTTP.post_form(uri, payload)
+          response.code.to_i < 300
+        end
+      end
     end
   end
-end
+end

data/lib/notifaction/types/linux.rb

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

data/lib/notifaction/types/osx.rb

@@ -1,17 +1,19 @@
 module Notifaction
   module Type
     class OSX < Type::Base
-
       def bubble(message, title)
         @response = `osascript -e 'display notification "#{message}" with title "#{title}"'`
         $?.exitstatus == 0
+
+        fire_hooks(method: __method__, message: message, title: title)
       end
 
       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
 
+        fire_hooks(method: __method__, message: message, title: title)
+      end
     end
   end
-end
+end

data/lib/notifaction/types/terminal.rb

@@ -1,4 +1,4 @@
-require 'notifaction/style'
+require "notifaction/style"
 
 module Notifaction
   module Type
@@ -34,7 +34,7 @@ module Notifaction
       #
       # @since 0.2.8
       def sinfo(message, config)
-        deprecation_notice('0.2.8')
+        deprecation_notice("0.2.8")
 
         note(message, config, :cyan)
       end
@@ -70,15 +70,28 @@ module Notifaction
           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]
+          message += " - #{Utils.formatted_time}" if show_time(config)
+          message = "#{config[:symbol]} #{message}" if show_symbol(config)
         end
 
-        puts Style.format(message, colour, style) unless config[:print] == false
+        puts Style.format(message, colour, style) unless show_message(config)
+
+        fire_hooks(method: __method__, message: message, config: config)
 
         true
       end
 
+      def show_symbol(config)
+        config[:symbol] || config[:fancy] || $config.conf["fancy"] == true
+      end
+
+      def show_time(config)
+        config[:show_time] || $config.conf["show_time"]
+      end
+
+      def show_message(config)
+        config[:print] == false || $config.conf["print"] == false
+      end
     end
   end
-end
+end

data/lib/notifaction/utils.rb

@@ -1,15 +1,16 @@
-class Utils
-  def self.formatted_time(time = nil)
-    if time.nil?
-      time = Time.now
+module Notifaction
+  class Utils
+    def self.formatted_time(time = nil)
+      if time.nil?
+        time = Time.now
+      end
+
+      time.strftime("%e/%-m/%Y @ %I:%M:%S%P")
     end
-    
-    time.strftime("%e/%-m/%Y @ %I:%M:%S%P")
-  end
 
-  def self.os
-    @os ||= (
+    def self.os
       host_os = RbConfig::CONFIG['host_os']
+
       case host_os
       when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
         :windows
@@ -22,6 +23,6 @@ class Utils
       else
         puts "unknown os: #{host_os.inspect}"
       end
-    )
+    end
   end
 end

data/lib/notifaction/version.rb

@@ -1,3 +1,3 @@
 module Notifaction
-  VERSION = "0.2.0"
+  VERSION = "0.3.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: notifaction
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Яyan Priebe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-05 00:00:00.000000000 Z
+date: 2016-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -60,6 +60,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .notifaction.sample.yml
 - .travis.yml
 - Gemfile
 - LICENSE.txt
@@ -68,8 +69,8 @@ files:
 - bin/console
 - bin/setup
 - lib/notifaction.rb
+- lib/notifaction/config.rb
 - lib/notifaction/notify.rb
-- lib/notifaction/plugin.rb
 - lib/notifaction/style.rb
 - lib/notifaction/type.rb
 - lib/notifaction/types/linux.rb
@@ -77,7 +78,6 @@ files:
 - lib/notifaction/types/terminal.rb
 - lib/notifaction/utils.rb
 - lib/notifaction/version.rb
-- lib/plugins/workingon.rb
 - notifaction.gemspec
 homepage: https://rubygems.org/gems/notifaction
 licenses:

data/lib/notifaction/plugin.rb

@@ -1,7 +0,0 @@
-module Notifaction
-  module Plugin
-    def self.num_lines(file)
-      File.foreach(file).inject(0) {|c, line| c+1}
-    end
-  end
-end

data/lib/plugins/workingon.rb

@@ -1,29 +0,0 @@
-module Plugin
-  class WorkingOn
-    def fire(message)
-      log = File.new('/tmp/wo-digest.log', 'a+')
-
-      open(log, 'a') do |file|
-        file.write("#{message}\n")
-      end
-
-      # enough messages have been stored, send digest
-      if Plugin::num_lines(log) > 3
-        digest = open(log, 'r').read
-
-        Net::HTTP.post_form(URI(sprintf(api_endpoint, api_key)), :task => CGI.escapeHTML(digest.split("\n").uniq.join(', ')))
-        
-        # reset digest after sending
-        File.truncate(log, 0)
-      end
-    end
-
-    def api_endpoint
-      "https://api.workingon.co/hooks/incoming?token=%s"
-    end
-
-    def api_key
-      Notify.instance_variable_get('@WorkingOn_key')
-    end
-  end
-end