flamethrower 0.2.0 → 0.3.0

data/.gitignore

@@ -0,0 +1,4 @@
+*.swp
+*.swo
+*.swn
+*.gem

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/flamethrower.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{flamethrower}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Blake Smith"]
-  s.date = %q{2011-01-17}
+  s.date = %q{2011-01-20}
   s.default_executable = %q{flamethrower}
   s.description = %q{Flamethrower gives you the power to use your awesome irc client to talk in your campfire rooms.}
   s.email = %q{blakesmith0@gmail.com}
@@ -18,73 +18,75 @@ Gem::Specification.new do |s|
     "README.rdoc"
   ]
   s.files = [
-    ".rspec",
-    "Gemfile",
-    "Gemfile.lock",
-    "MIT-LICENSE",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "bin/flamethrower",
-    "flamethrower.gemspec",
-    "lib/flamethrower.rb",
-    "lib/flamethrower/campfire/connection.rb",
-    "lib/flamethrower/campfire/message.rb",
-    "lib/flamethrower/campfire/rest_api.rb",
-    "lib/flamethrower/campfire/room.rb",
-    "lib/flamethrower/campfire/user.rb",
-    "lib/flamethrower/dispatcher.rb",
-    "lib/flamethrower/irc/channel.rb",
-    "lib/flamethrower/irc/codes.rb",
-    "lib/flamethrower/irc/commands.rb",
-    "lib/flamethrower/irc/message.rb",
-    "lib/flamethrower/irc/user.rb",
-    "lib/flamethrower/server.rb",
-    "lib/flamethrower/server/event_server.rb",
-    "lib/flamethrower/server/mock_server.rb",
-    "spec/fixtures/enter_message.json",
-    "spec/fixtures/kick_message.json",
-    "spec/fixtures/leave_message.json",
-    "spec/fixtures/message.json",
-    "spec/fixtures/paste_message.json",
-    "spec/fixtures/paste_message_with_pound.json",
-    "spec/fixtures/room.json",
-    "spec/fixtures/room_update.json",
-    "spec/fixtures/rooms.json",
-    "spec/fixtures/speak_message.json",
-    "spec/fixtures/streaming_message.json",
-    "spec/fixtures/timestamp_message.json",
-    "spec/fixtures/upload_message.json",
-    "spec/fixtures/upload_url_sample",
-    "spec/fixtures/user.json",
-    "spec/spec_helper.rb",
-    "spec/unit/campfire/connection_spec.rb",
-    "spec/unit/campfire/message_spec.rb",
-    "spec/unit/campfire/room_spec.rb",
-    "spec/unit/campfire/user_spec.rb",
-    "spec/unit/dispatcher_spec.rb",
-    "spec/unit/irc/channel_spec.rb",
-    "spec/unit/irc/message_spec.rb",
-    "spec/unit/irc/user_spec.rb",
-    "spec/unit/server/event_server_spec.rb",
-    "spec/unit/server_spec.rb"
+    ".gitignore",
+     ".rspec",
+     "Gemfile",
+     "Gemfile.lock",
+     "MIT-LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "bin/flamethrower",
+     "flamethrower.gemspec",
+     "lib/flamethrower.rb",
+     "lib/flamethrower/campfire/connection.rb",
+     "lib/flamethrower/campfire/message.rb",
+     "lib/flamethrower/campfire/rest_api.rb",
+     "lib/flamethrower/campfire/room.rb",
+     "lib/flamethrower/campfire/user.rb",
+     "lib/flamethrower/dispatcher.rb",
+     "lib/flamethrower/irc/channel.rb",
+     "lib/flamethrower/irc/codes.rb",
+     "lib/flamethrower/irc/commands.rb",
+     "lib/flamethrower/irc/message.rb",
+     "lib/flamethrower/irc/user.rb",
+     "lib/flamethrower/server.rb",
+     "lib/flamethrower/server/event_server.rb",
+     "lib/flamethrower/server/mock_server.rb",
+     "spec/fixtures/enter_message.json",
+     "spec/fixtures/kick_message.json",
+     "spec/fixtures/leave_message.json",
+     "spec/fixtures/message.json",
+     "spec/fixtures/paste_message.json",
+     "spec/fixtures/paste_message_with_pound.json",
+     "spec/fixtures/room.json",
+     "spec/fixtures/room_update.json",
+     "spec/fixtures/rooms.json",
+     "spec/fixtures/speak_message.json",
+     "spec/fixtures/streaming_message.json",
+     "spec/fixtures/timestamp_message.json",
+     "spec/fixtures/upload_message.json",
+     "spec/fixtures/upload_url_sample",
+     "spec/fixtures/user.json",
+     "spec/spec_helper.rb",
+     "spec/unit/campfire/connection_spec.rb",
+     "spec/unit/campfire/message_spec.rb",
+     "spec/unit/campfire/room_spec.rb",
+     "spec/unit/campfire/user_spec.rb",
+     "spec/unit/dispatcher_spec.rb",
+     "spec/unit/irc/channel_spec.rb",
+     "spec/unit/irc/message_spec.rb",
+     "spec/unit/irc/user_spec.rb",
+     "spec/unit/server/event_server_spec.rb",
+     "spec/unit/server_spec.rb"
   ]
   s.homepage = %q{http://github.com/blakesmith/flamethrower}
+  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Campfire IRC gateway}
   s.test_files = [
     "spec/spec_helper.rb",
-    "spec/unit/campfire/connection_spec.rb",
-    "spec/unit/campfire/message_spec.rb",
-    "spec/unit/campfire/room_spec.rb",
-    "spec/unit/campfire/user_spec.rb",
-    "spec/unit/dispatcher_spec.rb",
-    "spec/unit/irc/channel_spec.rb",
-    "spec/unit/irc/message_spec.rb",
-    "spec/unit/irc/user_spec.rb",
-    "spec/unit/server/event_server_spec.rb",
-    "spec/unit/server_spec.rb"
+     "spec/unit/campfire/connection_spec.rb",
+     "spec/unit/campfire/message_spec.rb",
+     "spec/unit/campfire/room_spec.rb",
+     "spec/unit/campfire/user_spec.rb",
+     "spec/unit/dispatcher_spec.rb",
+     "spec/unit/irc/channel_spec.rb",
+     "spec/unit/irc/message_spec.rb",
+     "spec/unit/irc/user_spec.rb",
+     "spec/unit/server/event_server_spec.rb",
+     "spec/unit/server_spec.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -92,29 +94,17 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<eventmachine>, [">= 0"])
-      s.add_runtime_dependency(%q<twitter-stream>, [">= 0"])
-      s.add_runtime_dependency(%q<json>, [">= 0"])
-      s.add_runtime_dependency(%q<em-http-request>, [">= 0"])
       s.add_runtime_dependency(%q<eventmachine>, [">= 0.12.10"])
       s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_runtime_dependency(%q<em-http-request>, [">= 0"])
       s.add_runtime_dependency(%q<twitter-stream>, [">= 0"])
     else
-      s.add_dependency(%q<eventmachine>, [">= 0"])
-      s.add_dependency(%q<twitter-stream>, [">= 0"])
-      s.add_dependency(%q<json>, [">= 0"])
-      s.add_dependency(%q<em-http-request>, [">= 0"])
       s.add_dependency(%q<eventmachine>, [">= 0.12.10"])
       s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<em-http-request>, [">= 0"])
       s.add_dependency(%q<twitter-stream>, [">= 0"])
     end
   else
-    s.add_dependency(%q<eventmachine>, [">= 0"])
-    s.add_dependency(%q<twitter-stream>, [">= 0"])
-    s.add_dependency(%q<json>, [">= 0"])
-    s.add_dependency(%q<em-http-request>, [">= 0"])
     s.add_dependency(%q<eventmachine>, [">= 0.12.10"])
     s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<em-http-request>, [">= 0"])

data/lib/flamethrower/campfire/room.rb

@@ -48,19 +48,30 @@ module Flamethrower
         http.callback do
           case http.response_header.status
           when 200
+            old_users = @users
             @users = []
             json = JSON.parse(http.response)
             json['room']['users'].each do |user|
               @users << Flamethrower::Campfire::User.new(user)
             end
+            resolve_renames(old_users, @users)
             send_info unless @room_info_sent
             @room_info_sent = true
           end
         end
       end
 
+      def resolve_renames(old_users, new_users)
+        old_users.each do |old_user|
+          user = new_users.detect {|new_user| new_user.number == old_user.number}
+          unless old_user.name == user.name
+            @server.send_rename(old_user.to_irc.nickname, user.to_irc.nickname)
+          end
+        end
+      end
+
       def say(body, message_type='TextMessage')
-        params = {'body' => body, 'type' => message_type}
+        params = {'body' => translate_nicknames(body), 'type' => message_type}
         @outbound_messages << Flamethrower::Campfire::Message.new(params)
       end
 
