notify-push 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 581cc05efeb0b564d252364f42aa1db17a5d6051
-  data.tar.gz: c56ef57c8b7807d72be9bf904b67bff07910dfb6
+  metadata.gz: dd0ab6b2b7e44edc715aa70fe7f88a00cb5abde7
+  data.tar.gz: 32e3095cbba0183ff1c2bdc7577152aca8fbbaae
 SHA512:
-  metadata.gz: 8663dac87a2e3fa870929271b4630f2e901e4ab6426714da9c59158f4557a3e6310dc6ccae2b383ed7d8521c1dbb0c89f810aac8b8776ccddcf78bd1e1ddf958
-  data.tar.gz: e40672519d2a75536449008c685567aa3c1cba688cf30f093345321ca5fb112ac3f5d006a10061a32a73a7aa2c7d88704cc5910eb055e6c59fd708647a79961f
+  metadata.gz: 1ad5497e2be621ae61ba77e46bb7828d32746eddb23d2141806e0f5ef1fb3f1209a47f462b08e98c5046b4f3d592902dafdb86dbfc6a08239734bd11262190f8
+  data.tar.gz: f1f291e6bb25d4e8fe0ef0e18a9f1c14e49dcdba287fbacff1a34ce81426fde6edcd27274335b7ad52380483ad6c5de155252710ded1a831e9a7381a6d1bfc2c

data/Gemfile

@@ -3,12 +3,27 @@
 # ================================================
 source "http://rubygems.org"
 
+# http://stackoverflow.com/questions/8420414/how-to-add-mac-specific-gems-to-bundle-on-mac-but-not-on-linux
+def windows_only(require_as)
+  RbConfig::CONFIG['host_os'] =~ /mingw|mswin/i ? require_as : false
+end
+
+def linux_only(require_as)
+  RbConfig::CONFIG['host_os'] =~ /linux/ ? require_as : false
+end
+
+def darwin_only(require_as)
+  RbConfig::CONFIG['host_os'] =~ /darwin/ ? require_as : false
+end
+
 gem "pusher"
 gem "pusher-client"
 gem "activesupport"
 gem "recursive-open-struct"
 gem "pidfile"
 gem "os"
+#gem "terminal-notifier", require: darwin_only("terminal-notifier")
+gem "notifier"
 
 group :development do
   gem "shoulda", ">= 0"
@@ -17,4 +32,5 @@ group :development do
   gem "bundler", "~> 1.0"
   gem "jeweler", "~> 2.0.1"
   gem "simplecov", ">= 0"
+  gem "pry"
 end

data/Gemfile.lock

@@ -9,6 +9,7 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.3.8)
     builder (3.2.2)
+    coderay (1.1.0)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     docile (1.1.5)
@@ -38,6 +39,7 @@ GEM
       rdoc
     json (1.8.2)
     jwt (1.5.0)
+    method_source (0.8.2)
     mini_portile (0.6.2)
     minitest (5.7.0)
     multi_json (1.11.0)
@@ -45,6 +47,7 @@ GEM
     multipart-post (2.0.0)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
+    notifier (0.5.1)
     oauth2 (1.0.0)
       faraday (>= 0.8, < 0.10)
       jwt (~> 1.0)
@@ -53,6 +56,10 @@ GEM
       rack (~> 1.2)
     os (0.9.6)
     pidfile (0.3.0)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
     pusher (0.14.5)
       httpclient (~> 2.5)
       multi_json (~> 1.0)
@@ -77,6 +84,7 @@ GEM
       json (~> 1.8)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
+    slop (3.6.0)
     thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
@@ -90,8 +98,10 @@ DEPENDENCIES
   activesupport
   bundler (~> 1.0)
   jeweler (~> 2.0.1)
+  notifier
   os
   pidfile
+  pry
   pusher
   pusher-client
   rdoc (~> 3.12)

data/README.md

