raibo 0.0.4 → 0.1.0

data/.gitignore

@@ -1,5 +1,6 @@
 *.gem
 .bundle
+.project
 Gemfile.lock
 pkg/*
 Botfile

data/Gemfile

@@ -1,7 +1,2 @@
 source "http://rubygems.org"
-
-# Specify your gem's dependencies in raibo.gemspec
 gemspec
-
-# Development dependencies
-gem 'rspec'

data/Rakefile

@@ -1,2 +1,7 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
+
+require 'rspec/core/rake_task'
+
+desc 'Run specs'
+RSpec::Core::RakeTask.new

data/bin/raibo

@@ -1,33 +1,48 @@
 #!/usr/bin/env ruby
 
-require 'rubygems'
+$:.unshift File.expand_path('../../lib', __FILE__)
+
 require 'raibo'
 require 'optparse'
 require 'ostruct'
 
 options = OpenStruct.new
 options.botfile = 'Botfile'
+options.verbose = false
+
 options.nick    = 'Raibo'
 options.channel = '#raibo'
-options.verbose = false
+
+options.room    = 'Raibo'
+options.token   = ''
 
 opts = OptionParser.new do |o|
-  o.banner = "Usage: raibo <server>[:<port>] [options]"
+  o.banner = "Usage: raibo (<server>:<port> || campfire:<subdomain>) [options]"
 
   o.on("-b", "--botfile [FILE]",
        "specify the location of the bot's configuration (default is \"./Botfile\")") do |file|
     options.botfile = file
   end
 
+  o.on("-c", "--channel [CHANNEL]",
+       "specify the IRC channel to use (default is \"#raibo\")") do |channel|
+    options.channel = channel
+  end
+
   o.on("-n", "--nick [NICK]",
-       "specify the nick to use (default is \"Raibo\")") do |nick|
+       "specify the IRC nick to use (default is \"Raibo\")") do |nick|
     options.nick = nick
   end
 
-  o.on("-c", "--channel [CHANNEL]",
-       "specify the channel to use (default is \"#raibo\")") do |channel|
-    options.channel = channel
- end
+  o.on("-r", "--room [ROOM]",
+       "specify the Campfire room to use (default is \"Raibo\")") do |room|
+    options.room = room
+  end
+
+  o.on("-t", "--token [TOKEN]",
+       "specify the Campfire API token to use (required for Campfire)") do |token|
+    options.token = token
+  end
 
   o.on("-v", "--verbose", "show every incoming and outgoing line") do
     options.verbose = true
@@ -52,10 +67,23 @@ end
 
 server, port = ARGV.shift.split(':')
 
-b = Raibo::Bot.new(server,
-                   :port    => port,
-                   :nick    => options.nick,
-                   :channel => options.channel,
-                   :verbose => options.verbose)
+if server == 'campfire'
+  subdomain = port
+  b = Raibo::Bot.new('campfire',
+    subdomain,
+    :token   => options.token,
+    :room    => options.room,
+    :verbose => options.verbose
+  )
+else #IRC
+  b = Raibo::Bot.new('irc',
+    server,
+    :port    => port,
+    :nick    => options.nick,
+    :channel => options.channel,
+    :verbose => options.verbose
+  )
+end
+
 b.load_config_file(options.botfile)
 b.run

data/lib/raibo.rb

@@ -4,7 +4,8 @@ end
 require 'socket'
 
 require 'raibo/version'
-require 'raibo/connection'
+require 'raibo/campfire_connection'
+require 'raibo/irc_connection'
 require 'raibo/bot'
 require 'raibo/message'
 require 'raibo/dsl'

data/lib/raibo/bot.rb

@@ -3,10 +3,14 @@ module Raibo
     attr_accessor :docs
 
     def initialize(*args)
-      if args.first.is_a?(Raibo::Connection)
+      if args.first.is_a?(Raibo::CampfireConnection) or args.first.is_a?(Raibo::IrcConnection)
         @connection = args.shift
-      else
-        @connection = Raibo::Connection.new(*args)
+      elsif args.first == 'campfire'
+        args.shift
+        @connection = Raibo::CampfireConnection.new(*args)
+      elsif args.first == 'irc'
+        args.shift
+        @connection = Raibo::IrcConnection.new(*args)
       end
 
       reset
@@ -61,15 +65,8 @@ module Raibo
       def run_sync
         @connection.open
         @connection.handle_lines do |line|
-          begin
-            message = Raibo::Message.new(line)
-          rescue => e
-            if @connection.verbose
-              puts "Error parsing line:"
-              puts "  #{line}"
-              puts "  #{e.backtrace}"
-            end
-          end
+          message = @connection.construct_message(line)
+
           @handlers.each do |handler|
             begin
               if handler.is_a?(Proc)
@@ -78,6 +75,9 @@ module Raibo
                 break if handler.call(@connection, message)
               end
             rescue Exception => e
+              if @connection.verbose
+                puts "Handler exception:\n  #{e.backtrace.join("\n  ")}"
+              end
               @connection.say e.inspect
             end
           end

data/lib/raibo/campfire_connection.rb

@@ -0,0 +1,73 @@
+require 'tinder'
+
+module Raibo
+  class CampfireConnection
+    attr_accessor :subdomain, :token, :room_name, :verbose, :opened
+
+    def initialize(subdomain, opts={})
+      @subdomain  = subdomain
+      @token      = opts[:token]
+      @room_name  = opts[:room] || 'Raibo'
+      @verbose    = !!opts[:verbose]
+      @opened     = false
+    end
+
+    def open
+      if @token.nil? or @token == ''
+        raise "token is a required field for Campfire"
+      end
+
+      @campfire = Tinder::Campfire.new @subdomain, :token => @token
+      @room = @campfire.find_room_by_name @room_name
+      @name = @campfire.me['name']
+
+      puts "Connected to room #{@room_name}" if @verbose
+      @opened = true
+    end
+
+    def close
+      @room.leave if @room
+    rescue
+    end
+
+    def handle_lines
+      @room.listen do |m|
+        # Message Format:
+        # :body: the body of the message
+        # :user: Campfire user, which is itself a hash, of:
+        #    :id: User id
+        #    :name: User name
+        #    :email_address: Email address
+        #    :admin: Boolean admin flag
+        #    :created_at: User creation timestamp
+        #    :type: User type (e.g. Member)
+        # :id: Campfire message id
+        # :type: Campfire message type
+        # :room_id: Campfire room id
+        # :created_at: Message creation timestamp
+
+        puts "--> #{m}" if @verbose
+        if m[:type] == 'TextMessage' and m[:user][:name] != @name
+          yield m
+        end
+      end
+    rescue => e
+      puts "Error:\n  #{e.backtrace.join('  ')}" if @verbose
+      retry
+    end
+
+    def say(*msgs)
+      m = msgs.join("\n")
+      if msgs.size == 1
+        @room.speak m
+      else
+        @room.paste m
+      end
+      puts "<-- #{m}" if @verbose
+    end
+
+    def construct_message(msg)
+      Raibo::Message.new(:message, msg[:user][:name], @room_name, msg[:body])
+    end
+  end
+end

data/lib/raibo/{connection.rb → irc_connection.rb}

@@ -1,6 +1,6 @@
 module Raibo
-  class Connection
-    attr_accessor :server, :port, :nick, :channel
+  class IrcConnection
+    attr_accessor :server, :port, :nick, :channel, :verbose
 
     def initialize(server, opts={})
       @server  = server
@@ -69,5 +69,9 @@ module Raibo
       puts "<-- #{str}" if @verbose
       @connection.puts(str)
     end
+
+    def construct_message(msg)
+      Raibo::IrcMessage.new(msg)
+    end
   end
 end

data/lib/raibo/message.rb

@@ -1,18 +1,51 @@
 module Raibo
   class Message
-    # Readers for the components of the actual IRC protocol line.
-    attr_reader :prefix, :type, :middle, :trailing
-
-    # Readers for higher-level attributes of the message.
     attr_reader :kind, :from, :to, :body
 
+    def initialize(kind, from, to, body)
+      @kind, @from, @to, @body = kind, from, to, body
+    end
+  end
+
+  class IrcMessage
+    attr_reader :prefix, :type, :middle, :trailing
+
     def initialize(line)
       @prefix, @type, @middle, @trailing = parse_line(line)
+    end
 
-      @kind = get_kind
-      @from = get_from
-      @to   = get_to
-      @body = get_body
+    def kind
+      case type
+      when 'PRIVMSG'
+        if trailing =~ /^\001ACTION/
+          :emote
+        else
+          :message
+        end
+      when 'JOIN'
+        :join
+      when 'PART'
+        :part
+      end
+    end
+
+    def from
+      prefix[/^([^!@ ]*)/, 1]
+    end
+
+    def to
+      if [:message, :emote].include?(kind)
+        middle.first
+      end
+    end
+
+    def body
+      case kind
+      when :message
+        trailing
+      when :emote
+        trailing[/\001ACTION ([^\001]*)/, 1]
+      end
     end
 
     private
@@ -25,39 +58,5 @@ module Raibo
         end
         [prefix, type, middle, trailing]
       end
-
-      def get_kind
-        case type
-          when 'PRIVMSG'
-            if trailing =~ /^\001ACTION/
-              :emote
-            else
-              :message
-            end
-          when 'JOIN'
-            :join
-          when 'PART'
-            :part
-        end
-      end
-
-      def get_from
-        prefix[/^([^!@ ]*)/, 1]
-      end
-
-      def get_to
-        if [:message, :emote].include?(kind)
-          middle.first
-        end
-      end
-
-      def get_body
-        case kind
-        when :message
-          trailing
-        when :emote
-          trailing[/\001ACTION ([^\001]*)/, 1]
-        end
-      end
   end
 end

data/lib/raibo/version.rb

@@ -1,3 +1,3 @@
 module Raibo
-  VERSION = "0.0.4"
+  VERSION = "0.1.0"
 end

data/raibo.gemspec

@@ -18,4 +18,8 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
+
+  s.add_dependency 'tinder'
+
+  s.add_development_dependency 'rspec'
 end

data/spec/message_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 module Raibo
   describe Message do
     it 'parses a message' do
-      m = Raibo::Message.new(":someone!someone@Nightstar-251832d1.snfc22.example.com PRIVMSG #raibo :foo bar baz")
+      m = Raibo::IrcMessage.new(":someone!someone@Nightstar-251832d1.snfc22.example.com PRIVMSG #raibo :foo bar baz")
 
       m.kind.should == :message
       m.from.should == 'someone'
@@ -12,7 +12,7 @@ module Raibo
     end
 
     it 'parses an emote' do
-      m = Raibo::Message.new(":someone!someone@Nightstar-251832d1.snfc22.example.com PRIVMSG #raibo :\001ACTION foo bar baz\001")
+      m = Raibo::IrcMessage.new(":someone!someone@Nightstar-251832d1.snfc22.example.com PRIVMSG #raibo :\001ACTION foo bar baz\001")
 
       m.kind.should == :emote
       m.from.should == 'someone'
@@ -21,7 +21,7 @@ module Raibo
     end
 
     it 'parses a join' do
-      m = Raibo::Message.new(":someone!someone@Nightstar-251832d1.snfc22.example.com JOIN :#raibo")
+      m = Raibo::IrcMessage.new(":someone!someone@Nightstar-251832d1.snfc22.example.com JOIN :#raibo")
 
       m.kind.should == :join
       m.from.should == 'someone'
@@ -30,7 +30,7 @@ module Raibo
     end
 
     it 'parses a part' do
-      m = Raibo::Message.new(":someone!someone@Nightstar-251832d1.snfc22.example.com PART #raibo")
+      m = Raibo::IrcMessage.new(":someone!someone@Nightstar-251832d1.snfc22.example.com PART #raibo")
 
       m.kind.should == :part
       m.from.should == 'someone'
@@ -39,7 +39,7 @@ module Raibo
     end
 
     it 'parses an arbitrary line' do
-      m = Raibo::Message.new(":Deepthought.NY.US.Nightstar.Net 255 Raibo :I have 83 clients and 1 servers")
+      m = Raibo::IrcMessage.new(":Deepthought.NY.US.Nightstar.Net 255 Raibo :I have 83 clients and 1 servers")
       m.kind.should == nil
     end
   end

data/spec/spec_helper.rb

@@ -1,2 +1,2 @@
-require 'rubygems'
+$:.unshift File.expand_path('../../lib', __FILE__)
 require 'raibo'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: raibo
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,40 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-30 00:00:00.000000000Z
-dependencies: []
+date: 2012-06-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: tinder
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ''
 email:
 - rwfitzge@gmail.com
@@ -26,8 +58,9 @@ files:
 - example/example_module.rb
 - lib/raibo.rb
 - lib/raibo/bot.rb
-- lib/raibo/connection.rb
+- lib/raibo/campfire_connection.rb
 - lib/raibo/dsl.rb
+- lib/raibo/irc_connection.rb
 - lib/raibo/message.rb
 - lib/raibo/version.rb
 - raibo.gemspec
@@ -53,10 +86,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: raibo
-rubygems_version: 1.8.6
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A simple IRC library
 test_files:
 - spec/message_spec.rb
 - spec/spec_helper.rb
+has_rdoc: