flamethrower 0.1.0 → 0.2.0

data/Gemfile

@@ -3,8 +3,9 @@ source :gemcutter
 gem 'eventmachine'
 gem 'twitter-stream'
 gem 'json'
+gem 'em-http-request'
 
 group :test do
   gem 'rspec'
-  gem 'fakeweb'
+  gem 'webmock'
 end

data/Gemfile.lock

@@ -1,9 +1,13 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    addressable (2.2.2)
+    crack (0.1.8)
     diff-lcs (1.1.2)
+    em-http-request (0.2.15)
+      addressable (>= 2.0.0)
+      eventmachine (>= 0.12.9)
     eventmachine (0.12.10)
-    fakeweb (1.3.0)
     json (1.4.6)
     roauth (0.0.3)
     rspec (2.1.0)
@@ -17,13 +21,17 @@ GEM
     twitter-stream (0.1.10)
       eventmachine (>= 0.12.8)
       roauth (>= 0.0.2)
+    webmock (1.6.2)
+      addressable (>= 2.2.2)
+      crack (>= 0.1.7)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  em-http-request
   eventmachine
-  fakeweb
   json
   rspec
   twitter-stream
+  webmock

data/README.rdoc

@@ -25,8 +25,6 @@ Then start flamethrower like so:
 
 === A work in progress
 
-TODO: Switch Net::HTTP sync calls to async EM::HttpRequest calls.
-
 Flamethrower is a work in progress. Right now basic messaging works, but
 it still needs a lot of love. If you find it useful and would like to see
 it do something, please submit a patch (with tests please)!. Bug reports are

data/Rakefile

@@ -20,6 +20,7 @@ begin
     gemspec.authors = ["Blake Smith"]
     gemspec.add_dependency('eventmachine', '>=0.12.10')
     gemspec.add_dependency('json')
+    gemspec.add_dependency('em-http-request')
     gemspec.add_dependency('twitter-stream')
   end
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/bin/flamethrower

@@ -14,6 +14,7 @@ HELP
 require 'rubygems'
 require 'flamethrower'
 require 'optparse'
+require 'yaml'
 
 options = {}
 opts = OptionParser.new do |opts|
@@ -42,17 +43,21 @@ end
 
 opts.parse!
 
-if options['config']
-  case File.exists?(options['config'])
-  when true
-    require 'yaml'
-    yaml = YAML.load_file(options['config'])
+load_options_from_file = lambda do |filename, verbose|
+  if File.exists?(filename)
+    yaml = YAML.load_file(filename)
     yaml.each {|k, v| options[k] = v}
-  when false
-    puts "Unable to find the specified file! Check the path?"
+  else
+    puts "Unable to load config file!" if verbose
   end
 end
 
+if options['config']
+  load_options_from_file.call(options['config'], true)
+else
+  load_options_from_file.call(File.join(ENV["HOME"], '.flamethrower', 'config.yml'), false)
+end
+
 FLAMETHROWER_LOGGER = Logger.new(options['logger'] || STDOUT)
 
 server = Flamethrower::EventServer.new(options['host'], options['port'], options['domain'], options['token'])

data/flamethrower.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{flamethrower}
-  s.version = "0.1.0"
+  s.version = "0.2.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-12}
+  s.date = %q{2011-01-17}
   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,75 +18,73 @@ Gem::Specification.new do |s|
     "README.rdoc"
   ]
   s.files = [
-    ".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"
+    ".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
@@ -94,17 +92,32 @@ 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"])
     s.add_dependency(%q<twitter-stream>, [">= 0"])
   end
 end

data/lib/flamethrower.rb

@@ -2,7 +2,8 @@ $:.unshift File.join(File.dirname(__FILE__), "flamethrower")
 
 require 'rubygems'
 
-require 'net/https'
+#require 'net/https'
+require 'em-http'
 require 'eventmachine'
 require 'twitter/json_stream'
 require 'logger'

data/lib/flamethrower/campfire/connection.rb

@@ -11,28 +11,42 @@ module Flamethrower
         @server = server
       end
 
-      def rooms
-        begin
-          @rooms ||= Array.new.tap do |rooms|
-            response = campfire_get("/rooms.json")
-            case response
-            when Net::HTTPSuccess
-              json = JSON.parse(response.body)
-              json['rooms'].each do |room|
-                rooms << Room.new(@domain, @token, room).tap do |r|
-                  r.server = @server
-                end
+      def fetch_my_user
+        http = campfire_get("/users/me.json")
+        http.callback do
+          case http.response_header.status
+          when 200
+            json = JSON.parse(http.response)
+            old_user = @server.current_user.nickname
+            new_user = Flamethrower::Campfire::User.new(json['user']).to_irc
+            @server.current_user = new_user
+            @server.send_rename(old_user, new_user.nickname)
+          end
+        end
+      end
+
+      def fetch_rooms
+        http = campfire_get("/rooms.json")
+        http.callback do
+          case http.response_header.status
+          when 200
+            rooms = Array.new
+            json = JSON.parse(http.response)
+            json['rooms'].each do |room|
+              rooms << Room.new(@domain, @token, room).tap do |r|
+                r.server = @server
               end
-            else
-              ::FLAMETHROWER_LOGGER.debug response.body
             end
+            @server.irc_channels = rooms.map(&:to_irc)
+            @server.send_channel_list
+          else
+            ::FLAMETHROWER_LOGGER.debug http.response
           end
-        rescue SocketError
+        end
+        http.errback do
           @server.send_message @server.reply(Flamethrower::Irc::Codes::RPL_MOTD, ":ERROR: Unable to fetch room list! Check your connection?")
-          []
         end
       end
-
     end
   end
 end

data/lib/flamethrower/campfire/message.rb

@@ -34,12 +34,22 @@ module Flamethrower
         when "LeaveMessage"
           irc_string = ":#{@user.to_irc.to_s} PART #{@room.to_irc.name}"
         when "PasteMessage"
-          irc_string = ":#{@user.to_irc.to_s} PRIVMSG #{@room.to_irc.name} :#{@body}"
+          irc_string = format_paste_message
         else
           return
         end
         Flamethrower::Irc::Message.new(irc_string)
       end
+
+      private
+
+      def format_paste_message
+        lines = @body.split("\n")
+        message = lines.inject(Array.new) do |array, line|
+          array << ":#{@user.to_irc.to_s} PRIVMSG #{@room.to_irc.name} :#{line}"
+        end
+        message.join("\r\n")
+      end
     end
   end
 end

data/lib/flamethrower/campfire/rest_api.rb

@@ -3,36 +3,40 @@ module Flamethrower
     module RestApi
 
       def host
-        "#{@domain}.campfirenow.com"
+        "https://#{@domain}.campfirenow.com"
       end
 
       private
       def http
-        Net::HTTP.new(host, 443).tap do |connection|
-          connection.use_ssl = true
-        end
+        EventMachine::HttpRequest.new(host)
       end
 
       def campfire_get(path)
-        get = Net::HTTP::Get.new(path)
-        get.basic_auth @token, 'x'
-        http.request(get)
+        action_log("get", path, nil)
+        full_path = host << path
+        EventMachine::HttpRequest.new(full_path).get :head => {'authorization' => [@token, 'x']}
       end
 
       def campfire_post(path, json=nil)
-        put_or_post(Net::HTTP::Post, path, json)
+        action_log("post", path, json)
+        full_path = host << path
+        params = {:head => {'Content-Type' => 'application/json', 'authorization' => [@token, 'x']}}
+        params[:body] = json if json
+        http = EventMachine::HttpRequest.new(full_path).post params
       end
 
       def campfire_put(path, json=nil)
-        put_or_post(Net::HTTP::Put, path, json)
+        action_log("put", path, json)
+        full_path = host << path
+        params = {:head => {'Content-Type' => 'application/json', 'authorization' => [@token, 'x']}}
+        params[:body] = json if json
+        EventMachine::HttpRequest.new(full_path).put params
       end
 
-      def put_or_post(request_type, path, json)
-        action = request_type.new(path)
-        action.basic_auth @token, 'x'
-        action.body = json if json
-        action.add_field "Content-Type", "application/json"
-        http.request(action)
+      private
+
+      def action_log(action, path, json)
+        ::FLAMETHROWER_LOGGER.debug "Sending #{action.upcase} #{path} with #{json || 'no'} JSON"
       end
 
     end

data/lib/flamethrower/campfire/room.rb

@@ -1,12 +1,15 @@
 module Flamethrower
   module Campfire
     class Room
+      POLL_SECONDS = 0.5
+      PERIODIC_UPDATE_SECONDS = 60 * 10
+
       include Flamethrower::Campfire::RestApi
 
       attr_reader :stream, :token
       attr_writer :topic
       attr_accessor :inbound_messages, :outbound_messages, :thread_messages, :number, :name, :users, :server
-      attr_accessor :failed_messages
+      attr_accessor :failed_messages, :joined
 
       def initialize(domain, token, params = {})
         @domain = domain
@@ -19,23 +22,40 @@ module Flamethrower
         @name = params['name']
         @topic = params['topic']
         @users = []
-        @thread_running = false
+        @joined = false
+        @room_info_sent = false
+        @room_alive = false
       end
 
       def topic
         @topic || "No topic"
       end
 
-      def send_topic!(topic)
-        response = campfire_put("/room/#{@number}.json", {:topic => topic}.to_json)
-        @topic = topic if response.code == "200"
+      def send_topic(topic)
+        http = campfire_put("/room/#{@number}.json", {:topic => topic}.to_json)
+        http.callback do
+          @topic = topic if http.response_header.status == 200
+        end
+      end
+
+      def send_info
+        @server.send_topic(to_irc)
+        @server.send_userlist(to_irc)
       end
 
       def fetch_room_info
-        response = campfire_get("/room/#{@number}.json")
-        json = JSON.parse(response.body)
-        json['room']['users'].each do |user|
-          @users << Flamethrower::Campfire::User.new(user)
+        http = campfire_get("/room/#{@number}.json")
+        http.callback do
+          case http.response_header.status
+          when 200
+            @users = []
+            json = JSON.parse(http.response)
+            json['room']['users'].each do |user|
+              @users << Flamethrower::Campfire::User.new(user)
+            end
+            send_info unless @room_info_sent
+            @room_info_sent = true
+          end
         end
       end
 
@@ -44,40 +64,47 @@ module Flamethrower
         @outbound_messages << Flamethrower::Campfire::Message.new(params)
       end
 
-      def start_thread
-        ::FLAMETHROWER_LOGGER.debug "Starting thread for room #{name}"
-        @thread_running = true
-        Thread.new do
-          connect
-          until dead?
-            fetch_messages
-            post_messages
-            requeue_failed_messages
-            fetch_users
-            messages_to_send = to_irc.retrieve_irc_messages
-            messages_to_send.each do |m| 
-              ::FLAMETHROWER_LOGGER.debug "Sending irc message #{m.to_s}"
-              @server.send_message(m.to_s)
-            end
-            sleep 0.5
+      def start
+        @room_alive = true
+        fetch_room_info
+        connect
+        @polling_timer = EventMachine.add_periodic_timer(POLL_SECONDS) { poll }
+        @periodic_timer = EventMachine.add_periodic_timer(PERIODIC_UPDATE_SECONDS) { fetch_room_info }
+      end
+
+      def stop
+        @room_alive = false
+        EventMachine.cancel_timer(@polling_timer)
+        EventMachine.cancel_timer(@periodic_timer)
+      end
+
+      def poll
+        unless dead?
+          fetch_messages
+          post_messages
+          requeue_failed_messages
+          fetch_users
+          messages_to_send = to_irc.retrieve_irc_messages
+          messages_to_send.each do |m|
+            ::FLAMETHROWER_LOGGER.debug "Sending irc message #{m.to_s}"
+            @server.send_message(m.to_s)
           end
         end
       end
 
       def alive?
-        @thread_running
+        @room_alive
       end
 
       def dead?
-        !@thread_running
-      end
-
-      def kill_thread!
-        @thread_running = false
+        !@room_alive
       end
 
       def join
-        campfire_post("/room/#{@number}/join.json").code == "200"
+        http = campfire_post("/room/#{@number}/join.json")
+        http.callback do
+          @joined = true if http.response_header.status == 200
+        end
       end
 
       def connect
@@ -89,8 +116,8 @@ module Flamethrower
 
       def fetch_messages
         @stream.each_item do |item| 
+          ::FLAMETHROWER_LOGGER.debug "Got json message #{item.inspect}"
           params = JSON.parse(item)
-          ::FLAMETHROWER_LOGGER.debug "Got json message #{params.inspect}"
           params['user'] = @users.find {|u| u.number == params['user_id'] }
           params['room'] = self
           message = Flamethrower::Campfire::Message.new(params)
@@ -107,14 +134,16 @@ module Flamethrower
       def fetch_users
         until @users_to_fetch.empty?
           message = @users_to_fetch.pop
-          response = campfire_get("/users/#{message.user_id}.json")
-          case response
-          when Net::HTTPOK
-            json = JSON.parse(response.body)
-            user = Flamethrower::Campfire::User.new(json['user'])
-            message.user = user
-            @users << user
-            @inbound_messages << message
+          http = campfire_get("/users/#{message.user_id}.json")
+          http.callback do
+            case http.response_header.status
+            when 200
+              json = JSON.parse(http.response)
+              user = Flamethrower::Campfire::User.new(json['user'])
+              message.user = user
+              @users << user
+              @inbound_messages << message
+            end
           end
         end
       end
@@ -124,14 +153,16 @@ module Flamethrower
           message = @outbound_messages.pop
           json = {"message" => {"body" => message.body, "type" => message.message_type}}.to_json
           ::FLAMETHROWER_LOGGER.debug "Sending #{json} to campfire API"
-          response = campfire_post("/room/#{@number}/speak.json", json)
-          case response
-          when Net::HTTPCreated
-            message.mark_delivered!
-          else
-            ::FLAMETHROWER_LOGGER.debug "Failed to post to campfire API with code: #{response.inspect}"
-            message.mark_failed!
-            @failed_messages << message
+          http = campfire_post("/room/#{@number}/speak.json", json)
+          http.callback do
+            case http.response_header.status
+            when 201
+              message.mark_delivered!
+            else
+              ::FLAMETHROWER_LOGGER.debug "Failed to post to campfire API with code: #{http.response_header.status} body: #{http.response}"
+              message.mark_failed!
+              @failed_messages << message
+            end
           end
         end
       end
@@ -139,7 +170,11 @@ module Flamethrower
       def retrieve_messages
         Array.new.tap do |new_array|
           until @inbound_messages.empty?
-            new_array << @inbound_messages.pop
+            message = @inbound_messages.pop
+            next unless message
+            unless message.user.to_irc.nickname == @server.current_user.nickname
+              new_array << message
+            end
           end
         end
       end