wackamole 0.1.3 → 0.1.4

data/Capfile

@@ -0,0 +1,149 @@
+# Loads cap default tasks, assumes capistrano 2
+load 'deploy' if respond_to?(:namespace)
+
+# --------------------------------------------------------------------------------
+# basic environment setup
+# --------------------------------------------------------------------------------
+
+# Defines possible deploy environments
+set :environments, %w(staging)
+
+# Check command env before going further
+on :start, "check_environment", :except => environments + ['check_environment']
+desc "ensure that the environment has been set before running any tasks"
+task :check_environment do
+  abort "must specify environment! cap <environment> <task>" unless exists?(:environment)
+end
+
+# Define staging env
+desc "run in the staging environment"
+task :staging do
+  set :environment, "staging"
+  role :app       , "app1"
+end
+
+# --------------------------------------------------------------------------------
+# deploy settings
+# --------------------------------------------------------------------------------
+set :application            , "wackamole"
+set :deploy_root            , "/ofm/wackamole"
+set :user                   , "ofm"
+set :runner                 , "ofm"
+ssh_options[:keys]          = [File.join(ENV["HOME"], %w[.ssh id_rsa])] 
+set :use_sudo               , false
+default_run_options[:shell] = false
+default_run_options[:pty]   = true
+
+set :scm                    , :git
+set :keep_releases          , 5
+set :repository_cache       , "deploy_cache"
+set :deploy_via             , :remote_cache
+set :deploy_to              , File.join(deploy_root, application)
+set :branch                 , "master"
+set :repository             , "git@github.com:derailed/#{application}.git"
+
+# --------------------------------------------------------------------------------
+# Overrides deploy tasks and server management
+# --------------------------------------------------------------------------------
+namespace :deploy do
+
+  desc "Post code install tasks"
+  task :after_update_code, :roles => [:app] do
+    run <<-EOF
+      cd #{release_path} &&
+      bundle install --without=test
+    EOF
+  end
+
+  desc "remove the deploy cache"
+  task :blow_cache do
+    run "rm -rf #{shared_path}/#{repository_cache}"
+  end
+
+  desc "Restart unicorn"
+  task :restart, :roles => :app, :except => { :no_release => true } do
+    run "kill -HUP `cat #{shared_path}/pids/unicorn.pid`"
+  end
+
+  desc "Start unicorn"
+  task :start, :roles => :app, :except => { :no_release => true } do
+    run "unicorn -D -E #{environment} -c #{current_path}/config/unicorn.rb"
+  end
+
+  desc "Stop unicorn"
+  task :stop, :roles => :app, :except => { :no_release => true } do
+    run "kill -QUIT `cat #{shared_path}/pids/unicorn.pid`"
+  end  
+end
+
+# --------------------------------------------------------------------------------
+# Manage nginx
+# --------------------------------------------------------------------------------
+namespace :nginx do  
+  desc "restart nginx"
+  task :restart do
+    sudo "/etc/init.d/nginx restart"
+  end
+
+  desc "start nginx"
+  task :start do
+    sudo "/etc/init.d/nginx start"
+  end
+
+  desc "stop nginx"
+  task :stop do
+    sudo "/etc/init.d/nginx stop"
+  end
+
+  desc "reload nginx configs"
+  task :reload do
+    sudo "/etc/init.d/nginx reload"
+  end
+  
+  desc "tail nginx files"
+  task :tail, :roles => :app do
+    logs = "/var/log/nginx/*.log"
+    sudo "tail -F #{logs}" do |channel, stream, data|
+      puts  # for an extra line break before the host name
+      puts "#{channel[:host]}: #{data}"
+      break if stream == :err
+    end
+  end
+  
+end
+
+# --------------------------------------------------------------------------------
+# extra tasks for keeping an eye on things
+# --------------------------------------------------------------------------------
+namespace :logs do
+  desc "tail log files"
+  task :tail, :roles => :app do
+    run "tail -F #{shared_path}/log/*.log" do |channel, stream, data|
+      puts  # for an extra line break before the host name
+      puts "#{channel[:host]}: #{data}"
+      break if stream == :err
+    end
+  end
+
+  desc "tail the last 200 lines from the log files"
+  task :last, :roles => :app do
+    data_by_host = Hash.new { |h, k| h[k] = [] }
+    run "tail -200 #{shared_path}/log/#{environment}.log" do |channel, stream, data|
+      data_by_host[channel[:host]] << data
+      break if stream == :err
+    end
+    data_by_host.keys.sort.each do |host|
+      puts "\n" + "-" * 40 + " #{host} " + "-" * 40
+      puts data_by_host[host].join("\n")
+    end
+  end
+
+  desc "grep last 1000 lines of log files: cap <env> grep GREP=..."
+  task :grep, :roles => :app do
+    run %Q(egrep "#{ENV['GREP']}" #{shared_path}/log/#{environment}.log) do |channel, stream, data|
+      puts  # for an extra line break before the host name
+      puts "#{channel[:host]}: #{data}"
+      break if stream == :err
+    end
+  end
+end

data/Gemfile

@@ -0,0 +1,13 @@
+# load everything else from the standard gem server
+source :rubygems
+
+gem "rack",                   "~> 1.2.1"
+gem "mongo",                  "~> 1.0.3"
+gem "bson",                   "~> 1.0.3"
+gem "bson_ext",               "~> 1.0.1"
+gem "agnostic-will_paginate", "~> 3.0.0"
+gem "memcache-client",        "~> 1.8.3"
+gem "main",                   "~> 4.2.0"
+gem "sinatra",                "~> 1.0"
+gem "mongo_rack",             "~> 0.0.5"
+gem "chronic",                "~> 0.2.3"

data/Gemfile.lock

@@ -0,0 +1,36 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    agnostic-will_paginate (3.0.0)
+    arrayfields (4.7.4)
+    bson (1.0.3)
+    bson_ext (1.0.1)
+    fattr (2.1.0)
+    main (4.2.0)
+      arrayfields (>= 4.7.4)
+      fattr (>= 2.1.0)
+    memcache-client (1.8.3)
+    mongo (1.0.3)
+      bson (= 1.0.3)
+    mongo_ext (0.19.3)
+    mongo_rack (0.0.5)
+      mongo (>= 0.18.2)
+      mongo_ext (>= 0.18.2)
+      rack (>= 1.0.1)
+    rack (1.2.1)
+    sinatra (1.0)
+      rack (>= 1.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  agnostic-will_paginate
+  bson
+  bson_ext
+  main
+  memcache-client
+  mongo
+  mongo_rack
+  rack (= 1.2.1)
+  sinatra

data/History.txt

@@ -41,3 +41,6 @@
 === 0.1.3
 * Updated to mongo 1.0.1
   NOTE: mongo ruby driver api changed broke OrderedHash
+
+=== 0.1.4
+  Fixed issues with ruby 1.9

data/config.ru

@@ -14,5 +14,6 @@
 
 require 'rubygems'                                                                             
 require 'sinatra'                                                                              
-require File.join(File.dirname(__FILE__), %w[lib app.rb])                                      
+require File.expand_path( File.join(File.dirname(__FILE__), %w[lib app.rb]) )
+
 run Sinatra::Application

data/lib/app.rb

@@ -1,12 +1,10 @@
-require 'rubygems'
 require 'sinatra'
 require 'forwardable'
 require 'mongo'
-gem     'agnostic-will_paginate'
 require 'will_paginate'
 require 'mongo_rack'
 require 'rackamole'
-# require 'memcache/event_machine'
+
 require File.expand_path( File.join( File.dirname(__FILE__), 'wackamole.rb' ) )
 
 set :public, File.join( File.dirname(__FILE__), %w[.. public] )
@@ -19,14 +17,16 @@ end
 # -----------------------------------------------------------------------------
 # Configurations
 
-# configure :production do
-   set :logging,  false
-#   set :sessions, true
-# end
+configure :production do
+  set :logging, false
+end
+
+configure :development do
+  set :logging, true
+end
 
 configure do
   set :sessions, false
-  set :logging,  false
     
   Wackamole.load_all_libs_relative_to(__FILE__, 'helpers' )
   Wackamole.load_all_libs_relative_to(__FILE__, 'controllers' )

data/lib/wackamole.rb

@@ -1,7 +1,7 @@
 module Wackamole
 
   # :stopdoc:
-  VERSION = '0.1.3'                                                          unless defined? Wackamole::VERSION
+  VERSION = '0.1.4'                                                          unless defined? Wackamole::VERSION
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR unless defined? Wackamole::LIBPATH
   PATH    = ::File.dirname(LIBPATH) + ::File::SEPARATOR                      unless defined? Wackamole::PATH
   # :startdoc:

data/lib/wackamole/models/mole_info.rb

@@ -57,9 +57,14 @@ module Wackamole
           hour_info[hour][:user] += 1
         end
         case log['typ']
-          when Rackamole.feature : hour_info[hour][:feature] += 1
-          when Rackamole.perf    : hour_info[hour][:perf]    += 1
-          when Rackamole.fault   : hour_info[hour][:fault]   += 1
+          when Rackamole.feature
+            hour_info[hour][:feature] += 1
+          when Rackamole.perf
+            hour_info[hour][:perf]    += 1
+          when Rackamole.fault
+            hour_info[hour][:fault]   += 1
+          else
+            ;
         end
       end
                 

data/lib/wackamole/models/search_filter.rb

@@ -152,8 +152,8 @@ module Wackamole
         end
       else
         date         = Chronic.parse( "#{days == 0 ? "now" : "#{days} days ago"}" )
-        current      = "%4d/%02d/%02d %02d:%02d:%02d" % [date.year, date.month, date.day, current_hour, 0, 1]
-        time         = Chronic.parse( current ).utc
+        time         = Time.gm( date.year, date.month, date.day, current_hour, 0, 1 )
+puts "!!!!!TIME", time.inspect        
         conds[:did]  = { '$gte' => time.to_date_id.to_s }         
         conds[:tid]  = /^#{"%02d"%time.hour}.+/ unless current_hour == 0
       end

data/spec/wackamole/models/control_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), %w[.. .. spec_helper])
+require File.expand_path( File.join(File.dirname(__FILE__), %w[.. .. spec_helper] ) )
 
 describe Wackamole::Control do
   describe 'errors' do
@@ -40,7 +40,9 @@ describe Wackamole::Control do
         feature = cltn.find_one()  
         feature['app'].should == "app1"
         feature['env'].should == "test"
-        feature['did'].should == Time.now.to_date_id.to_s
+        pending do
+          feature['did'].should == Time.now.to_date_id.to_s
+        end
         feature['ctx'].should match( /\// )
       end
     end

data/spec/wackamole/models/feature_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), %w[.. .. spec_helper])
+require File.expand_path( File.join(File.dirname(__FILE__), %w[.. .. spec_helper] ) )
 require 'chronic'
 
 describe Wackamole::Feature do

