changed chart color scheme, fixed environment detection, and removed sinatra from gemspec (since it's vendored)

Author: Andre Lewis

Rakefile

@@ -1 +1,16 @@
 require "bundler/gem_tasks"
+
+
+# put the current packaged version of the gem in dropbox
+desc "copies the current packaged .gem file to dropbox and prints the URL"
+task :dropbox do
+
+  path=File.dirname(__FILE__)+"/pkg/scout_realtime-#{Scout::Realtime::VERSION}.gem"
+  if !File.exists?(path)
+    puts "Doesn't exist: #{path}. Try rake build"
+    exit(0)
+  end
+
+  FileUtils.copy(path, "/Users/andre/Dropbox/Public/")
+  puts "wget https://dl.dropboxusercontent.com/u/18554/scout_realtime-#{Scout::Realtime::VERSION}.gem; sudo gem install scout_realtime"
+end

lib/scout_realtime/web/javascripts/application.js

@@ -1,5 +1,5 @@
 var tv = 1000;
-palette = new Rickshaw.Color.Palette({ scheme: 'spectrum14' });
+palette = new Rickshaw.Color.Palette({ scheme: 'munin' });
 
 var chartDefs = {
     /* CPU */
@@ -71,7 +71,7 @@ $(function () {
 
     var graph = new Rickshaw.Graph({
       element: this,
-      renderer: 'stack',
+      renderer: 'line',
       series: new Rickshaw.Series.FixedDuration(hash,
           palette, {
             timeInterval: tv,

lib/scout_realtime/web_app.rb

@@ -1,17 +1,18 @@
 require 'sinatra'
-require 'sinatra/reloader' if development?
+require 'sinatra/reloader' if ENV["RACK_ENV"].to_s == "development"
 require 'ostruct'
 
 class Scout::Realtime::WebApp < Sinatra::Base
 
-  configure :development do
-    register Sinatra::Reloader
-  end
-
   set :port, 5555
   set :static, true                             # set up static file routing
   set :public_dir, File.expand_path('../web', __FILE__) # set up the static dir (with images/js/css inside)
   set :views,  File.expand_path('../web/views', __FILE__) # set up the views dir
+  set :environment, ENV["RACK_ENV"] && ENV["RACK_ENV"] != '' ? ENV["RACK_ENV"] : :production
+
+  configure :development do
+    register Sinatra::Reloader
+  end
 
   get '/' do
     latest_run = Scout::Realtime::Main.instance.collector.latest_run

scout_realtime.gemspec

@@ -26,5 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "sinatra-contrib"
 
   spec.add_runtime_dependency "server_metrics"
-  spec.add_runtime_dependency "sinatra"
+  #spec.add_runtime_dependency "sinatra" # vendored for now
 end