@@ -73,9 +84,10 @@ module Flamethrower
       end
 
       def stop
-        @room_alive = false
+        @stream.stop if @stream
         EventMachine.cancel_timer(@polling_timer)
         EventMachine.cancel_timer(@periodic_timer)
+        @room_alive = false
       end
 
       def poll
@@ -196,6 +208,18 @@ module Flamethrower
           channel.topic = topic.gsub("\n", "\s")
         end
       end
+
+      private
+
+      def translate_nicknames(message_body)
+        @users.each do |user|
+          if message_body.include?(user.to_irc.nickname)
+            message_body.gsub!(user.to_irc.nickname, user.name)
+          end
+        end
+        message_body
+      end
+
     end
   end
 end

data/lib/flamethrower/dispatcher.rb

@@ -8,7 +8,7 @@ module Flamethrower
     
     def handle_message(message)
       method = "handle_#{message.command.downcase}"
-      send(method, message) if protected_methods.include?(method)
+      send(method, message) if protected_methods.map(&:to_s).include?(method)
     end
 
     private
@@ -25,19 +25,19 @@ module Flamethrower
     protected
 
     def handle_privmsg(message)
-      name, body = *message.parameters
+      name, body = message.parameters
       find_channel_or_error(name) do |channel|
         channel.to_campfire.say(body)
       end
     end
 
     def handle_ping(message)
-      hostname = *message.parameters
+      hostname = message.parameters.first
       server.send_pong(hostname)
     end
 
     def handle_user(message)
-      username, hostname, servername, realname = *message.parameters
+      username, hostname, servername, realname = message.parameters
       server.current_user.username = username unless server.current_user.username
       server.current_user.hostname = hostname unless server.current_user.hostname
       server.current_user.servername = servername unless server.current_user.servername
@@ -48,7 +48,7 @@ module Flamethrower
     end
 
     def handle_nick(message)
-      nickname = *message.parameters
+      nickname = message.parameters.first
       server.current_user.nickname = nickname
       if server.current_user.nick_set? && server.current_user.user_set?
         server.after_connect
@@ -84,6 +84,17 @@ module Flamethrower
       end
     end
 
+    def handle_away(message)
+      away_message = message.parameters.first
+      if away_message.empty?
+        server.current_user.away_message = nil
+        server.send_unaway
+      else
+        server.current_user.away_message = away_message
+        server.send_nowaway
+      end
+    end
+
     def handle_who(message)
       find_channel_or_error(message.parameters.first) do |channel|
         server.send_who(channel)

data/lib/flamethrower/irc/codes.rb

@@ -1,16 +1,18 @@
 module Flamethrower
   module Irc
     module Codes