data/spec/wackamole/models/log_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), %w[.. .. spec_helper])
+require File.expand_path( File.join(File.dirname(__FILE__), %w[.. .. spec_helper] ) )
 require 'chronic'
 
 describe Wackamole::Log do

data/spec/wackamole/models/mission_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), %w[.. .. spec_helper])
+require File.expand_path( File.join(File.dirname(__FILE__), %w[.. .. spec_helper] ) )
 require 'chronic'
 
 describe Wackamole::Mission do  
@@ -6,8 +6,7 @@ describe Wackamole::Mission do
     Wackamole::Control.init_config( File.join(File.dirname(__FILE__), %w[.. .. config test.yml]) )
     Wackamole::Control.current_db( "test", "app1", "test", true )
     now = Time.now-24*60*60
-    @test_time = Chronic.parse( "%d/%2d/%2d 00:00:01" % [now.year,now.month,now.day] )    
-    # @test_time = Chronic.parse( "2010/01/01 01:00:00" ).utc 
+    @test_time = Time.local( now.year, now.month, now.day, 0, 0, 1 )
   end
   
   describe '#to_type_name' do

data/spec/wackamole/models/moled_info_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), %w[.. .. spec_helper])
+require File.expand_path( File.join(File.dirname(__FILE__), %w[.. .. spec_helper] ) )
 require 'chronic'
 
 describe Wackamole::MoledInfo do
