ceiling_cat 0.0.9 → 0.1.0

data/bin/ceiling_cat

@@ -23,4 +23,4 @@ else
   else
     puts "Couldn't find a Chatfile at #{file}! Create one at `./Chatfile`, provide a path to one, or run `ceiling_cat setup`"
   end
-end
+end

data/lib/ceiling_cat.rb

@@ -1,4 +1,4 @@
 # General
-%w{version setup connection errors event user room plugins/base services/campfire storage/base storage/hash storage/yaml}.each do |file|
+%w{version setup connection errors event user room plugins/base services/campfire services/irc storage/base storage/hash storage/yaml}.each do |file|
   require "ceiling_cat/#{file}"
 end

data/lib/ceiling_cat/plugins/about.rb

@@ -31,13 +31,21 @@ module CeilingCat
       end
       
       def list_users
-        members = room.list_of_users_in_room(:type => "member")
-        reply "#{members} #{pluralize(members.size, "is a", "are")} #{pluralize(members.size, "registered user")}."
+        members = room.users_in_room(:type => "member")
+        if members.size > 0
+          reply "#{room.list_of_users_in_room(:type => "member")} #{pluralize(members.size, "is a", "are")} #{pluralize(members.size, "registered user")}."
+        else
+          reply "There are no registered users in the room at this time."
+        end
       end
       
       def list_guests
-        guests = room.list_of_users_in_room(:type => "guest")
-        reply "#{guests} #{pluralize(members.size, "is a", "are")} #{pluralize(members.size, "guest")}."
+        guests = room.users_in_room(:type => "guest")
+        if guests.size > 0
+          reply "#{room.list_of_users_in_room(:type => "guest")} #{pluralize(guests.size, "is a", "are")} #{pluralize(guests.size, "guest")}."
+        else
+          reply "There are no guests in the room at this time."
+        end
       end
     end
   end

data/lib/ceiling_cat/room.rb

@@ -66,11 +66,11 @@ module CeilingCat
 
     def list_of_users_in_room(type=nil)
       users = users_in_room(type)
-      last_user = users.pop
-      if users.size > 0
-        return users.collect{|user| user["name"] }.join(", ") + " and #{ last_user["name"]}"
-      else
-        return last_user["name"]
+      if users.size > 1
+        last_user = users.pop
+        return users.collect{|user| user.name }.join(", ") + " and #{ last_user.name}"
+      elsif users.size == 1
+        return users.first.name
       end
     end
   end

data/lib/ceiling_cat/services/campfire/room.rb

@@ -72,17 +72,18 @@ module CeilingCat
           @users_in_room = @campfire_room.users
         end
 
-        @users_in_room.find_all do |user|
-          unless is_me?(CeilingCat::User.new(user[:name], :id => user[:id], :role => user[:type]))
+        @users_in_room.collect{ |user_in_room|
+          user = CeilingCat::User.new(user_in_room[:name], :id => user_in_room[:id], :role => user_in_room[:type])
+          unless is_me?(user)
             if opts[:type].present?
-              if user[:type].to_s.downcase == opts[:type].downcase
-                CeilingCat::User.new(user[:name], :id => user[:id], :role => user[:type])
+              if user.role.to_s.downcase == opts[:type].downcase
+                user
               end
             else
-              CeilingCat::User.new(user[:name], :id => user[:id], :role => user[:type])
+              user
             end
           end
-        end
+        }
       end
 
       def say(something_to_say)

data/lib/ceiling_cat/services/irc.rb

@@ -0,0 +1,3 @@
+%w{connection room event}.each do |file|
+  require "ceiling_cat/services/irc/#{file}"
+end

data/lib/ceiling_cat/services/irc/connection.rb

@@ -0,0 +1,24 @@
+require 'irc-socket'
+
+module CeilingCat
+  module IRC
+    class Connection < CeilingCat::Connection
+      attr_accessor :irc
+
+      def initialize(config)
+        super
+      end
+
+      def irc
+        return @irc if @irc
+        server = @server || 'irc.freenode.org'
+        port = @port || 6667
+        @irc = IRCSocket.new(server)
+      end
+
+      def total_user_count
+        1000
+      end
+    end
+  end
+end

data/lib/ceiling_cat/services/irc/event.rb

@@ -0,0 +1,18 @@
+module CeilingCat
+  module IRC
+    class Event < CeilingCat::Event
+      
+      def type
+        case @type
+        when "EnterMessage", :entrance
+          :entrance
+        when "TextMessage", :chat
+          :chat
+        when "LeaveMessage", "KickMessage", :exit
+          :exit
+        end
+      end
+      
+    end
+  end
+end

data/lib/ceiling_cat/services/irc/room.rb

@@ -0,0 +1,113 @@
+module CeilingCat
+  module IRC
+    class Room < CeilingCat::Room
+      attr_accessor :user_names, :ops_names
+
+      def initialize(opts={})
+        super
+        @ops_names = []
+      end
+
+      def irc
+        @connection.irc
+      end
+
+      def watch
+        puts "Watching room..."
+        irc.connect
+        if irc.connected?
+          irc.nick config.nickname
+          irc.pass config.password if config.password.present?
+          irc.user config.nickname, "+B", "*", config.nickname
+          
+          while line = irc.read
+            # Join a channel after MOTD
+            if line.split[1] == '376'
+              irc.join config.room
+            elsif line.split[1] == "353"
+              @user_names = line.match(/:.+\s353\s.+[\s@]?\s#.+\s:(.+)/i)[1].split
+              irc.privmsg "chanserv", "access #{config.room} list"
+            elsif match = line.match(/:.+\sNOTICE.+:\d\s+(\w+)\s+\+(\w+)/)
+              @ops_names << match[1] if match[2].include?("O")
+              @ops_names.uniq!
+            end
+            
+            puts "Received: #{line}"
+            begin
+              if message = message_parts(line)
+                user = CeilingCat::User.new(message[:name], :role => user_role(message[:name]))
+                if !is_me?(user)
+                  event = CeilingCat::Campfire::Event.new(self, message[:body], user, :type => message[:type])
+                  event.handle
+                end
+              end
+            rescue => e
+              raise e
+            end
+          end
+        end
+      rescue Interrupt
+        puts "Leaving room..."
+        irc.part("#{config.room}")
+      rescue => e
+        puts e.message
+        puts e.backtrace.join("\n")
+        retry
+      end
+
+      def say(something_to_say)
+        Array(something_to_say).each do |line|
+          irc.privmsg config.room, line
+        end
+      end
+      
+      def users_in_room(opts={})
+        @user_names.collect {|user_name|
+          user_name = user_name.sub(/^@/,"")
+          user = CeilingCat::User.new(user_name, :role => user_role(user_name))
+          unless is_me?(user)
+            if opts[:type].present?
+              if user.role.to_s.downcase == opts[:type].downcase
+                user
+              end
+            else
+              user
+            end
+          end
+        }.compact
+      end
+      
+      def user_role(name)
+        if @ops_names.include?(name)
+          "member"
+        else
+          "guest"
+        end
+      end
+      
+      def is_me?(user)
+        user.name == me.name
+      end
+
+      def me
+        @me ||= CeilingCat::User.new(config.nickname, :role => "member")
+      end
+      
+      def message_parts(message)
+        if message =~ /\sPRIVMSG\s/
+          parts = message.match /^:(.+?)!(.+?)@(.+?)\sPRIVMSG\s(#.+):(.+)/i
+          return {:name => parts[1], :body => parts[5], :type => :chat}
+        elsif message =~ /\sJOIN\s/
+          parts = message.match /^:(.+?)!(.+?)@(.+?)\s(.+)\s:(#.+)/i
+          return {:name => parts[1], :body => nil, :type => :entrance}
+        elsif message =~ /PING\s/
+          puts "Sent: PONG"
+          irc.pong message.match(/PING\s:(.+)/)[1]
+          return nil
+        else
+          return nil
+        end
+      end
+    end
+  end
+end

data/lib/ceiling_cat/setup.rb

@@ -38,6 +38,10 @@ module CeilingCat
         connection = CeilingCat::Campfire::Connection.new(self.config)
         room = CeilingCat::Campfire::Room.new(:connection => connection, :room_name => self.config.room)
         room.watch
+      when 'irc'
+        connection = CeilingCat::IRC::Connection.new(self.config)
+        room = CeilingCat::IRC::Room.new(:connection => connection, :room_name => self.config.room)
+        room.watch
       else
         raise CeilingCat::UnsupportedChatServiceError.new("#{self.config.service} is not a supported chat service.")
       end

data/lib/ceiling_cat/user.rb

@@ -4,8 +4,8 @@ module CeilingCat
 
     def initialize(name, opts={})
       @name = name
-      @id = opts[:id]
-      @role = opts[:role]
+      @id = opts[:id] || rand(10000000)
+      @role = opts[:role] || "guest"
     end
     
     def to_s

data/lib/ceiling_cat/version.rb

@@ -1,3 +1,3 @@
 module CeilingCat
-  VERSION = "0.0.9"
+  VERSION = "0.1.0"
 end

data/setup/Chatfile

@@ -4,11 +4,19 @@ require 'ceiling_cat/plugins/calc'
 require 'ceiling_cat/plugins/greeter'
 
 CeilingCat::Setup.configure do |config|
+  # Campfire Settings. Only use one service per chatfile
   config.service = 'campfire'
   config.subdomain = 'username'
   config.token = '12345abcde' # The API token of the account Ceiling Cat will use. Available at https://<subdomain>.campfirenow.com/member/edit
   config.room = 'Test Room'
   config.ssl = true
+
+  # IRC Settings. Only use one service per chatfile
+  # config.service = 'irc'
+  # config.server = 'irc.freenode.org'
+  # config.nick = 'nickname'
+  # config.password = 'Q7Af6laDKza2SOM'
+  # config.room = '#my_room'
   
   config.plugins = [CeilingCat::Plugin::About,
                     CeilingCat::Plugin::Greeter,

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ceiling_cat
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 27
   prerelease: 
   segments: 
   - 0
+  - 1
   - 0
-  - 9
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors: 
 - Chris Warren
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-26 00:00:00 Z
+date: 2011-08-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: tinder
@@ -66,9 +66,25 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: irc-socket
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 1
+        - 0
+        - 1
+        version: 1.0.1
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -80,11 +96,11 @@ dependencies:
         - 0
         version: 2.6.0
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: ruby-debug
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -94,11 +110,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: fakeweb
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -108,7 +124,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
 description: Ceiling Cat is watching you chat. A Campfire chat bot!
 email: 
 - chris@zencoder.com
@@ -144,6 +160,10 @@ files:
 - lib/ceiling_cat/services/campfire/connection.rb
 - lib/ceiling_cat/services/campfire/event.rb
 - lib/ceiling_cat/services/campfire/room.rb
+- lib/ceiling_cat/services/irc.rb
+- lib/ceiling_cat/services/irc/connection.rb
+- lib/ceiling_cat/services/irc/event.rb
+- lib/ceiling_cat/services/irc/room.rb
 - bin/ceiling_cat
 homepage: http://zencoder.com
 licenses: []