dragoon 0.0.4 → 0.0.5

data/TODO

@@ -8,6 +8,9 @@ TODO
 - [ ]    - multiple networks
 - [x]  login
 - [x]  join channels
+- [x]    - normal channels
+- [ ]    - channels that need you to be identified with nickserv
+- [ ]    - more than 50 channels
 - [x]  Event Parsing
 - [x]  during msg events (PRIVMSG)
 - [x]    - parse message
@@ -41,8 +44,17 @@ Helpful links
  - http://www.scribd.com/doc/28253878/EventMachine-scalable-non-blocking-i-o-in-ruby
  - 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
+
+ Ncurses
+
+ - http://www.ibiblio.org/pub/Linux/docs/HOWTO/other-formats/pdf/NCURSES-Programming-HOWTO.pdf
+ - http://heather.cs.ucdavis.edu/~matloff/UnixAndC/CLanguage/Curses.pdf
+ - http://invisible-island.net/ncurses/ncurses-intro.html
+
 
 Existing IRC clients/bots to get ideas from
 -------------------------------------------
  - https://github.com/cinchrb/cinch
  - https://github.com/RISCFuture/autumn
+

data/lib/dragoon.rb

@@ -38,17 +38,34 @@ module Dragoon
           puts("*** Loading config file #{CONFIG_FILE}")
           config = JSON.parse(File.read(CONFIG_FILE))
           @nickname = config["nickname"]
+          @password = config["password"]
           @network = config["network"]
           @channels = config["channels"]
           @keywords = config["keywords"]
         else
-          config = {
-            "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 ]
+
+          config = (<<-EOF).gsub(/^\s{10}/,"")
+          {
+            "nickname": "fenix#{rand(10)}#{rand(10)}#{rand(10)}",
+            "password": "",
+            "network": "chat.freenode.net",
+            "channels": [
+                "#ubuntu",
+                "#ruby",
+                "#rubyonrails",
+                "#linux",
+                "#programming",
+                "#javascript"
+              ],
+            "keywords": [
+                  "and",
+                  "how",
+                  "who"
+                ]
           }
-          File.open(CONFIG_FILE,'w+') {|f| f.write(JSON.pretty_generate(config)) }
+          EOF
+
+          File.open(CONFIG_FILE,'w+') {|f| f.write(config) }
           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
@@ -64,8 +81,9 @@ module Dragoon
         puts msg.text
         if msg.text =~ /.*Found your hostname.*/
           # login
-          user(self.nickname)
-          nick(self.nickname)
+          pass(@password) if !@password.empty?
+          user(@nickname, 0, 0, @nickname)
+          nick(@nickname)
         end
       end
 
@@ -79,35 +97,36 @@ module Dragoon
       end
 
       on :join do |msg|
-        puts "*** Listening on channel #{colorize(msg.channel)}" if self.nickname == msg.nickname
+        puts "*** Listening on channel #{colorize(msg.channel)}" if @nickname == msg.nickname
       end
 
       on :err do |msg|
         $stderr.puts msg.text.red unless msg.error_code == '470' # channel forwarding
         if msg.error_code == '433' # nick already in use
           print("Enter another nickname: ")
-          self.nickname = gets.chomp
-          user(self.nickname)
-          nick(self.nickname)
+          @nickname = gets.chomp
+          user(@nickname, 0, 0, @nickname)
+          nick(@nickname)
         end
       end
 
       on :privmsg do |msg|
         if system("which growlnotify > /dev/null")
-          if keyword = self.keywords.detect { |keyword| msg.text.include?(keyword) }
+          if keyword = @keywords.detect { |keyword| msg.text.include?(keyword) }
             system("growlnotify " +
                    "-t \"#{msg.channel} - #{keyword}\" " +
                    "-m \"#{escape_double_quotes(msg.privmsg)}\"")
           end
         end
-        puts "#{colorize(msg.channel)}  <#{msg.nickname}>  #{highlight_keywords(msg.privmsg,self.keywords)}"
+        puts "#{colorize(msg.channel)}  <#{msg.nickname}>  #{highlight_keywords(msg.privmsg,@keywords)}"
       end
     end
 
     def run
+      trap("INT") { stop}
       @socket = connect
+
       while line = @socket.gets
-        trap('INT') { stop }
         @event = Event.parse(line)
         dispatch(@event)
       end

data/lib/dragoon/commands.rb

@@ -1,20 +1,24 @@
 module Dragoon
   module Commands
 
-    def nick(text)
-      write "NICK #{text}"
+    def nick(nickname)
+      write "NICK #{nickname}"
     end
 
-    def user(text)
-      write "USER #{text} #{text} #{text} #{text}"
+    def user(username, hostname, servername, realname)
+      write "USER #{username} #{hostname} #{servername} #{realname}"
     end
 
-    def pong(text)
-      write "PONG #{text}"
+    def pass(password)
+      write "PASS #{password}"
     end
 
-    def join(text)
-      write "JOIN #{text}"
+    def pong(server)
+      write "PONG #{server}"
+    end
+
+    def join(channel)
+      write "JOIN #{channel}"
     end
 
     def join_channels

data/lib/dragoon/version.rb

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

data/spec/event_spec.rb

@@ -14,7 +14,7 @@ describe Dragoon::Event do
       msg = "PING :zelazny.freenode.net"
       event = Dragoon::Event.parse(msg)
       event.name.should == :ping
-      event.message.text.should == "PING :zelazny.freenode.net"
+      event.message.text.should == msg
       event.message.server.should == "zelazny.freenode.net"
     end
 
@@ -22,7 +22,7 @@ describe Dragoon::Event do
       msg = ":favor212 MODE favor212 :+i"
       event = Dragoon::Event.parse(msg)
       event.name.should == :mode
-      event.message.text.should == ":favor212 MODE favor212 :+i"
+      event.message.text.should == msg
       event.message.nickname.should == "favor212"
     end
 
@@ -30,7 +30,7 @@ describe Dragoon::Event do
       msg = ":zigcat_Fox!~zigcat_fox@hostname JOIN #time_to_show_off"
       event = Dragoon::Event.parse(msg)
       event.name.should == :join
-      event.message.text.should == ":zigcat_Fox!~zigcat_fox@hostname JOIN #time_to_show_off"
+      event.message.text.should == msg
       event.message.nickname.should == "zigcat_Fox"
       event.message.user.should == "~zigcat_fox"
       event.message.hostname.should == "hostname"
@@ -41,7 +41,7 @@ describe Dragoon::Event do
       msg = ":nick!~user@hostname PRIVMSG #ruby :array << 0 if array.size.odd?"
       event = Dragoon::Event.parse(msg)
       event.name.should == :privmsg
-      event.message.text.should == ":nick!~user@hostname PRIVMSG #ruby :array << 0 if array.size.odd?"
+      event.message.text.should == msg
       event.message.nickname.should == "nick"
       event.message.user.should == "~user"
       event.message.hostname.should == "hostname"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dragoon
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Reginald Tan
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-25 00:00:00 Z
+date: 2012-02-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -117,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: dragoon
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: IRC bot for keyword notification