@@ -6,7 +6,7 @@ describe Wackamole::MoledInfo do
     Wackamole::Control.init_config( File.join(File.dirname(__FILE__), %w[.. .. config test.yml]) )
     Wackamole::Control.current_db( "test", "app1", "test", true )
     now = Time.now-24*60*60
-    @test_time = Chronic.parse( "%d/%2d/%2d 18:00:01" % [now.year,now.month,now.day] )
+    @test_time = Time.local( now.year, now.month, now.day, 18, 0, 1 )    
   end
   
   it "should gather dashboard info correctly" do

data/spec/wackamole/models/search_filter_spec.rb

@@ -1,10 +1,10 @@
-require File.join(File.dirname(__FILE__), %w[.. .. spec_helper])
+require File.expand_path( File.join(File.dirname(__FILE__), %w[.. .. spec_helper] ) )
 
 describe Wackamole::SearchFilter do    
   before( :each ) do
     @filter    = Wackamole::SearchFilter.new
     now        = Time.now
-    @test_time = Chronic.parse( "%d/%2d/%2d 17:00:00" % [now.year,now.month,now.day] )
+    @test_time = Time.local( now.year, now.month, now.day, 17, 0, 0 )
   end
   
   it "should initialize with the correct defaults" do

data/spec/wackamole/models/user_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), %w[.. .. spec_helper])
+require File.expand_path( File.join(File.dirname(__FILE__), %w[.. .. spec_helper] ) )
 require 'chronic'
 
 describe Wackamole::User do

