gnome-campfire-notifications 0.1.2 → 0.1.3

data/bin/gnome-campfire-notifications

@@ -2,4 +2,4 @@
 
 require_relative '../lib/gnome-campfire-notifications'
 
-GnomeCampfireNotifications.start
+GnomeCampfireNotifications.new.start

data/lib/gnome-campfire-notifications.rb

@@ -1,49 +1,46 @@
 require "twitter/json_stream"
-require "json"
-require "yaml"
 require "net/http"
+require "json"
 
 class GnomeCampfireNotifications
   HOST = 'streaming.campfirenow.com'
-
-  def self.start
-    room_name = ENV['GNOME_CAMPFIRE_NOTIFICATIONS_ROOM_NAME']
-    room_id = ENV['GNOME_CAMPFIRE_NOTIFICATIONS_ROOM_ID']
-    token   = ENV['GNOME_CAMPFIRE_NOTIFICATIONS_TOKEN']
-
-    unless room_name && room_id && token
-      raise "please set GNOME_CAMPFIRE_NOTIFICATIONS_ROOM_ID and GNOME_CAMPFIRE_NOTIFICATIONS_TOKEN"
+  NOTIFICATION_GFX_FILENAME = 'campfire.png'
+  NOTIFICATION_GFX_SYSPATH = "/usr/share/icons/gnome/32x32/apps"
+
+  ATTR_MAP = {
+    room_name:  'GNOME_CAMPFIRE_NOTIFICATIONS_ROOM_NAME',
+    room_id:    'GNOME_CAMPFIRE_NOTIFICATIONS_ROOM_ID',
+    token:      'GNOME_CAMPFIRE_NOTIFICATIONS_TOKEN'
+  }
+
+  def initialize
+    if (missing = ATTR_MAP.values.select { |env| ENV[env].empty? }).any?
+      raise "please set environment variable(s) #{missing.join(', ')}"
     end
 
-    new(
-      path:       "/room/#{room_id}/live.json",
-      host:       HOST,
-      auth:       "#{token}:x",
-      token:      token,
-      room_name:  room_name
-    )
-  end
-
-  def initialize(options)
-    @options = options
+    @options = ATTR_MAP.map.with_object({}) { |(key, env), opts| opts[key] = ENV[env] }
     @username_cache = []
-    listen
+    try_icon
   end
 
-  private
-
-  def listen
+  def start
     on_message do |item|
       username = get_username(item["user_id"].to_i)
       message = "#{item["body"].to_s.gsub(/'/, "\'")}"
 
-      system("notify-send --hint=int:transient:1 -u low '#{username}' '#{message}'")
+      system("notify-send --hint=int:transient:1 -u low#{icon} '#{username}' '#{message}'")
     end
   end
 
+  private
+
   def on_message
     EventMachine::run do
-      stream = Twitter::JSONStream.connect(@options)
+      stream = Twitter::JSONStream.connect(
+        host:  HOST,
+        path: "/room/#{room_id}/live.json",
+        auth: "#{token}:x",
+      )
 
       stream.each_item do |item|
         json = JSON::parse(item)
@@ -76,7 +73,34 @@ class GnomeCampfireNotifications
     @username_cache[id]
   end
 
+  def icon
+    " -i #{@options[:icon_path]}"
+  end
+
+  def try_icon
+    if path = notification_gfx_paths.detect { |p| File.exists?(p) }
+      @options[:icon_path] = path
+    end
+  end
+
+  def notification_gfx_paths
+    [[NOTIFICATION_GFX_SYSPATH, NOTIFICATION_GFX_FILENAME],
+     [gem_dir, "assets", NOTIFICATION_GFX_FILENAME]].join('/')
+  end
+
+  def gem_dir
+    Gem::Specification.find_by_name("gnome-campfire-notifications").gem_dir
+  end
+
   def room_url
     "#{@options[:room_name]}.campfirenow.com"
   end
+
+  def room_id
+    @options[:room_id]
+  end
+
+  def token
+    @options[:token]
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gnome-campfire-notifications
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-07 00:00:00.000000000 Z
+date: 2013-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: twitter-stream
@@ -36,9 +36,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/gnome-campfire-notifications.rb
-- !binary |-
-  YmluL2dub21lLWNhbXBmaXJlLW5vdGlmaWNhdGlvbnM=
-homepage: https://rubygems.org/gems/example
+- assets/campfire.png
+- bin/gnome-campfire-notifications
+homepage: https://github.com/mcnelson/gnome-campfire-notifications
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -58,7 +58,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: GNOME desktop notifications for Campfire.