sbfaulkner-net-irc 0.9.3 → 0.9.4

data/bin/nicl

@@ -44,9 +44,38 @@ end
 
 include Ansi
 
-def prompt(text)
-  print text
-  STDIN.readline.chomp
+begin
+  require 'termios'
+  # real implementation for toggling echo
+  def echo(on = true)
+    oldt = Termios.tcgetattr(STDIN)
+    newt = oldt.dup
+    newt.lflag &= ~Termios::ECHO
+    Termios.tcsetattr(STDIN, Termios::TCSANOW, newt)
+  
+    # if no block is provided, return the original echo setting
+    return (oldt.lflag & Termios::ECHO) == Termios::ECHO unless block_given?
+  
+    # otherwise yield to the block and restore the original echo setting
+    ret = yield
+    Termios.tcsetattr(STDIN, Termios::TCSANOW, oldt)
+    ret
+  end
+rescue LoadError
+  # minimal stub in case Termios is not installed
+  def echo(on = true)
+    return true unless block_given?
+    yield
+  end
+end
+
+def prompt(text, hidden = false)
+  echo(false) do
+    print text
+    line = STDIN.readline.chomp
+    print "\n"
+    line
+  end
 end
 
 # TODO: a bit backwards... should probably be "Net::IRC.logger = logger"
@@ -61,8 +90,9 @@ server = ARGV[0] || "irc.freenode.net"
 port = ARGV[1] && ARGV[1].to_i || 6667
 user = ARGV[2] || prompt('User: ')
 full_name = ARGV[3] || ARGV[2] || prompt('Full name: ')
+password = ARGV[4] || prompt('Password: ', true)
 
-Net::IRC.start user, full_name, server, port do |irc|
+Net::IRC.start user, password, full_name, server, port do |irc|
   Thread.new do
     irc.each do |message|
       case message
@@ -120,7 +150,7 @@ Net::IRC.start user, full_name, server, port do |irc|
         irc.privmsg('nickserv', 'help')
       
       when Net::IRC::RplLoggedin, Net::IRC::RplLoggedout
-        puts highlight(message.text, fg(CYAN))
+        puts highlight(message.text, fg(GREEN))
         
       when Net::IRC::Error
         puts highlight("Unhandled ERROR: #{message.class} (#{message.command})", BOLD, fg(RED))
@@ -184,7 +214,7 @@ Net::IRC.start user, full_name, server, port do |irc|
       
       when 'MSG'
         # TODO: validate arguments... support for password... etc.
-        scanner.scan(/([\S]+)\s+(.*)/)
+        scanner.scan(/(\S+)\s+(.*)/)
         irc.privmsg(scanner[1], scanner[2])
       when 'PART'
         # TODO: validate arguments... support for password... etc.
@@ -195,7 +225,7 @@ Net::IRC.start user, full_name, server, port do |irc|
       else
         puts highlight("Unknown COMMAND: #{command}", BOLD, fg(RED))
       end
-    elsif scanner.scan(/(.+)\s+(.*)/)
+    elsif scanner.scan(/(\S+)\s+(.*)/)
       irc.privmsg(scanner[1], scanner[2])
     else
       # TODO: error? need a concept of a current room

data/lib/net/hyperion.yml

@@ -0,0 +1,3 @@
+---
+901: RPL_LOGGEDIN
+902: RPL_LOGGEDOUT

data/lib/net/irc.rb

@@ -673,8 +673,8 @@ module Net
     end
 
     class << self
-      def start(user, realname, address, port = nil, &block)
-        new(address, port).start(user, realname, &block)
+      def start(user, password, realname, address, port = nil, &block)
+        new(address, port).start(user, password, realname, &block)
       end
     end
 
@@ -689,18 +689,18 @@ module Net
       @started
     end
 
-    def start(user, realname, nickname = nil)
+    def start(user, password, realname, nickname = nil)
       raise IOError, 'IRC session already started' if started?
 
       if block_given?
         begin
-          do_start(user, realname, nickname)
+          do_start(user, password, realname, nickname)
           return yield(self)
         ensure
           do_finish
         end
       else
-        do_start(user, realname, nickname)
+        do_start(user, password, realname, nickname)
         return self
       end
     end
@@ -782,6 +782,10 @@ module Net
         Part.new(Array(channels).join(','))
       end.write(@socket)
     end
+
+    def pass(password)
+      Pass.new(password).write(@socket)
+    end
     
     def pong(server, target = nil)
       Pong.new(server, target).write(@socket)
@@ -800,9 +804,9 @@ module Net
     end
 
     private
-    def do_start(user, realname, nickname = nil)
+    def do_start(user, password, realname, nickname = nil)
       @socket = InternetMessageIO.old_open(@address, @port)
-      # TODO: Pass.new(password).write(@socket)
+      pass(password) unless password.nil? || password.empty?
       nick(user)
       user(user, realname)
       @started = true

data/net-irc.gemspec

@@ -1,7 +1,7 @@
 SPEC = Gem::Specification.new do |s| 
   # identify the gem
   s.name = "net-irc" 
-  s.version = "0.9.3" 
+  s.version = "0.9.4" 
   s.author = "S. Brent Faulkner" 
   s.email = "brentf@unwwwired.net" 
   s.homepage = "http://www.unwwwired.net" 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sbfaulkner-net-irc
 version: !ruby/object:Gem::Version 
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors: 
 - S. Brent Faulkner
@@ -9,7 +9,7 @@ autorequire: net/irc
 bindir: bin
 cert_chain: []
 
-date: 2008-08-13 00:00:00 -07:00
+date: 2008-12-22 00:00:00 -08:00
 default_executable: 
 dependencies: []