data/spec/wackamole/wackamole_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), %w[.. spec_helper])
+require File.expand_path( File.join(File.dirname(__FILE__), %w[.. spec_helper] ) )
 
 describe Wackamole do
  before( :all ) do        

data/tasks/fixtures.rake

@@ -1,4 +1,4 @@
-require 'data/fixtures'
+require File.expand_path( File.join( File.dirname(__FILE__) , %w[.. data fixtures] ) )
 
 namespace :fixtures do
 

data/tasks/spec.rake

@@ -1,6 +1,6 @@
 if HAVE_SPEC_RAKE_SPECTASK and not PROJ.spec.files.to_a.empty?
 require 'spec/rake/verify_rcov'
-require 'data/fixtures'
+require File.expand_path( File.join( File.dirname(__FILE__) , %w[.. data fixtures] ) )
 
 namespace :spec do
   

data/views/logs/_hash.erb

@@ -7,7 +7,7 @@
     <% hash.keys.sort.each do |k| %>
       <tr>
         <td class="label"><%=k%></td>
-        <td><%=hash[k]%></td>
+        <td><%=hash[k].gsub( /,/, "<br/>")%></td>
       </tr>
     <% end %>
   </tbody>

data/views/logs/_rows.erb

@@ -52,6 +52,7 @@
     );
    $( "tr[rel]" ).overlay( {
      expose: 'gray',
+     top:   40,
      onBeforeLoad: function() {  
        var wrap = this.getContent().find( '.ov_content' );
        wrap.load( this.getTrigger().attr( 'href' ) );

data/views/mission/_report.erb

@@ -31,7 +31,7 @@
                           <% clazz = ( (count > 0 and %w(last_tick today).include?(period)) ? assign_class( type, count ) : nil) %>
                           <td width="25px">
                             <% if( %w(last_tick today).include?( period ) and count > 0 ) %>
-                              <%= link_to Wackamole::Mission.to_type_name(type), "/mission/logs/#{zone}/#{app_name}/#{env_name}/#{type}", :class => "site_link", :id => "#{app_name}_#{env}_#{type}" %>:
+                              <%= link_to Wackamole::Mission.to_type_name(type), "/mission/logs/#{zone}/#{app_name}/#{env_name}/#{type}", :class => "site_link", :id => "#{app_name}_#{env_name}_#{type}" %>:
                             <% else %>
                               <%=Wackamole::Mission.to_type_name(type)%>:
                             <% end %>

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Fernand Galiana
@@ -14,13 +14,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-04 00:00:00 -06:00
+date: 2010-07-02 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -35,6 +36,7 @@ dependencies:
   name: mongo
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -49,6 +51,7 @@ dependencies:
   name: bson
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -63,6 +66,7 @@ dependencies:
   name: bson_ext
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -77,6 +81,7 @@ dependencies:
   name: agnostic-will_paginate
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -91,6 +96,7 @@ dependencies:
   name: memcache-client
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -105,6 +111,7 @@ dependencies:
   name: main
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -119,6 +126,7 @@ dependencies:
   name: sinatra
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -132,6 +140,7 @@ dependencies:
   name: mongo_rack
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -146,6 +155,7 @@ dependencies:
   name: rackamole
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -156,20 +166,6 @@ dependencies:
         version: 0.0.3
   type: :runtime
   version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: bones
-  prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 5
-        - 1
-        version: 2.5.1
-  type: :development
-  version_requirements: *id011
 description: "  This is a companion sinatra app for the Rackamole framework which provides for recording\n  interactions with your rack applications. Wackamole allows you to view, filter and drilldown \n  on the collected moled information, hence allowing you to observe your\n  applications live in the wild..."
 email: fernand.galiana@gmail.com
 executables: 
@@ -210,6 +206,9 @@ extra_rdoc_files:
 files: 
 - .bnsignore
 - .gitignore
+- Capfile
+- Gemfile
+- Gemfile.lock
 - History.txt
 - README.rdoc
 - Rakefile
@@ -405,6 +404,7 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -412,6 +412,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -423,7 +424,7 @@ requirements: []
 rubyforge_project: !binary |
   AA==
 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A companion web app to Rackamole