firetower 0.0.1 → 0.0.2

data/.gitignore

@@ -0,0 +1 @@
+pkg

data/bin/firetower

@@ -213,16 +213,16 @@ Main do
     def run
       if detach
         firetower_daemon.startup
+        puts "Firetower is vigilantly scanning the treetops"
       else
         logger ::Logger.new($stdout)
         start_server(:logger => logger)
       end
-      puts "Firetower is vigilantly scanning the treetops"
     end
   end
 
   mode :stop do
-    description "Start the listener daemon"
+    description "Stop the listener daemon"
 
     def run
       firetower_daemon.shutdown

data/lib/firetower/account.rb

@@ -11,6 +11,7 @@ module Firetower
         data = session.get(subdomain, "/users/#{user_id}.json")
         cache[user_id] = data['user']
       end
+      @joined_rooms = []
     end
 
     def rooms
@@ -45,6 +46,28 @@ module Firetower
       })
     end
 
+    def join!(room_name)
+      room = rooms[room_name]
+      session.post(subdomain, "/room/#{room.id}/join.json")
+      @joined_rooms << room
+      session.logger.info "Joined room #{subdomain}/#{room_name}"
+      session.execute_hook(:join, session, room)
+    end
+
+    def leave!(room_name)
+      room = rooms[room_name]
+      session.post(subdomain, "/room/#{room.id}/leave.json")
+      @joined_rooms.delete(room)
+      session.logger.info "Left room #{subdomain}/#{room_name}"
+      session.execute_hook(:leave, session, room)
+    end
+
+    def close!
+      @joined_rooms.each do |room|
+        leave!(room.name)
+      end
+    end
+
     def ssl?
       @ssl
     end

data/lib/firetower/plugins/core/notify_plugin.rb

@@ -4,7 +4,7 @@ module Firetower
 
       def startup(session)
         if session.kind == :server
-          notify("Firetower", "Firetower is vigilant!")
+          notify("Firetower", "Firetower is vigilantly scanning the treetops")
         end
       end
 
@@ -12,6 +12,10 @@ module Firetower
         notify("Firetower", "Joined room \"#{room.name}\"")
       end
 
+      def leave(session, room)
+        notify("Firetower", "Left room \"#{room.name}\"")
+      end
+
       def receive(session, event)
         case event['type']
         when "TextMessage"
@@ -22,8 +26,8 @@ module Firetower
         end
       end
 
-      def error(session, description)
-        notify("Campfire Error", description)
+      def error(session, error)
+        notify("Campfire Error", error.message)
       end
 
       private
@@ -31,7 +35,7 @@ module Firetower
       def notify(*args)
         system('notify-send', '--icon',
           File.expand_path(
-            '../images/campfire-logo-for-fluid.png',
+            'campfire-logo-for-fluid.png',
             File.dirname(__FILE__)),
           '-c', 'Firetower',
           *args) or raise "Desktop notification failed"

data/lib/firetower/server.rb

@@ -26,11 +26,16 @@ module Firetower
           subscribe_to_room(room)
         end
       end
+      @logger.info "Finished processing events; closing session"
       session.close!
+      @logger.info "Session closed"
     end
 
     def subscribe_to_room(room)
       @logger.info "Subscribing to #{room}"
+
+      room.account.join!(room.name)
+
       stream = Twitter::JSONStream.connect(
         :path => "/room/#{room.id}/live.json",
         :host => 'streaming.campfirenow.com',
@@ -45,8 +50,9 @@ module Firetower
       end
 
       stream.on_error do |message|
-        @logger.error message
-        session.execute_hook(:error, session, message)
+        error = RuntimeError.new(message)
+        @logger.error error.message
+        session.execute_hook(:error, error)
       end
 
       stream.on_max_reconnects do |timeout, retries|
@@ -55,7 +61,6 @@ module Firetower
           "Unable to connect after #{retries} attempts")
         stop_event_loop
       end
-      session.execute_hook(:join, session, room)
     end
 
   end

data/lib/firetower/session.rb

@@ -19,7 +19,7 @@ module Firetower
     define_hook :connect, :session, :account
     define_hook :join, :session, :room
     define_hook :receive, :session, :event
-    define_hook :error, :session, :description
+    define_hook :error, :session, :error
     define_hook :leave, :session, :room
     define_hook :disconnect, :session, :account
     define_hook :shutdown, :session
@@ -71,9 +71,9 @@ module Firetower
       @default_room ||= @subscribed_rooms.first
     end
 
-    def post(subdomain, path, data)
+    def post(subdomain, path, data=nil)
       request = Net::HTTP::Post.new(path)
-      request.body = data.to_json
+      request.body = data.to_json if data
       request['Content-Type'] = 'application/json'
       perform_request(subdomain, request)
     end
@@ -98,7 +98,9 @@ module Firetower
     end
 
     def close!
-      # TODO
+      accounts.values.each do |account|
+        account.close!
+      end
     end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Avdi Grimm
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-12 00:00:00 -04:00
+date: 2010-07-13 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -148,9 +148,11 @@ extra_rdoc_files:
 - History.txt
 - bin/firetower
 - lib/firetower/firetower.conf.erb
+- lib/firetower/plugins/core/campfire-logo-for-fluid.png
 - version.txt
 files: 
 - .bnsignore
+- .gitignore
 - History.txt
 - README.html
 - README.org
@@ -158,10 +160,10 @@ files:
 - bin/firetower
 - example/bot.rb
 - images/BaldMountainLookout.jpg
-- images/campfire-logo-for-fluid.png
 - lib/firetower.rb
 - lib/firetower/account.rb
 - lib/firetower/firetower.conf.erb
+- lib/firetower/plugins/core/campfire-logo-for-fluid.png
 - lib/firetower/plugins/core/init_v1.rb
 - lib/firetower/plugins/core/notify_plugin.rb
 - lib/firetower/room.rb