@@ -4,12 +4,11 @@ A general purpose popup notifier sender/receiver for using WebSockets (via [Push
 ## Overview
 `notify-push` employs a Receiver (*currently OS X only*) and Sender(s) to push messages from the Sender(s) to the Receiver.
 
-
-![IRC Example](<img src='images/doc/terminal-notifier.png' width='359' height='121'/>)
-
 **Example Use Case**:
 You have `irssi` set up in a `screen` on a remote machine and you want to be notified on your laptop/desktop whenever your name gets highlighted.
 
+<img src='images/doc/terminal-notifier.png' width='359' height='121' alt='IRC Example'/>
+
 ## Disclaimer
 
 ![Works on my Machine](http://serve.eriknomitch.com/images/works-on-my-machine.jpg "Works on my Machine")

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/contrib/irssi/notify_push.pl

@@ -0,0 +1,27 @@
+use strict;
+use vars qw($VERSION %IRSSI);
+
+%IRSSI = (
+    authors	=> "Erik Nomitch",
+    contact	=> "erik\@nomitch.com",
+    name	=> "notify_push",
+    description	=> "An irssi plugin to activate notify-push",
+    license	=> "GPL-2",
+    url		=> "https://github.com/eriknomitch/notify-push",
+);
+
+use Irssi;
+
+sub notify_push {
+    my ($server, $msg, $nick, $nick_addr, $target) = @_;
+
+    # WARNING: UNFINISHED - EDIT IN YOUR OWN CHANNELS
+    
+    # FIX: User-defined channels.
+    # Only operate in these channels...
+    if ($target =~ m/#(?:foo|bar|baz)/) { 
+        system "shell-notify-push", $msg, "IRC", "${nick} says..."
+    }
+}
+
+Irssi::signal_add_last("message public", "notify_push");

data/contrib/shell/notify-push-curl

@@ -0,0 +1,26 @@
+#!/bin/bash
+
+# FIX: Unfinished
+
+key=$PUSHER_KEY
+secret=$PUSHER_SECRET
+appID=$PUSHER_APP_ID
+
+message=$1
+title=$2
+timestamp=$(date +%s)
+
+data='{"name":"notification","channel":"notify-push","data":"{\"message\":\"'$message'\",\"title\":\"'$title'\"}"}'
+
+# Be sure to use `printf %s` to prevent a trailing \n from being added to the data.
+md5data=$(printf '%s' "$data" | md5sum | awk '{print $1}')
+path="/apps/${appID}/events"
+queryString="auth_key=${key}&auth_timestamp=${timestamp}&auth_version=1.0&body_md5=${md5data}"
+
+# Be sure to use a multi-line, double quoted string that doesn't end in \n as 
+# input for the SHA-256 HMAC.
+authSig=$(printf '%s' "POST
+$path
+$queryString" | openssl dgst -sha256 -hex -hmac "$secret")
+curl -s -H "Content-Type:application/json" -d "$data" "http://api.pusherapp.com${path}?${queryString}&auth_signature=${authSig}" > /dev/null 2>&1 &
+

data/lib/notify-push.rb

@@ -3,15 +3,39 @@ require "shellwords"
 require "yaml"
 require "recursive-open-struct"
 require "os"
+require "notifier"
+
+require "pry"
 
 require "active_support/core_ext/hash/reverse_merge"
 require "active_support/core_ext/module"
 require "active_support/core_ext/object/blank"
 
+# ------------------------------------------------
+# ->CLASS->OS ------------------------------------
+# ------------------------------------------------
+class OS
+  def self.host_simple
+    # FIX: Add more.
+    %i(mac linux windows).each do |os|
+      return os if OS.send("#{os}?")
+    end or raise "Cannot detect OS."
+  end
+end
+
 # ------------------------------------------------
 # MODULE->NOTIFY-PUSH ----------------------------
 # ------------------------------------------------
 module NotifyPush
+
+  # ----------------------------------------------
+  # MODULE->UTILITY ------------------------------
+  # ----------------------------------------------
+  module Utility
+    def self.require_system_command_or_raise(command)
+      system "command -v #{command} >/dev/null 2>&1" or raise "The command '#{command}' cannot be found and is required."
+    end
+  end
   
   # ----------------------------------------------
   # ATTRIBUTES -----------------------------------
@@ -116,30 +140,17 @@ module NotifyPush
       PidFile.new
     end
 
-    # --------------------------------------------
-    # ENSURANCES ---------------------------------
-    # --------------------------------------------
-    def self.ensure_dependencies
-      system "command -v terminal-notifier >/dev/null 2>&1" or raise "'terminal-notifier' cannot be found."
-    end
-
-    def self.ensure_compatibility
-      OS.mac? or "The notify-push receiver only supports OS X."
-    end
-
     # --------------------------------------------
     # NOTIFY -------------------------------------
     # --------------------------------------------
     def self.notify(title: "notify-push", subtitle: nil, message:)
 
-      args = [
-        "-message", message,
-        "-title",   title
-      ]
+      message = "#{subtitle} - #{message}" if subtitle
 
-      args.concat ["-subtitle", subtitle] unless subtitle.blank?
-
-      system "terminal-notifier", *args
+      Notifier.notify({
+        title:   title,
+        message: message
+      })
     end
 
     # --------------------------------------------
@@ -147,13 +158,10 @@ module NotifyPush
     # --------------------------------------------
     def self.start()
 
-      ensure_compatibility
-      ensure_dependencies
       pid_lock
 
       require "pusher-client"
 
-
       socket = PusherClient::Socket.new configuration.pusher.key, {
         secure: true
       }

data/notify-push.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: notify-push 0.1.2 ruby lib
+# stub: notify-push 0.1.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "notify-push"
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Erik Nomitch"]
-  s.date = "2015-06-05"
+  s.date = "2015-06-08"
   s.description = "A general purpose popup notifier sender/receiver using WebSockets (via Pusher)"
   s.email = "erik@nomitch.com"
   s.executables = ["notify-push"]
@@ -28,6 +28,8 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "bin/notify-push",
+    "contrib/irssi/notify_push.pl",
+    "contrib/shell/notify-push-curl",
     "images/doc/terminal-notifier.png",
     "lib/notify-push.rb",
     "notify-push.gemspec",
@@ -52,12 +54,14 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<recursive-open-struct>, [">= 0"])
       s.add_runtime_dependency(%q<pidfile>, [">= 0"])
       s.add_runtime_dependency(%q<os>, [">= 0"])
+      s.add_runtime_dependency(%q<notifier>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<yard>, ["~> 0.7"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 2.0.1"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
+      s.add_development_dependency(%q<pry>, [">= 0"])
     else
       s.add_dependency(%q<pusher>, [">= 0"])
       s.add_dependency(%q<pusher-client>, [">= 0"])
@@ -65,12 +69,14 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<recursive-open-struct>, [">= 0"])
       s.add_dependency(%q<pidfile>, [">= 0"])
       s.add_dependency(%q<os>, [">= 0"])
+      s.add_dependency(%q<notifier>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<yard>, ["~> 0.7"])
       s.add_dependency(%q<bundler>, ["~> 1.0"])
       s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
       s.add_dependency(%q<simplecov>, [">= 0"])
+      s.add_dependency(%q<pry>, [">= 0"])
     end
   else
     s.add_dependency(%q<pusher>, [">= 0"])
@@ -79,12 +85,14 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<recursive-open-struct>, [">= 0"])
     s.add_dependency(%q<pidfile>, [">= 0"])
     s.add_dependency(%q<os>, [">= 0"])
+    s.add_dependency(%q<notifier>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<yard>, ["~> 0.7"])
     s.add_dependency(%q<bundler>, ["~> 1.0"])
     s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
     s.add_dependency(%q<simplecov>, [">= 0"])
+    s.add_dependency(%q<pry>, [">= 0"])
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: notify-push
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Erik Nomitch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-05 00:00:00.000000000 Z
+date: 2015-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pusher
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: notifier
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
@@ -178,6 +192,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A general purpose popup notifier sender/receiver using WebSockets (via
   Pusher)
 email: erik@nomitch.com
@@ -196,6 +224,8 @@ files:
 - Rakefile
 - VERSION
 - bin/notify-push
+- contrib/irssi/notify_push.pl
+- contrib/shell/notify-push-curl
 - images/doc/terminal-notifier.png
 - lib/notify-push.rb
 - notify-push.gemspec