From 0932746700b50abd9a211371fc204ee228715567 Mon Sep 17 00:00:00 2001
From: Ryan Daigle <ryan.daigle@gmail.com>
Date: Mon, 23 May 2011 12:48:30 -0400
Subject: [PATCH] Small logging/naming tweaks

---
 .rvmrc          |  1 +
 DEMO            | 12 ++++++++++++
 Gemfile.lock    |  2 +-
 Procfile        |  2 +-
 Rakefile        |  2 +-
 views/index.erb |  5 +++++
 6 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 .rvmrc
 create mode 100644 DEMO

diff --git a/.rvmrc b/.rvmrc
new file mode 100644
index 0000000..14ca0e5
--- /dev/null
+++ b/.rvmrc
@@ -0,0 +1 @@
+rvm use ruby-1.9.2@demo.tweetstream --create
diff --git a/DEMO b/DEMO
new file mode 100644
index 0000000..e13d9d3
--- /dev/null
+++ b/DEMO
@@ -0,0 +1,12 @@
+# Setup
+
+git clone git@github.com:rwdaigle/tweetstream.git
+bundle install
+
+# Create & configure
+
+heroku create ryan-tweetstream --stack cedar
+heroku config:set TWITTER_USERNAME=rwdaigle TWITTER_PASSWORD=mypass TWITTER_KEYWORD=mykeyword
+heroku addons:add pusher:test
+heroku addons:upgrade logging:expanded releases:advanced
+git push heroku master
diff --git a/Gemfile.lock b/Gemfile.lock
index 617ad68..7ab66ff 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -25,7 +25,7 @@ GEM
     simple_oauth (0.1.5)
     sinatra (1.2.6)
       rack (~> 1.1)
-      tilt (>= 1.2.2, < 2.0)
+      tilt (< 2.0, >= 1.2.2)
     thin (1.2.11)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
diff --git a/Procfile b/Procfile
index 72bb6d0..747f671 100644
--- a/Procfile
+++ b/Procfile
@@ -1,3 +1,3 @@
 web: bundle exec thin start -p $PORT -e $RACK_ENV
-worker: bundle exec rake jobs:work
+stream: bundle exec rake tweetstream:stream --trace
 clock: bundle exec clockwork clock.rb
diff --git a/Rakefile b/Rakefile
index 81f18ce..c862a1c 100644
--- a/Rakefile
+++ b/Rakefile
@@ -6,7 +6,7 @@ require "tweetstream"
 
 STDOUT.sync = true
 
-task "jobs:work" do
+task "tweetstream:stream" do
   Pusher.app_id =
   TweetStream::Client.new(ENV["TWITTER_USERNAME"], ENV["TWITTER_PASSWORD"]).track(ENV["TWITTER_KEYWORD"]) do |status|
     puts "%s: %s" % [ status[:user][:screen_name], status[:text] ]
diff --git a/views/index.erb b/views/index.erb
index ea730b9..8289dab 100644
--- a/views/index.erb
+++ b/views/index.erb
@@ -6,6 +6,11 @@
     <script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.12/jquery-ui.min.js"></script>
     <script>
       $(window).ready(function() {
+
+        Pusher.log = function(message) {
+          if (window.console && window.console.log) window.console.log(message);
+        };
+
         var pusher = new Pusher('<%= pusher_api_key %>');
         var channel = pusher.subscribe('tweets');