dragoon 0.0.9 → 0.1.0

data/lib/dragoon.rb

@@ -7,6 +7,7 @@ require 'json'
 require 'active_support/core_ext/hash/indifferent_access'
 
 require 'dragoon/event'
+require 'dragoon/receiver'
 require 'dragoon/network'
 require 'dragoon/event_manager'
 require 'dragoon/color'
@@ -99,14 +100,14 @@ module Dragoon
       end
 
       on :privmsg do |msg, source|
-        if growlnotify_supported?
+        if growlnotify_supported? && growl_running?
           if keyword = @keywords.detect { |keyword| msg.text.include?(keyword) }
             system("growlnotify " +
-                   "-t \"#{msg.channel} - #{keyword}\" " +
+                   "-t \"#{msg.receiver} - #{keyword}\" " +
                    "-m \"#{msg.privmsg.escape_double_quotes}\"")
           end
         end
-        log "#{colorize(msg.channel)}  <#{msg.nickname}>  #{highlight_keywords(msg.privmsg,@keywords)}"
+        log "#{colorize(msg.receiver)}  <#{msg.nickname}>  #{highlight_keywords(msg.privmsg,@keywords)}"
       end
     end
 
@@ -136,7 +137,7 @@ module Dragoon
         dispatch(@event,
           @networks.select{ |n|
             n.server == socket.peeraddr[2] &&
-            n.port = socket.peeraddr[1]
+            n.port == socket.peeraddr[1]
           }.first
         )
       end
@@ -167,6 +168,10 @@ module Dragoon
         @growlnotify_supported ||= system("which growlnotify > /dev/null")
       end
 
+      def growl_running?
+        `ps ax | grep -i growl | grep -v grep | wc -l `.strip.to_i == 1
+      end
+
   end
 end
 

data/lib/dragoon/event.rb

@@ -30,7 +30,7 @@ module Dragoon
                                        :nickname => $1,
                                        :user => $2,
                                        :hostname => $3,
-                                       :channel => $4,
+                                       :receiver => Receiver.new($4),
                                        :privmsg => $5))
       when /^:\S+ (4\d{2}|5\d{2}) .*/
         self.new(:err, Message.new(:text => line, :error_code => $1))

data/lib/dragoon/receiver.rb

@@ -0,0 +1,22 @@
+module Dragoon
+  # RFC 1459 section 4.4.1
+  #
+  # a receiver can be
+  #   a nickname,
+  #   a channel
+  #
+  class Receiver < String
+
+    def initialize(raw_string)
+      super(raw_string)
+    end
+    # checks if first character of is #
+    def channel?
+      self[0].chr == "#"
+    end
+
+    def nickname?
+      !channel?
+    end
+  end
+end

data/lib/dragoon/version.rb

@@ -1,3 +1,3 @@
 module Dragoon
-  VERSION = "0.0.9"
+  VERSION = "0.1.0"
 end

data/spec/dragoon_spec.rb

@@ -36,7 +36,7 @@ describe Dragoon::Bot do
         socket = @client.connect(@network)
         socket.class.should == TCPSocket
         socket.peeraddr[1].should == 7777
-        socket.peeraddr[2].should == 'localhost'
+        socket.peeraddr[2].should include 'localhost'
       end
     end
   end

data/spec/event_spec.rb

@@ -49,8 +49,18 @@ describe Dragoon::Event do
       event.message.nickname.should == "nick"
       event.message.user.should == "~user"
       event.message.hostname.should == "hostname"
-      event.message.channel.should == "#ruby"
+      event.message.receiver.should == "#ruby"
       event.message.privmsg.should == "array << 0 if array.size.odd?"
+
+      msg = ":NeoStats!Neo@NeoStats.QuartzNet.Org PRIVMSG fenix456 :VERSION"
+      event = Dragoon::Event.parse(msg)
+      event.name.should == :privmsg
+      event.message.text.should == msg
+      event.message.nickname.should == "NeoStats"
+      event.message.user.should == "Neo"
+      event.message.hostname.should == "NeoStats.QuartzNet.Org"
+      event.message.receiver.should == "fenix456"
+      event.message.privmsg.should == "VERSION"
     end
 
     it "should process error reply event" do

data/spec/receiver_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+describe Dragoon::Receiver do
+  context "when its a nickname" do
+    before(:each) do
+      @raw_string = "fenix456"
+      @receiver = Dragoon::Receiver.new(@raw_string)
+    end
+
+    it "should be a nickname" do
+      @receiver.nickname?.should == true
+      @receiver.channel?.should == false
+    end
+
+    it "should have nickname as value" do
+      @receiver.should == @raw_string
+    end
+  end
+
+  context "when its a channel" do
+    before(:each) do
+      @raw_string = "#coffeescript"
+      @receiver = Dragoon::Receiver.new(@raw_string)
+    end
+
+    it "should be a channel" do
+      @receiver.channel?.should == true
+      @receiver.nickname?.should == false
+    end
+
+    it "should have channel as value" do
+      @receiver.should == @raw_string
+    end
+  end
+
+end

data/spec/spec_helper.rb

@@ -16,13 +16,13 @@ class LocalServer
     @port = port
   end
 
+  # child processes spawned from accepting new connection would automatically quit upon client exit
   def run
     server = TCPServer.new('localhost', @port)
-    server.listen(5)
     @pid = fork {
       while socket = server.accept
         fork {
-          trap("PIPE") { exit }
+          trap("PIPE") { exit } # exit on write attempt after client exits
           loop { socket.write("localhost port #{socket.addr[1]} dumping text\r\n") }
         }
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dragoon
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 27
   prerelease: 
   segments: 
   - 0
+  - 1
   - 0
-  - 9
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors: 
 - Reginald Tan
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-12 00:00:00 Z
+date: 2012-03-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -99,7 +99,6 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - Gemfile
-- Gemfile.lock
 - README.md
 - Rakefile
 - TODO
@@ -111,12 +110,14 @@ files:
 - lib/dragoon/event.rb
 - lib/dragoon/event_manager.rb
 - lib/dragoon/network.rb
+- lib/dragoon/receiver.rb
 - lib/dragoon/version.rb
 - sample_config
 - spec/colors_spec.rb
 - spec/dragoon_spec.rb
 - spec/event_manager_spec.rb
 - spec/event_spec.rb
+- spec/receiver_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/redgetan/dragoon
 licenses: []
@@ -156,5 +157,6 @@ test_files:
 - spec/dragoon_spec.rb
 - spec/event_manager_spec.rb
 - spec/event_spec.rb
+- spec/receiver_spec.rb
 - spec/spec_helper.rb
 has_rdoc: