dragoon 0.0.3 → 0.0.4

data/lib/dragoon/color.rb

@@ -3,9 +3,9 @@ module Dragoon
 
     # borrowed from Term::ANSIColors
     COLORED_REGEXP = /\e\[(?:(?:[349]|10)[0-7]|[0-9])?m/
-    # :yellow is reserved for highlight keywords
-    @@color_list = [:red, :green, :blue, :magenta, :cyan, :white]
+    @@color_list = [:red, :green, :blue, :magenta, :cyan, :white] # :yellow is reserved for highlighting keywords
 
+    # assign a permanent color to a text
     def colorize(text)
       @c_table ||= {}
       color = @c_table.fetch(text) rescue @c_table[text] = next_color
@@ -20,8 +20,7 @@ module Dragoon
       keywords.sort_by(&:length).reverse.inject(text) do |result, keyword|
         result.gsub(keyword) { |word|
           to_left_of_word, to_right_of_word = $`, $'
-
-          # check if inside exisitng highlighted word via ANSI ESCAPE
+          # check if inside exisitng highlighted word
           if to_left_of_word =~ /#{COLORED_REGEXP}\S+$/ && to_right_of_word =~ /^\S+#{COLORED_REGEXP}/
             word
           else

data/lib/dragoon/commands.rb

@@ -24,7 +24,6 @@ module Dragoon
     private
 
       def write(text)
-        $stdout.puts text
         @socket.write "#{text}\r\n"
       end
 

data/lib/dragoon/event.rb

@@ -17,8 +17,8 @@ module Dragoon
         self.new(:startup, Message.new(:text => line))
       when /^PING :(\S+)/
         self.new(:ping, Message.new(:text => line, :server => $1))
-      when /^:\S+ MODE \S+ :.*/
-        self.new(:mode, Message.new(:text => line))
+      when /^:(\S+) MODE \S+ :.*/
+        self.new(:mode, Message.new(:text => line, :nickname => $1))
       when /^:(\S+)!(\S+)@(\S+) JOIN (\S+)/
         self.new(:join, Message.new(:text => line,
                                     :nickname => $1,

data/lib/dragoon/event_manager.rb

@@ -10,9 +10,8 @@ module Dragoon
     end
 
     # register callbacks for certain events
-    # valid events are found on constant VALID_EVENTS
     def on(event_name, &callback)
-      @handlers = {} if @handlers.nil?
+      @handlers ||= {}
       @handlers[event_name] = callback
     end
 

data/lib/dragoon/version.rb

@@ -1,3 +1,3 @@
 module Dragoon
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/dragoon.rb

@@ -26,7 +26,7 @@ module Dragoon
     DEFAULT_PORT = 6667
     CONFIG_FILE = File.expand_path("~/.dragoon")
 
-    def initialize(&blk)
+    def initialize
       @event_manager = EventManager.new
       load_config
       init_callbacks
@@ -35,17 +35,21 @@ module Dragoon
     def load_config
       begin
         if File.exist?(CONFIG_FILE)
-          puts("*** Loading config file ~/.dragoon")
+          puts("*** Loading config file #{CONFIG_FILE}")
           config = JSON.parse(File.read(CONFIG_FILE))
+          @nickname = config["nickname"]
+          @network = config["network"]
+          @channels = config["channels"]
+          @keywords = config["keywords"]
         else
           config = {
-            "nickname" => "your_nick",
+            "nickname" => "fenix#{rand(10)}#{rand(10)}#{rand(10)}",
             "network"  => "irc.freenode.net",
             "channels" => %w[ #ubuntu #ruby #rubyonrails #linux #programming #javascript ],
             "keywords" => %w[ and how who ]
           }
           File.open(CONFIG_FILE,'w+') {|f| f.write(JSON.pretty_generate(config)) }
-          puts("Config file does not exist...created one at #{CONFIG_FILE}".red)
+          puts("Config file does not exist...created a default one at #{CONFIG_FILE}".red)
           puts("Please modify it according to your preference".red)
           exit 1
         end
@@ -53,10 +57,6 @@ module Dragoon
         $stderr.puts e.message
         exit 1
       end
-      @nickname = config["nickname"]
-      @network = config["network"]
-      @channels = config["channels"]
-      @keywords = config["keywords"]
     end
 
     def init_callbacks
@@ -74,7 +74,7 @@ module Dragoon
       end
 
       on :mode do |msg|
-        puts "*** Logged in as #{self.nickname}"
+        puts "*** Logged in as #{msg.nickname}"
         join_channels
       end
 
@@ -96,7 +96,7 @@ module Dragoon
         if system("which growlnotify > /dev/null")
           if keyword = self.keywords.detect { |keyword| msg.text.include?(keyword) }
             system("growlnotify " +
-                   "-t \"#{keyword}\" " +
+                   "-t \"#{msg.channel} - #{keyword}\" " +
                    "-m \"#{escape_double_quotes(msg.privmsg)}\"")
           end
         end
@@ -115,6 +115,7 @@ module Dragoon
 
     def connect
       puts "*** Connecting to #{@network} on port #{DEFAULT_PORT}"
+      puts "*** Press Ctrl + c to stop the program"
       TCPSocket.new(@network, DEFAULT_PORT)
     end
 

data/spec/event_spec.rb

@@ -23,6 +23,7 @@ describe Dragoon::Event do
       event = Dragoon::Event.parse(msg)
       event.name.should == :mode
       event.message.text.should == ":favor212 MODE favor212 :+i"
+      event.message.nickname.should == "favor212"
     end
 
     it "should process join event" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dragoon
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Reginald Tan
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-23 00:00:00 Z
+date: 2012-01-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec