fantasy-irc 0.1.1 → 0.1.2

data/Gemfile

@@ -0,0 +1,9 @@
+source :rubygems
+
+gem "array-unique", "~> 1.1.1"
+gem "rake"
+
+group :test do
+    gem "rspec"
+    gem "rspec-mocks"
+end

data/Gemfile.lock

@@ -0,0 +1,29 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    array-hooked (1.1.4)
+      identifies_as
+      module-cluster
+    array-unique (1.1.1)
+      array-hooked
+    diff-lcs (1.1.3)
+    identifies_as (1.1.0)
+    module-cluster (2.0.5)
+    rake (0.9.2.2)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  array-unique (~> 1.1.1)
+  rake
+  rspec
+  rspec-mocks

data/README.md

@@ -1,6 +1,6 @@
 # fantasy-irc
 
-A modular, event-driven IRC client gem for Ruby with plugin support
+A modular, event-driven IRC client/bot Ruby gem with plugin support
 
 ## Installation
 
@@ -32,7 +32,6 @@ TLDR:
 Support?
 
     irc.jdqirc.net #fantasy
-
     irc://irc.jdqirc.net/fantasy
 
 ## Contributing
@@ -43,3 +42,7 @@ Support?
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
+
+
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/v2px/fantasy-irc/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+

data/Rakefile

@@ -0,0 +1,7 @@
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new
+
+task :default => :spec
+task :test => :spec

data/docs/example.rb

@@ -9,15 +9,13 @@ bot.plugins.load 'corecommands'
 
 # log in once we are connected
 connected = Proc.new do
-	bot.login :nickname => "example", :username => "example", :realname => "GECOS field"
+	bot.login nickname: "example", username: "example", realname: "GECOS field"
 end
 bot.events.by_name('connected').register &connected
 
 # join a room and say hi
 loggedin = Proc.new do
-	%w{#lobby}.each do |r|
-		room = bot.rooms.new(r).join.say "ohai"
-	end
+    bot.rooms.new("#test").join.say "ohai"
 end
 bot.events.by_name('loggedin').register &loggedin
 
@@ -33,5 +31,5 @@ channel_message = Proc.new do |room, user, text|
 end
 bot.events.by_name('channel_message').register &channel_message
 
-bot.connect :server => "irc.example.com", :ssl => true, :port => 6697
+bot.connect server: "irc.example.com", ssl: true, port: 6697
 bot.run

data/fantasy-irc.gemspec

@@ -1,14 +1,14 @@
 Gem::Specification.new do |s|
   s.authors           = ["Jens Becker"]
   s.email             = ["v2px@v2px.de"]
-  s.description       = "A modular, event-driven IRC client/bot gem for Ruby with plugin support"
-  s.summary           = "A modular, event-driven IRC client/bot gem for Ruby with plugin support"
+  s.description       = "A modular, event-driven IRC client/bot Ruby gem with plugin support"
+  s.summary           = "A modular, event-driven IRC client/bot Ruby gem with plugin support"
   s.homepage          = "http://v2px.github.com/fantasy-irc"
 
   s.files             = `git ls-files`.split("\n")
   s.name              = "fantasy-irc"
   s.require_paths     = ['lib']
-  s.version           = "0.1.1"
+  s.version           = "0.1.2"
 
   s.rubyforge_project = s.name
   s.add_runtime_dependency "array-unique", "~> 1.1.1"

data/lib/fantasy-irc/events.rb

@@ -5,28 +5,28 @@ module Fantasy
         class Factory
             def initialize
                 puts "Initializing new Event::Factory #{self}"
-                @data, @data[:events] = Hash.new, Hash.new
+                @events = Hash.new
             end
 
             def create name
                 name.downcase!
 
-                if not @data[:events][name].nil? then
-                    return @data[:events][name]
+                if not @events[name].nil? then
+                    return @events[name]
                     # TODO: log warning
                 end
 
-                @data[:events][name] = Event.new(name)
+                @events[name] = Event.new(name)
             end
 
             def by_name name
                 name.downcase!
 
-                if not @data[:events][name] then
+                if not @events[name] then
                     raise "Tried to access unknown event \"#{name}\" in Event::Factory \"#{self}\""
                 end
 
-                @data[:events][name]
+                @events[name]
             end
         end
 
@@ -36,26 +36,22 @@ module Fantasy
             def initialize(name)
                 puts "New Event with name #{name}"
                 @name = name
-                @data = Hash.new
+                @callbacks = Hash.new
             end
 
             def register(&callback)
                 uuid = SecureRandom.uuid()
 
-                if @data[:callbacks].nil? then
-                    @data[:callbacks] = Hash.new
-                end
-
-                @data[:callbacks][uuid] = callback
+                @callbacks[uuid] = callback
                 puts "#{self}: registered callback #{callback} with uuid #{uuid}."
             end
 
             def call(args=nil)
-                if @data[:callbacks].nil? or @data[:callbacks].empty? then
+                if @callbacks.empty? then
                     return
                 end
 
-                @data[:callbacks].each { |uuid, proc|
+                @callbacks.each { |uuid, proc|
                     proc.call(args)
                 }
             end

data/lib/fantasy-irc/irc.rb

@@ -2,11 +2,6 @@ require 'socket' # TCPSocket
 require 'openssl'
 require 'array-unique'
 
-#require "fantasy-irc/rooms"
-#require "fantasy-irc/users"
-#require "fantasy-irc/events"
-#require "fantasy-irc/plugins"
-
 module Fantasy
     class IRC
         attr_reader :events, :rooms, :users, :plugins
@@ -26,7 +21,7 @@ module Fantasy
             @users = User::Factory.new self
             @plugins = Plugins.new
 
-            %w{tick loggedin connected user_joined channel_message}.each do |e|
+            %w{tick loggedin connected user_joined user_parted user_quit channel_message}.each do |e|
                 @events.create(e)
             end
         end
@@ -39,7 +34,7 @@ module Fantasy
                 data[:username] = data[:nickname]
             end
             if not data[:realname] then
-                data[:realname] = "https://bitbucket.org/v2px/fantasy-irc"
+                data[:realname] = "https://rubygems.org/gems/fantasy-irc"
             end
 
             if not data[:nickname] then
@@ -123,8 +118,6 @@ module Fantasy
                     self.events.by_name('user_joined').call([room, user])
 
                 elsif (tok[1] == "PRIVMSG") then
-                    #                        tok = s.split(' ', 4)
-
                     # channel or private message
                     if (tok[2][0,1] == "#") then
                         # channel message
@@ -146,7 +139,35 @@ module Fantasy
                         end
                     end
 
+                elsif (tok[1] == "PART") then
+                    # user parted
+                    room = self.rooms.by_name(tok[2])
+                    user = self.users.create(tok[0][1,tok[0].length])
+
+                    # remove user from room and room from user
+                    room.users.delete user
+                    user.rooms.delete room
+
+                    return if user.ignored?
+
+                    # TODO part text?
+                    self.events.by_name('user_parted').call([room, user])
+
+                elsif (tok[1] == "QUIT") then
+                    # user quit
+                    user = self.users.create(tok[0][1,tok[0].length])
+
+                    puts "!!! user #{user} quit."
+                    # remove user from all rooms
+                    self.rooms.all.values.each do |room|
+                        room.users.delete user
+                    end
+                    user.reset
+
+                    self.events.by_name('user_quit').call([user])
+
                 else
+
                     # puts "[!] UNKNOWN PROTOCOL PART: #{s}"
                 end
             else

data/lib/fantasy-irc/rooms.rb

@@ -1,5 +1,3 @@
-#require "fantasy-irc/connection"
-
 module Fantasy
     module Room
         class Factory
@@ -26,10 +24,15 @@ module Fantasy
 
                 if not @data[:rooms][name] then
                     raise "Tried to access unknown room \"#{name}\" in Room::Factory \"#{self}\""
+                    #TODO: log
                 end
 
                 @data[:rooms][name]
             end
+
+            def all
+                @data[:rooms]
+            end
         end
 
         class Room

data/lib/fantasy-irc/users.rb

@@ -48,6 +48,12 @@ module Fantasy
                 @rooms = Array::Unique.new
             end
 
+            # resets user information
+            def reset
+                puts "Resetting user #{self.object_id} with name #{@name}"
+                @rooms = Array::Unique.new
+            end
+
             def say message
                 @connection.send('PRIVMSG '+@name+' :'+message)
                 return self

data/spec/lib/fantasy-event_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe Fantasy::Event do
+    describe Fantasy::Event::Event do
+        describe "#new" do
+            it "takes a name as arument and returns a Fantasy::Event::Event object" do
+                e = Fantasy::Event::Event.new("rspec_event")
+                e.should be_an_instance_of Fantasy::Event::Event
+            end
+        end
+    end
+
+    describe Fantasy::Event::Factory do
+        before :each do
+            @fac = Fantasy::Event::Factory.new
+        end
+
+        describe "#new" do
+            it "takes no arguments and returns a Fantasy::Event::Factory object" do
+                @fac.should be_an_instance_of Fantasy::Event::Factory
+            end
+        end
+
+        describe "create" do
+            it "takes a name as arument, creates a new event with this name in lowercase and returns it" do
+                event = @fac.create("rspec_event")
+                event.should be_an_instance_of Fantasy::Event::Event
+            end
+        end
+    end
+end

data/spec/lib/fantasy-irc_spec.rb

@@ -0,0 +1,58 @@
+require 'spec_helper'
+
+describe Fantasy::IRC do
+    before :each do
+        @bot = Fantasy::IRC.new
+
+        # stub the send ethod
+        @bot.stub(:send) { }
+    end
+
+    describe "#new" do
+        it "takes no parameter and returns a Fantasy::IRC object" do
+            @bot.should be_an_instance_of Fantasy::IRC
+        end
+    end
+
+    describe "login" do
+        it "takes no arguments and raises an error" do
+            expect { @bot.login }.to raise_error
+        end
+
+        it "takes a nickname as argument and proceeds to log in" do
+            @bot.should_receive(:send).with(/^USER rspec_nick /)
+            @bot.should_receive(:send).with(/^NICK rspec_nick$/)
+            @bot.login(:nickname => 'rspec_nick')
+        end
+
+        it "takes a username as argument and proceeds to log in" do
+            @bot.should_receive(:send).with(/^USER rspec_uname /)
+            @bot.should_receive(:send).with(/^NICK rspec_uname$/)
+            @bot.login(:username => 'rspec_uname')
+        end
+
+        it "takes a username and a nickname as argument and proceeds to log in with both" do
+            @bot.should_receive(:send).with(/^USER rspec_uname /)
+            @bot.should_receive(:send).with(/^NICK rspec_nick$/)
+            @bot.login(:username => 'rspec_uname', :nickname => 'rspec_nick')
+        end
+
+        it "takes a (username and a) realname and sets the realname too" do
+            @bot.should_receive(:send).with(/^USER rspec_uname [^:]+:rspec realname$/)
+            @bot.login(:username => 'rspec_uname', :realname => "rspec realname")
+        end
+    end
+
+    describe "connect" do
+        it "takes no arguments and raises an error" do
+            expect { @bot.connect }.to raise_error
+        end
+    end
+
+    describe "parse" do
+        it "parses at least the PING message" do
+            @bot.should_receive(:send).with(/^PONG :rspec_test$/)
+            @bot.parse("PING :rspec_test")
+        end
+    end
+end

data/spec/spec_helper.rb

@@ -0,0 +1 @@
+require 'fantasy-irc'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fantasy-irc
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-26 00:00:00.000000000 Z
+date: 2013-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: array-unique
@@ -27,15 +27,18 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.1
-description: A modular, event-driven IRC client/bot gem for Ruby with plugin support
+description: A modular, event-driven IRC client/bot Ruby gem with plugin support
 email:
 - v2px@v2px.de
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- Gemfile
+- Gemfile.lock
 - LICENSE.md
 - README.md
+- Rakefile
 - docs/PLUGINS.md
 - docs/example.rb
 - fantasy-irc.gemspec
@@ -46,6 +49,9 @@ files:
 - lib/fantasy-irc/rooms.rb
 - lib/fantasy-irc/users.rb
 - lib/plugins/corecommands.rb
+- spec/lib/fantasy-event_spec.rb
+- spec/lib/fantasy-irc_spec.rb
+- spec/spec_helper.rb
 homepage: http://v2px.github.com/fantasy-irc
 licenses: []
 post_install_message: 
@@ -69,5 +75,5 @@ rubyforge_project: fantasy-irc
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: A modular, event-driven IRC client/bot gem for Ruby with plugin support
+summary: A modular, event-driven IRC client/bot Ruby gem with plugin support
 test_files: []