-      RPL_MOTDSTART = 375
-      RPL_MOTD = 372
-      RPL_ENDOFMOTD = 376
+      RPL_UMODEIS = 221
+      RPL_UNAWAY = 305
+      RPL_NOWAWAY = 306
+      RPL_ENDOFWHO = 315
+      RPL_CHANNELMODEIS = 324
       RPL_TOPIC = 332
       RPL_WHOREPLY = 352
-      RPL_ENDOFWHO = 315
       RPL_NAMEREPLY = 353
       RPL_ENDOFNAMES = 366
-      RPL_CHANNELMODEIS = 324
-      RPL_UMODEIS = 221
+      RPL_MOTD = 372
+      RPL_MOTDSTART = 375
+      RPL_ENDOFMOTD = 376
 
       ERR_UNKNOWNCOMMAND = 421
       ERR_BADCHANNELKEY = 475

data/lib/flamethrower/irc/commands.rb

@@ -37,6 +37,14 @@ module Flamethrower
         send_message ":#{from} NICK #{to}"
       end
 
+      def send_nowaway
+        send_message reply(RPL_NOWAWAY, ":You have been marked as being away")
+      end
+
+      def send_unaway
+        send_message reply(RPL_UNAWAY, ":You are no longer marked as being away")
+      end
+
       def send_who(channel)
         send_messages do |messages|
           channel.users.each do |user|

data/lib/flamethrower/irc/user.rb

@@ -3,6 +3,7 @@ module Flamethrower
     class User
 
       attr_accessor :username, :nickname, :hostname, :realname, :servername, :modes
+      attr_accessor :away_message
 
       def initialize(options={})
         @username = options[:username]

data/spec/spec_helper.rb

@@ -6,8 +6,7 @@ require 'webmock/rspec'
 require 'json'
 require 'time'
 
-#::FLAMETHROWER_LOGGER = Logger.new("/dev/null") unless Object.const_defined?("FLAMETHROWER_LOGGER")
-::FLAMETHROWER_LOGGER = Logger.new("/Users/blake/test.log") unless Object.const_defined?("FLAMETHROWER_LOGGER")
+::FLAMETHROWER_LOGGER = Logger.new("/dev/null") unless Object.const_defined?("FLAMETHROWER_LOGGER")
 
 def json_fixture(name)
   file = File.join(File.dirname(__FILE__), "fixtures/#{name}.json")

data/spec/unit/campfire/room_spec.rb

@@ -73,6 +73,26 @@ describe Flamethrower::Campfire::Room do
     end
   end
 
+  describe "#resolve renames" do
+    it "calls 'send_rename' for each user who's name has changed" do
+      blake = Flamethrower::Campfire::User.new('id' => 1, 'name' => 'blake')
+      bob = Flamethrower::Campfire::User.new('id' => 2, 'name' => 'bob')
+      bill = Flamethrower::Campfire::User.new('id' => 3, 'name' => 'bill')
+      old_users = [blake, bob, bill]
+
+      blake2 = blake.dup
+      bob2 = bob.dup
+
+      blake2.name = "Blake Smith"
+      bob2.name = "Bob Hope"
+      new_users = [blake2, bob2, bill]
+
+      @room.server.should_receive(:send_rename).with("blake", "Blake_Smith")
+      @room.server.should_receive(:send_rename).with("bob", "Bob_Hope")
+      @room.resolve_renames(old_users, new_users)
+    end
+  end
+
   describe "#fetch_users" do
     it "makes a call to the campfire api to fetch user information" do
       stub_request(:get, "https://mydomain.campfirenow.com/users/734581.json").
@@ -201,6 +221,24 @@ describe Flamethrower::Campfire::Room do
     end
   end
 
+  describe "#translate_nicknames" do
+    it "changes an IRC highlighted name to the campfire name" do
+      user = Flamethrower::Campfire::User.new('name' => "bob_hope", 'id' => 489198)
+      user2 = Flamethrower::Campfire::User.new('name' => "bill_jones", 'id' => 123456)
+      @room.users = [user, user2]
+      message_body = "#{user2.to_irc.nickname}: Hello there!"
+      @room.send(:translate_nicknames, message_body).should == "#{user2.name}: Hello there!"
+    end
+
+    it "doesn't change the message body if no user's name is present in the body" do
+      user = Flamethrower::Campfire::User.new('name' => "bob_hope", 'id' => 489198)
+      user2 = Flamethrower::Campfire::User.new('name' => "bill_jones", 'id' => 123456)
+      @room.users = [user, user2]
+      message_body = "Hello there!"
+      @room.send(:translate_nicknames, message_body).should == "Hello there!"
+    end
+  end
+
   describe "#requeue_failed_messages" do
     it "queues a message whos retry_at is greater than now" do
       Time.stub(:now).and_return(Time.parse("9:00AM"))

data/spec/unit/dispatcher_spec.rb

@@ -4,7 +4,9 @@ describe Flamethrower::Dispatcher do
   before do
     @server = Flamethrower::MockServer.new(:log => Logger.new("/dev/null"))
     @room = Flamethrower::Campfire::Room.new('mydomain', 'mytoken', {'name' => 'a room', 'id' => 347348})
+    @room.instance_variable_set("@stream", mock(:twitter_stream, :stop => nil))
     @channel = Flamethrower::Irc::Channel.new("#flamethrower", @room)
+    @user = Flamethrower::Irc::User.new :username => "user", :nickname => "nick", :hostname => "host", :realname => "realname", :servername => "servername"
     @server.irc_channels << @channel
     @dispatcher = Flamethrower::Dispatcher.new(@server)
   end
@@ -45,6 +47,25 @@ describe Flamethrower::Dispatcher do
     end
   end
 
+  describe "#away" do
+    it "respond with RPL_NOWAWAY when the user specifies an away message" do
+      @server.current_user = @user
+      message = Flamethrower::Irc::Message.new("AWAY :I'm away")
+      @dispatcher.server.should_receive(:send_message).with(":#{@user.hostname} 306 #{@user.nickname} :You have been marked as being away")
+      @dispatcher.handle_message(message)
+      @server.current_user.away_message.should == "I'm away"
+    end
+
+    it "respond with RPL_UNAWAY when the user doesn't specify an away message" do
+      @server.current_user = @user
+      @server.current_user.away_message = "Currently away"
+      message = Flamethrower::Irc::Message.new("AWAY :")
+      @dispatcher.server.should_receive(:send_message).with(":#{@user.hostname} 305 #{@user.nickname} :You are no longer marked as being away")
+      @dispatcher.handle_message(message)
+      @server.current_user.away_message.should == nil
+    end
+  end
+
   describe "#topic" do
     before do
       @user = Flamethrower::Irc::User.new :username => "user", :nickname => "nick", :hostname => "host", :realname => "realname", :servername => "servername"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: flamethrower
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Blake Smith
@@ -15,69 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-17 00:00:00 -06:00
+date: 2011-01-20 00:00:00 -06:00
 default_executable: flamethrower
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: twitter-stream
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: json
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: em-http-request
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: eventmachine
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -89,11 +33,11 @@ dependencies:
         - 10
         version: 0.12.10
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: json
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -103,11 +47,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: em-http-request
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -117,11 +61,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id007
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: twitter-stream
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -131,7 +75,7 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id008
+  version_requirements: *id004
 description: Flamethrower gives you the power to use your awesome irc client to talk in your campfire rooms.
 email: blakesmith0@gmail.com
 executables: 
@@ -141,6 +85,7 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
+- .gitignore
 - .rspec
 - Gemfile
 - Gemfile.lock
@@ -196,8 +141,8 @@ homepage: http://github.com/blakesmith/flamethrower
 licenses: []
 
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement