firetower 0.0.9 → 0.1.0

data/.bnsignore

@@ -0,0 +1,18 @@
+# The list of files that should be ignored by Mr Bones.
+# Lines that start with '#' are comments.
+#
+# A .gitignore file can be used instead by setting it as the ignore
+# file in your Rakefile:
+#
+#   Bones {
+#     ignore_file  '.gitignore'
+#   }
+#
+# For a project with a C extension, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~
+announcement.txt
+coverage
+doc
+pkg

data/Gemfile

@@ -0,0 +1,22 @@
+source :rubygems
+
+group :rake do
+  gem 'bones'
+  gem 'bones-git'
+  gem 'rspec', '~> 1.3.1'
+  gem 'bones-rspec'
+end
+
+# duplication with Rakefile :(
+gem 'twitter-stream',   '~> 0.1.6'
+gem 'eventmachine',     '~> 0.12.10'
+gem 'json',             '~> 1.4'
+gem 'addressable',      '~> 2.1'
+gem 'main',             '~> 4.2'
+gem 'servolux',         '~> 0.9.4'
+gem 'hookr',            '~> 1.1'
+gem 'highline',         '~> 1.5'
+gem 'yammer4r',         '~> 0.1.5'
+gem 'oauth',            '~> 0.4.3'
+gem 'launchy'
+

data/Gemfile.lock

@@ -0,0 +1,69 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    addressable (2.2.6)
+    arrayfields (4.7.4)
+    bones (3.7.0)
+      little-plugger (>= 1.1.2)
+      loquacious (>= 1.7.0)
+      rake (>= 0.8.7)
+    bones-git (1.2.4)
+      bones (>= 3.6)
+      git (>= 1.2.5)
+    bones-rspec (2.0.1)
+      bones (>= 3.6)
+      rspec (>= 1.3)
+    configuration (1.3.1)
+    eventmachine (0.12.10)
+    fail-fast (1.1.0)
+    fattr (2.2.0)
+    git (1.2.5)
+    highline (1.6.2)
+    hookr (1.1.0)
+      fail-fast (>= 1.0.0)
+    http_parser.rb (0.5.1)
+    json (1.5.3)
+    launchy (0.4.0)
+      configuration (>= 0.0.5)
+      rake (>= 0.8.1)
+    little-plugger (1.1.2)
+    loquacious (1.8.1)
+    main (4.6.0)
+      arrayfields (>= 4.7.4)
+      fattr (>= 2.1.0)
+      map (>= 2.0.0)
+    map (4.2.0)
+    mash (0.1.1)
+    oauth (0.4.5)
+    rake (0.9.2)
+    rspec (1.3.2)
+    servolux (0.9.6)
+    simple_oauth (0.1.5)
+    twitter-stream (0.1.14)
+      eventmachine (>= 0.12.8)
+      http_parser.rb (~> 0.5.1)
+      simple_oauth (~> 0.1.4)
+    yammer4r (0.1.5)
+      json (>= 1.1.7)
+      mash (>= 0.0.3)
+      oauth (>= 0.3.5)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  addressable (~> 2.1)
+  bones
+  bones-git
+  bones-rspec
+  eventmachine (~> 0.12.10)
+  highline (~> 1.5)
+  hookr (~> 1.1)
+  json (~> 1.4)
+  launchy
+  main (~> 4.2)
+  oauth (~> 0.4.3)
+  rspec (~> 1.3.1)
+  servolux (~> 0.9.4)
+  twitter-stream (~> 0.1.6)
+  yammer4r (~> 0.1.5)

data/History.txt

@@ -1,3 +1,12 @@
+== 0.1.0 / 2011-09-06
+
+ * 2 minor enhancements
+  * Improve Firetower::Room API to make it simpler to say, paste, or play something in a room
+  * Create Firetower::Event to make it simpler to deal with events in handlers
+   * `.text?` and `.sound?` methods for determining if it's a text or sound message
+   * Add `=~` operator, which delegates to body
+
+
 == 0.0.9 / 2011-07-06
 
  * 1 minor enhancement

data/README.org

@@ -12,7 +12,8 @@
   [[file:images/BaldMountainLookout.jpg]]
 
   A command-line interface to the Campfire API
-  (http://developer.37signals.com/campfire/) by [[mailto:avdi@avdi.org][Avdi Grimm]]
+  (http://developer.37signals.com/campfire/) by [[mailto:avdi@avdi.org][Avdi Grimm]].
+  Also, a pretty simple way to create a Campfire bot.
 
   URL: http://github.com/avdi/firetower
 
@@ -31,7 +32,7 @@
     : sudo gem install firetower
     : firetower setup
 
-*** Usage
+*** Command Usage
 ***** Say something in campfire
       : firetower say 'blah blah blah'
 ***** Say something to a non-default room
@@ -48,26 +49,30 @@
       : firetower stop
 
 *** Configuration
+
     Edit $HOME/.firetower/firetower.conf
 
     All configuration is done in Ruby. The context is a Firetower::Sesson
     object. You can add handlers for events:
 
-    : receive do |session, event| ... end
+    : receive do |session, event|
+    : ...
+    : end
 
     Or enable plugins:
 
     : use NotifyPlugin
 
-***** A simple bot
+***** Creating a bot
+
     Drop this in ~/.firetower/firetower.conf for a simple (and VERY UNSAFE!) demo
     of a Campfire bot which will eval arbitrary Ruby code whenever someone
     prefaces a message with "!eval":
 
 #+BEGIN_SRC ruby
   receive do |session, event|
-    if event['type'] == 'TextMessage' && event['body'] =~ /^!eval (.*)$/
-      event.room.account.paste!(event.room.name, "Eval result:\n" + eval($1).to_s)
+    if event.text? && event =~ /^!eval (.*)$/
+      event.room.paste!(event.room.name, "Eval result:\n" + eval($1).to_s)
     end
   end
 #+END_SRC

data/Rakefile

@@ -1,12 +1,13 @@
+require "rubygems"
+require "bundler"
+Bundler.setup(:default, :rake)
 
-begin
-  require 'bones'
-rescue LoadError
-  abort '### Please install the "bones" gem ###'
-end
+require 'bones'
+require 'bones/plugins/git'
+require 'bones/plugins/rspec'
 
-task :default => 'test:run'
-task 'gem:release' => 'test:run'
+task :default => 'spec:run'
+task 'gem:release' => 'spec:run'
 
 Bones {
   name  'firetower'

data/hookr

@@ -0,0 +1 @@
+Subproject commit 6d0c1a853bdfd649c47a689ae8f880d51ac55e58-dirty

data/lib/firetower/event.rb

@@ -0,0 +1,43 @@
+module Firetower
+  class Event
+    attr_accessor :attributes
+    attr_accessor :room
+    attr_accessor :created_at, :body, :id, :user_id, :type
+
+    def self.parse(json)
+      new(JSON.parse(json))
+    end
+
+    def initialize(attributes)
+      @attributes = attributes
+      @attributes.each do |key, value|
+        send("#{key}=", value) if respond_to?("#{key}=")
+      end
+    end
+
+    def [](key)
+      @attributes[key]
+    end
+
+    def []=(key, value)
+      @attributes[key] = value
+    end
+
+    def text?
+      self.type == 'TextMessage'
+    end
+
+    def sound?
+      self.type == 'SoundMessage'
+    end
+
+    def timestamp?
+      self.type == 'TimestampMessage'
+    end
+
+    def =~(pattern)
+      self.body =~ pattern
+    end
+
+  end
+end

data/lib/firetower/room.rb

@@ -11,5 +11,17 @@ module Firetower
     def to_s
       "#{account.subdomain}/#{id} (#{name})"
     end
+
+    def say!(message)
+      account.say!(name, message)
+    end
+
+    def paste!(message)
+      account.paste!(name, message)
+    end
+    
+    def play!(message)
+      account.play!(name, message)
+    end
   end
 end

data/lib/firetower/server.rb

@@ -41,11 +41,12 @@ module Firetower
         :host => 'streaming.campfirenow.com',
         :auth => "#{room.account.token}:x")
 
-      stream.each_item do |event|
-        @logger.info "Processing event:\n  #{event}"
-        event = JSON.parse(event)
+      stream.each_item do |json|
+        @logger.info "Processing event:\n  #{json}"
+
+        event = Firetower::Event.parse(json)
+        event.room = room
 
-        (class << event; self; end).send(:define_method, :room){room}
         session.execute_hook(:receive, session, event)
       end
 

data/spec/firetower_spec.rb

@@ -62,6 +62,34 @@ describe Firetower do
     end
   end
 
+  describe Firetower::Room do
+    subject do
+      it = Firetower::Room.new(account, 'id' => '1234', 'name' => 'awesome')
+    end
+
+    let(:account) do
+      mock(:account)
+    end
+
+    it "has shortcut for say" do
+      account.should_receive(:say!).with('awesome', 'woooooot')
+
+      subject.say! 'woooooot'
+    end
+
+    it "has shortcut for paste" do
+      account.should_receive(:paste!).with('awesome', 'woooooot')
+
+      subject.paste! 'woooooot'
+    end
+
+    it "has shortcut for play" do
+      account.should_receive(:play!).with('awesome', 'woooooot')
+
+      subject.play! 'woooooot'
+    end
+  end
+
   shared_examples_for "Notifier Plugins" do
 
     context "given an ignore list" do

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
+require "rubygems"
+require "bundler"
+Bundler.setup(:default, :development)
 
 require File.expand_path(
     File.join(File.dirname(__FILE__), %w[.. lib firetower]))

data/version.txt

@@ -1 +1 @@
-0.0.9
+0.1.0

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: firetower
 version: !ruby/object:Gem::Version 
-  hash: 13
-  prerelease: false
+  hash: 27
+  prerelease: 
   segments: 
   - 0
+  - 1
   - 0
-  - 9
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors: 
 - Avdi Grimm
@@ -15,13 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-06 00:00:00 -04:00
+date: 2011-09-06 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   name: twitter-stream
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -32,12 +32,12 @@ dependencies:
         - 1
         - 6
         version: 0.1.6
-  type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   name: eventmachine
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -48,12 +48,12 @@ dependencies:
         - 12
         - 10
         version: 0.12.10
-  type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   name: json
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -63,12 +63,12 @@ dependencies:
         - 1
         - 4
         version: "1.4"
-  type: :runtime
-  version_requirements: *id003
+  prerelease: false
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   name: addressable
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -78,12 +78,12 @@ dependencies:
         - 2
         - 1
         version: "2.1"
-  type: :runtime
-  version_requirements: *id004
+  prerelease: false
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   name: main
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -93,12 +93,12 @@ dependencies:
         - 4
         - 2
         version: "4.2"
-  type: :runtime
-  version_requirements: *id005
+  prerelease: false
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   name: servolux
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -109,12 +109,12 @@ dependencies:
         - 9
         - 4
         version: 0.9.4
-  type: :runtime
-  version_requirements: *id006
+  prerelease: false
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   name: hookr
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -124,12 +124,12 @@ dependencies:
         - 1
         - 1
         version: "1.1"
-  type: :runtime
-  version_requirements: *id007
+  prerelease: false
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   name: highline
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -139,12 +139,12 @@ dependencies:
         - 1
         - 5
         version: "1.5"
-  type: :runtime
-  version_requirements: *id008
+  prerelease: false
+  requirement: *id008
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   name: yammer4r
-  prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -155,12 +155,12 @@ dependencies:
         - 1
         - 5
         version: 0.1.5
-  type: :runtime
-  version_requirements: *id009
+  prerelease: false
+  requirement: *id009
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   name: oauth
-  prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -171,28 +171,28 @@ dependencies:
         - 4
         - 3
         version: 0.4.3
-  type: :runtime
-  version_requirements: *id010
+  prerelease: false
+  requirement: *id010
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   name: launchy
-  prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 15
         segments: 
         - 0
-        - 3
-        - 7
-        version: 0.3.7
-  type: :runtime
-  version_requirements: *id011
+        - 4
+        - 0
+        version: 0.4.0
+  prerelease: false
+  requirement: *id011
 - !ruby/object:Gem::Dependency 
+  type: :development
   name: bones
-  prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -203,8 +203,8 @@ dependencies:
         - 7
         - 0
         version: 3.7.0
-  type: :development
-  version_requirements: *id012
+  prerelease: false
+  requirement: *id012
 description: ""
 email: avdi@avdi.org
 executables: 
@@ -214,19 +214,99 @@ extensions: []
 extra_rdoc_files: 
 - History.txt
 - bin/firetower
+- hookr/History.txt
+- hookr/Manifest.txt
+- hookr/README.txt
+- hookr/pkg/schleyfox-hookr-1.0.1/History.txt
+- hookr/pkg/schleyfox-hookr-1.0.1/Manifest.txt
+- hookr/pkg/schleyfox-hookr-1.0.1/README.txt
 - lib/firetower/firetower.conf.erb
 - lib/firetower/plugins/core/campfire-logo-for-fluid.png
 files: 
+- .bnsignore
 - .rvmrc
+- Gemfile
+- Gemfile.lock
 - History.txt
 - README.org
 - Rakefile
 - bin/firetower
 - example/bot.rb
+- hookr/.git/HEAD
+- hookr/.git/config
+- hookr/.git/description
+- hookr/.git/hooks/applypatch-msg.sample
+- hookr/.git/hooks/commit-msg.sample
+- hookr/.git/hooks/post-commit.sample
+- hookr/.git/hooks/post-receive.sample
+- hookr/.git/hooks/post-update.sample
+- hookr/.git/hooks/pre-applypatch.sample
+- hookr/.git/hooks/pre-commit.sample
+- hookr/.git/hooks/pre-rebase.sample
+- hookr/.git/hooks/prepare-commit-msg.sample
+- hookr/.git/hooks/update.sample
+- hookr/.git/index
+- hookr/.git/info/exclude
+- hookr/.git/logs/HEAD
+- hookr/.git/logs/refs/heads/master
+- hookr/.git/objects/pack/pack-5b86f143d74b8961e295a79e3b1cba3cefca9b6d.idx
+- hookr/.git/objects/pack/pack-5b86f143d74b8961e295a79e3b1cba3cefca9b6d.pack
+- hookr/.git/packed-refs
+- hookr/.git/refs/heads/master
+- hookr/.git/refs/remotes/origin/HEAD
+- hookr/.gitignore
+- hookr/History.txt
+- hookr/Manifest.txt
+- hookr/README.txt
+- hookr/Rakefile
+- hookr/TODO
+- hookr/bin/hookr
+- hookr/lib/hookr.rb
+- hookr/pkg/schleyfox-hookr-1.0.1.gem
+- hookr/pkg/schleyfox-hookr-1.0.1.tgz
+- hookr/pkg/schleyfox-hookr-1.0.1/History.txt
+- hookr/pkg/schleyfox-hookr-1.0.1/Manifest.txt
+- hookr/pkg/schleyfox-hookr-1.0.1/README.txt
+- hookr/pkg/schleyfox-hookr-1.0.1/Rakefile
+- hookr/pkg/schleyfox-hookr-1.0.1/bin/hookr
+- hookr/pkg/schleyfox-hookr-1.0.1/lib/hookr.rb
+- hookr/pkg/schleyfox-hookr-1.0.1/spec/hookr_spec.rb
+- hookr/pkg/schleyfox-hookr-1.0.1/spec/spec_helper.rb
+- hookr/pkg/schleyfox-hookr-1.0.1/tasks/ann.rake
+- hookr/pkg/schleyfox-hookr-1.0.1/tasks/bones.rake
+- hookr/pkg/schleyfox-hookr-1.0.1/tasks/gem.rake
+- hookr/pkg/schleyfox-hookr-1.0.1/tasks/git.rake
+- hookr/pkg/schleyfox-hookr-1.0.1/tasks/manifest.rake
+- hookr/pkg/schleyfox-hookr-1.0.1/tasks/notes.rake
+- hookr/pkg/schleyfox-hookr-1.0.1/tasks/post_load.rake
+- hookr/pkg/schleyfox-hookr-1.0.1/tasks/rdoc.rake
+- hookr/pkg/schleyfox-hookr-1.0.1/tasks/rubyforge.rake
+- hookr/pkg/schleyfox-hookr-1.0.1/tasks/setup.rb
+- hookr/pkg/schleyfox-hookr-1.0.1/tasks/spec.rake
+- hookr/pkg/schleyfox-hookr-1.0.1/tasks/svn.rake
+- hookr/pkg/schleyfox-hookr-1.0.1/tasks/test.rake
+- hookr/pkg/schleyfox-hookr-1.0.1/test/test_hookr.rb
+- hookr/spec/hookr_spec.rb
+- hookr/spec/spec_helper.rb
+- hookr/tasks/ann.rake
+- hookr/tasks/bones.rake
+- hookr/tasks/gem.rake
+- hookr/tasks/git.rake
+- hookr/tasks/manifest.rake
+- hookr/tasks/notes.rake
+- hookr/tasks/post_load.rake
+- hookr/tasks/rdoc.rake
+- hookr/tasks/rubyforge.rake
+- hookr/tasks/setup.rb
+- hookr/tasks/spec.rake
+- hookr/tasks/svn.rake
+- hookr/tasks/test.rake
+- hookr/test/test_hookr.rb
 - images/BaldMountainLookout.jpg
 - lib/firetower.rb
 - lib/firetower/account.rb
 - lib/firetower/accounts.rb
+- lib/firetower/event.rb
 - lib/firetower/firetower.conf.erb
 - lib/firetower/plugins/core/campfire-logo-for-fluid.png
 - lib/firetower/plugins/core/growl_plugin.rb
@@ -243,7 +323,6 @@ files:
 - spec/firetower_spec.rb
 - spec/spec_helper.rb
 - tags
-- test/test_firetower.rb
 - version.txt
 has_rdoc: true
 homepage: http://github.com/avdi/firetower
@@ -276,9 +355,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: firetower
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: A command-line interface to Campfire chats
-test_files: 
-- test/test_firetower.rb
+test_files: []
+