sponge 0.2.8 → 0.2.9

data/Rakefile

@@ -8,15 +8,14 @@ require "lib/sponge/version"
 NAME = 'sponge'
 VERSION = Sponge::VERSION
 TITLE = "Sponge: The simple IRC library"
-CLEAN.include ["*.gem", ".config", "rdoc"]
+CLEAN.include ["*.gem", "doc"]
 RDOC_OPTS = [
-  "--line-numbers", "--inline-source",
-  "--title", TITLE,
+  "-U", "--title", TITLE,
   "--main", "README.rdoc"
 ]
 
 Rake::RDocTask.new do |rdoc|
-  rdoc.rdoc_dir = "rdoc"
+  rdoc.rdoc_dir = "doc"
   rdoc.options += RDOC_OPTS
   rdoc.rdoc_files.add %w(README.rdoc lib/**/*.rb)
 end
@@ -48,7 +47,7 @@ end
 
 desc "Upload rdoc to injekt.net"
 task :upload do
-  sh("scp -rP 2295 rdoc/ injekt@injekt.net:/var/www/localhost/rdoc.injekt.net/sponge")
+  sh("scp -rP 2295 doc/* injekt@injekt.net:/var/www/localhost/rdoc.injekt.net/sponge")
 end
 
-task :default => [:rdoc, :package]
+task :default => [:clean, :rdoc, :package]

data/lib/sponge/irc/client.rb

@@ -41,9 +41,16 @@ module Sponge
       # Client configuration options
       attr_reader :config
       
+      # Our Listeners Object
+      attr_reader :listeners
+      
       def initialize(server=nil, opts={}, &blk)
-        @config = OpenStruct.new(opts.merge(OptionsDSL.new(server, &blk).options))
-        @config.port ||= 6667
+        config = opts.merge(OptionsDSL.new(server, &blk).options)
+        config = OpenStruct.new(opts.merge(config))
+        @config = config
+        
+        config.port ||= 6667
+        raise(ArgumentError, "No server supplied") unless config.server
         
         @irc = IRC::Socket.new(config.server, config.port)
         @irc.client = self
@@ -108,7 +115,8 @@ module Sponge
       private
       
       def setup_username
-        raise "You must set a nickname" unless nick = config.nickname
+        nick = config.nickname || 'Sponge'
+        config.nickname ||= nick
         config.username ||= nick
         config.hostname ||= nick
         config.realname ||= nick
@@ -125,7 +133,7 @@ module Sponge
         def initialize(server=nil, &blk)
           @options = {}
           server(server) if server         
-          instance_eval(&blk)
+          instance_eval(&blk) if block_given?
         end
         
         def server(val)

data/lib/sponge/irc/listeners.rb

@@ -41,6 +41,7 @@ module Sponge
           raise "listener for #{command} already exists" if @list.key?(command)
           @list[command] = Listener.new(command, &blk)
         end
+        commands
       end
       
       # Remove a listener from our list
@@ -52,6 +53,10 @@ module Sponge
         @list[command]
       end
       
+      def include?(k)
+        @list.key?(k)
+      end
+      
       # Invoke #call on a Listener if it exists passing an IRC::Message
       def handle(message)
         raise "Not a IRC::Message" unless message.is_a?(Sponge::IRC::Message)

data/lib/sponge/version.rb

@@ -1,7 +1,7 @@
 module Sponge
   MAJOR = 0
   MINOR = 2
-  TINY = 8
+  TINY = 9
   
   VERSION = [MAJOR, MINOR, TINY].join('.')
   

data/spec/helper.rb

@@ -0,0 +1,10 @@
+require File.expand_path('../../lib/sponge.rb', __FILE__)
+require 'bacon'
+
+class Sponge::IRC::Socket
+  def write(data)
+    nil
+  end
+end
+
+# Add some mock IRC server stuff for real testing

data/spec/sponge/irc/client.rb

@@ -0,0 +1,45 @@
+require File.expand_path('../../../helper', __FILE__)
+
+client = Sponge::IRC::Client.new('irc.freenode.org')
+
+describe "Sponge::IRC::Client" do
+  
+  it "should default to port 6667" do
+    client.config.port.should == 6667
+  end
+  
+  it "should default to nickname 'Sponge'" do
+    client.config.nickname.should == 'Sponge'
+  end
+  
+  it "should use the default nickname if no username, hostname, or realname are supplied" do
+    c = Sponge::IRC::Client.new('', :nickname => 'foobot')
+    
+    [:username, :hostname, :realname].each do |attr|
+      c.config.send(attr).should == 'foobot'
+    end
+  end
+  
+  describe "#set_nick" do
+    it "should change the nickname" do
+      client.set_nick("Spongebot")
+      
+      client.config.nickname.should.not == 'Sponge'
+      client.config.nickname.should == 'Spongebot'
+    end
+  end
+  
+  describe "#on" do
+    it "should create a listener" do
+      client.on('foo')
+      client.listeners.include?('foo').should.be.true
+      client.listeners.all.should.include?('foo')
+    end
+    
+    it "should return a list of commands we've added listeners to" do
+      listeners = client.on(:bar, :baz)
+      listeners.should.equal [:bar, :baz]
+    end
+  end
+
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 8
-  version: 0.2.8
+  - 9
+  version: 0.2.9
 platform: ruby
 authors: 
 - Lee 'injekt' Jarvis
@@ -16,8 +16,21 @@ cert_chain: []
 
 date: 2010-04-05 00:00:00 +01:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: bacon
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
+        - 0
+        version: 1.1.0
+  type: :development
+  version_requirements: *id001
 description: A simple IRC library
 email: ljjarvis@gmail.com
 executables: []
@@ -31,6 +44,8 @@ files:
 - Rakefile
 - examples/client.rb
 - examples/socket.rb
+- spec/sponge/irc/client.rb
+- spec/helper.rb
 - lib/sponge/version.rb
 - lib/sponge/irc/listeners.rb
 - lib/sponge/irc/client.rb
@@ -46,8 +61,6 @@ licenses: []
 post_install_message: 
 rdoc_options: 
 - --quiet
-- --line-numbers
-- --inline-source
 - --title
 - "Sponge: The Simple IRC library"
 - --main