dragoon 0.0.5 → 0.0.6

data/TODO

@@ -45,6 +45,11 @@ Helpful links
  - http://www.paperplanes.de/2011/4/25/eventmachine-how-does-it-work.html (EM vs lower level socket prog, ie select, poll)
  - http://cia.vc/doc/
  - https://www6.software.ibm.com/developerworks/education/l-rubysocks/l-rubysocks-a4.pdf
+ - http://stackoverflow.com/questions/231647/how-do-i-set-the-socket-timeout-in-ruby
+ - http://peasleer.wordpress.com/2006/11/14/non-blocking-networking-in-ruby/
+ - http://www.troubleshooters.com/codecorn/sockets/ (socket read blocking in C)
+
+ - http://tomayko.com/writings/unicorn-is-unix
 
  Ncurses
 

data/lib/dragoon.rb

@@ -23,7 +23,6 @@ module Dragoon
 
     def_delegators :@event_manager, :on, :dispatch
 
-    DEFAULT_PORT = 6667
     CONFIG_FILE = File.expand_path("~/.dragoon")
 
     def initialize
@@ -37,18 +36,20 @@ module Dragoon
         if File.exist?(CONFIG_FILE)
           puts("*** Loading config file #{CONFIG_FILE}")
           config = JSON.parse(File.read(CONFIG_FILE))
+          @network  = config["network"]
+          @port     = config["port"]
           @nickname = config["nickname"]
           @password = config["password"]
-          @network = config["network"]
           @channels = config["channels"]
           @keywords = config["keywords"]
         else
 
           config = (<<-EOF).gsub(/^\s{10}/,"")
           {
+            "network": "chat.freenode.net",
+            "port": "6667",
             "nickname": "fenix#{rand(10)}#{rand(10)}#{rand(10)}",
             "password": "",
-            "network": "chat.freenode.net",
             "channels": [
                 "#ubuntu",
                 "#ruby",
@@ -111,11 +112,11 @@ module Dragoon
       end
 
       on :privmsg do |msg|
-        if system("which growlnotify > /dev/null")
+        if growlnotify_supported?
           if keyword = @keywords.detect { |keyword| msg.text.include?(keyword) }
             system("growlnotify " +
                    "-t \"#{msg.channel} - #{keyword}\" " +
-                   "-m \"#{escape_double_quotes(msg.privmsg)}\"")
+                   "-m \"#{msg.privmsg.escape_double_quotes}\"")
           end
         end
         puts "#{colorize(msg.channel)}  <#{msg.nickname}>  #{highlight_keywords(msg.privmsg,@keywords)}"
@@ -133,22 +134,24 @@ module Dragoon
     end
 
     def connect
-      puts "*** Connecting to #{@network} on port #{DEFAULT_PORT}"
+      puts "*** Connecting to #{@network} on port #{@port}"
       puts "*** Press Ctrl + c to stop the program"
-      TCPSocket.new(@network, DEFAULT_PORT)
-    end
-
-    def escape_double_quotes(text)
-      text.gsub("\"", "\\\"")
+      TCPSocket.new(@network, @port)
     end
 
     def stop
-      @socket.close
       puts
       puts "*** Program stopped"
+      @socket.close
       exit
     end
 
+    private
+
+      def growlnotify_supported?
+        @growlnotify_supported ||= system("which growlnotify > /dev/null")
+      end
+
   end
 end
 

data/lib/dragoon/core_ext.rb

@@ -1,3 +1,9 @@
 class String
+
   include Term::ANSIColor
+
+  def escape_double_quotes
+    self.gsub("\"", "\\\"")
+  end
+
 end

data/lib/dragoon/event_manager.rb

@@ -1,10 +1,12 @@
 module Dragoon
+  # only supports a very basic one-to-one mapping of events
+  # currently no support for event heirarchy
   class EventManager
 
     attr_reader :handlers
 
     def dispatch(event)
-      if @handlers.include?(event.name) && event.name != :unknown
+      if @handlers.include?(event.name)
         @handlers[event.name].call(event.message)
       end
     end

data/lib/dragoon/version.rb

@@ -1,3 +1,3 @@
 module Dragoon
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dragoon
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Reginald Tan
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-02 00:00:00 Z
+date: 2012-02-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec