wackamole 0.0.9 → 0.1.2

data/spec/spec_helper.rb

@@ -12,6 +12,7 @@ require File.expand_path( File.join(File.dirname(__FILE__), %w[data fixtures]))
 require File.expand_path( File.join(File.dirname(__FILE__), %w[.. lib wackamole]))
 
 # BOZO !! To run test you'll need to start a mongo instance
-# mongod --dbpath /data/wackamole/ --port 27777
+# BOZO !! Rake task pleeease!!
+# mongod --dbpath /data/wackamole/ --port 27099
 Spec::Runner.configure do |config|
 end

data/spec/wackamole/models/control_spec.rb

@@ -7,46 +7,40 @@ describe Wackamole::Control do
     end
     
     it "should raise an error if not correctly initialized" do
-      lambda{ Wackamole::Control.connection }.should raise_error( /You must call init_config/ )
+      lambda{ Wackamole::Control.connection( "Fred" ) }.should raise_error( /You must call init_config/ )
     end
   
     it "should raise an error if invalid config file" do
       config_file = File.join(File.dirname(__FILE__), %w[.. .. config blee.yml])    
       lambda {
-        Wackamole::Control.init_config( config_file, 'test' )
+        Wackamole::Control.init_config( config_file )
       }.should raise_error( /Hoy! An error occur loading the config file `#{config_file} -- No such file or directory/ )
     end
-  
-    it "should raise an error if a bogus env is requested" do
-      config_file = File.join(File.dirname(__FILE__), %w[.. .. config test.yml])    
-      lambda {
-        Wackamole::Control.init_config( config_file, 'production' )
-      }.should raise_error( /Hoy! An error occur loading the config file `#{config_file} -- Invalid environment `production/ )
-    end
-  
+    
     it "should raise an error if invalid config file content" do
       config_file = File.join(File.dirname(__FILE__), %w[.. .. config bogus_test.yml])
       lambda {
-        Wackamole::Control.init_config( config_file, 'test' )
-      }.should raise_error( /Hoy! An error occur loading the config file `#{config_file} -- Unable to find host in -/ )
+        Wackamole::Control.init_config( config_file )
+      }.should raise_error( /Hoy! An error occur loading the config file `#{config_file} -- Unable to find zones definition/ )
     end
   end
   
   describe 'connection' do
     before :all do
       Wackamole::Control.reset!        
-      Wackamole::Control.init_config( File.join(File.dirname(__FILE__), %w[.. .. config test.yml]), 'test' )
-      Wackamole::Control.connection.should_not be_nil
+      Wackamole::Control.init_config( File.join(File.dirname(__FILE__), %w[.. .. config test.yml]) )
+      Wackamole::Control.connection( 'test' ).should_not be_nil
     end
     
     describe "#collection" do
       it "should find a collection correctly" do
-        cltn = Wackamole::Control.collection( 'features', "mole_app1_test_mdb" )
+        Wackamole::Control.current_db( 'test', 'app1', 'test' )
+        cltn = Wackamole::Control.collection( 'features' )
         cltn.count.should == 6
         feature = cltn.find_one()  
         feature['app'].should == "app1"
         feature['env'].should == "test"
-        feature['did'].should == Time.now.utc.to_date_id.to_s
+        feature['did'].should == Time.now.to_date_id.to_s
         feature['ctx'].should match( /\// )
       end
     end
@@ -54,7 +48,7 @@ describe Wackamole::Control do
     describe "mole databases" do
       it "should correctly identify mole dbs" do
         # gen_bogus_dbs
-        mole_dbs = Wackamole::Control.mole_databases        
+        mole_dbs = Wackamole::Control.mole_databases( 'test' )
         mole_dbs.should have(2).items
       end
       
@@ -70,29 +64,29 @@ describe Wackamole::Control do
       
       it "should connect to a mole databases correctly" do
         %w[app1 app2].each do |app|
-          Wackamole::Control.db( "mole_#{app}_test_mdb" )
+          Wackamole::Control.current_db( "test", app, "test", true )
           feature = Wackamole::Control.collection( 'features' ).find_one()
           feature['app'].should == app
           feature['env'].should == "test"
         end
       end    
       
-      it "should switch mole dbs correctly" do
-        %w[app1 app2].each do |app|
-          Wackamole::Control.switch_mole_db!( app, "test" )
-          feature = Wackamole::Control.collection( 'features' ).find_one()
-          feature['app'].should == app
-          feature['env'].should == "test"
-        end        
-      end  
-      
-      it "should fail to switch if there is no mole db" do
-        lambda{ Wackamole::Control.switch_mole_db!( "blee", "test" ) }.should raise_error( /Invalid mole database mole_blee_test_mdb/ )
-      end
+      # it "should switch mole dbs correctly" do
+      #   %w[app1 app2].each do |app|
+      #     Wackamole::Control.switch_mole_db!( app, "test" )
+      #     feature = Wackamole::Control.collection( 'features' ).find_one()
+      #     feature['app'].should == app
+      #     feature['env'].should == "test"
+      #   end        
+      # end  
       
-      it "should fail to switch for an invalid mole db" do
-        lambda{ Wackamole::Control.switch_mole_db!( "zorg", "missing" ) }.should raise_error( /Invalid mole database mole_zorg_missing_mdb/ )
-      end
+      # it "should fail to switch if there is no mole db" do
+      #   lambda{ Wackamole::Control.switch_mole_db!( "blee", "test" ) }.should raise_error( /Invalid mole database mole_blee_test_mdb/ )
+      # end
+      # 
+      # it "should fail to switch for an invalid mole db" do
+      #   lambda{ Wackamole::Control.switch_mole_db!( "zorg", "missing" ) }.should raise_error( /Invalid mole database mole_zorg_missing_mdb/ )
+      # end
     end
   end
 end

data/spec/wackamole/models/feature_spec.rb

@@ -3,9 +3,8 @@ require 'chronic'
 
 describe Wackamole::Feature do
   before( :all ) do
-    Wackamole::Control.init_config( File.join(File.dirname(__FILE__), %w[.. .. config test.yml]), 'test' )
-    Wackamole::Control.connection.should_not be_nil
-    Wackamole::Control.db( "mole_app1_test_mdb" )
+    Wackamole::Control.init_config( File.join(File.dirname(__FILE__), %w[.. .. config test.yml]) )
+    Wackamole::Control.current_db( "test", "app1", "test", true )
   end
   
   it "retrieve an app info correctly" do
@@ -30,23 +29,23 @@ describe Wackamole::Feature do
       @cltn.drop_indexes
     end
     
-    it "should set up indexes correctly" do
-      indexes = @cltn.index_information
-      indexes.should have(1).item      
-      count = Wackamole::Feature.ensure_indexes!  
-      count.should == 3
-      indexes = @cltn.index_information
-      indexes.should have(3).items
-    end
-    
-    it "should do nothing if indexes are already present" do
-      indexes = @cltn.index_information
-      indexes.should have(3).items   
-      count = Wackamole::Feature.ensure_indexes!
-      count.should == 1
-      indexes = @cltn.index_information
-      indexes.should have(3).items      
-    end
+    # it "should set up indexes correctly" do
+    #   indexes = @cltn.index_information
+    #   indexes.should have(1).item      
+    #   count = Wackamole::Feature.ensure_indexes!  
+    #   count.should == 3
+    #   indexes = @cltn.index_information
+    #   indexes.should have(3).items
+    # end
+    # 
+    # it "should do nothing if indexes are already present" do
+    #   indexes = @cltn.index_information
+    #   indexes.should have(3).items   
+    #   count = Wackamole::Feature.ensure_indexes!
+    #   count.should == 1
+    #   indexes = @cltn.index_information
+    #   indexes.should have(3).items      
+    # end
   end
   
 end

data/spec/wackamole/models/log_spec.rb

@@ -3,9 +3,8 @@ require 'chronic'
 
 describe Wackamole::Log do
   before( :all ) do
-    Wackamole::Control.init_config( File.join(File.dirname(__FILE__), %w[.. .. config test.yml]), 'test' )
-    Wackamole::Control.connection.should_not be_nil
-    Wackamole::Control.db( "mole_app1_test_mdb" )
+    Wackamole::Control.init_config( File.join(File.dirname(__FILE__), %w[.. .. config test.yml]) )
+    Wackamole::Control.current_db( "test", "app1", "test", true )
   end
     
   it "should paginate logs correctly" do

data/spec/wackamole/models/mission_spec.rb

@@ -3,11 +3,10 @@ require 'chronic'
 
 describe Wackamole::Mission do  
   before :all do
-    Wackamole::Control.reset!
-    Wackamole::Control.init_config( File.join(File.dirname(__FILE__), %w[.. .. config test.yml]), 'test' )
-    Wackamole::Control.connection.should_not be_nil    
-    now = Time.now
-    @test_time = Chronic.parse( "%d/%2d/%2d 17:00:00" % [now.year,now.month,now.day] )    
+    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 
   end
   
@@ -27,24 +26,23 @@ describe Wackamole::Mission do
   end
     
   it "should pick up an app pulse correctly" do
-    pulse = Wackamole::Mission.pulse( @test_time )
-    pulse.should have(3).items
-    pulse[:to_date].should_not be_nil
-    pulse[:today].should_not be_nil    
-    pulse[:last_tick].should_not be_nil
-    expected = {'to_date' => [7,5,3], 'today' => [6,4,2] }
+    zones = Wackamole::Mission.pulse( @test_time )
+    zones.should have(1).items
+    apps = zones['test']
+    apps.should have(2).items
+    expected = {'to_date' => [7,5,3], 'today' => [3,2,1] }
     %w(to_date today).each do |p|
       %w(app1 app2).each do |app|
         [0, 1, 2].each do |type|
-          pulse[p.to_sym][app]["test"][type].should == expected[p][type]
+          zones['test'][app]['test'][p.to_sym][type].should == expected[p][type]
         end
       end
     end
-    %w(app1 app2).each do |app|
-      expected = [3,2,1]
-      [0, 1, 2].each do |type|
-        pulse[:last_tick][app]["test"][type].should == expected[type]
-      end
-    end    
+    # %w(app1 app2).each do |app|
+    #   expected = [3,2,1]
+    #   [0, 1, 2].each do |type|
+    #     pulse[:last_tick][app]["test"][type].should == expected[type]
+    #   end
+    # end    
   end  
 end

data/spec/wackamole/models/moled_info_spec.rb

@@ -3,16 +3,15 @@ require 'chronic'
 
 describe Wackamole::MoledInfo do
   before( :all ) do
-    Wackamole::Control.init_config( File.join(File.dirname(__FILE__), %w[.. .. config test.yml]), 'test' )
-    Wackamole::Control.connection.should_not be_nil
-    Wackamole::Control.db( "mole_app1_test_mdb" )
-    now = Time.now
-    @test_time = Chronic.parse( "%d/%2d/%2d 17:00:00" % [now.year,now.month,now.day] )
+    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] )
   end
   
   it "should gather dashboard info correctly" do
     info = Wackamole::MoledInfo.collect_dashboard_info( @test_time )
-    
+        
     info[:total_users].should    == 5
     info[:user_load].should      == 2
     info[:total_features].should == 6
@@ -20,10 +19,10 @@ describe Wackamole::MoledInfo do
     info[:fault_load].should     == 1
     info[:perf_load].should      == 2
     
-    info[:user_series].should    == series_for( [[17,2]] )
-    info[:feature_series].should == series_for( [[17,2]] )
-    info[:fault_series].should   == series_for( [[17,1]] )
-    info[:perf_series].should    == series_for( [[17,2]] )
+    info[:user_series].should    == series_for( [[18,2]] )
+    info[:feature_series].should == series_for( [[18,2]] )
+    info[:fault_series].should   == series_for( [[18,1]] )
+    info[:perf_series].should    == series_for( [[18,2]] )
   end  
   
   def series_for( slots )

data/spec/wackamole/models/search_filter_spec.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), %w[.. .. spec_helper])
 describe Wackamole::SearchFilter do    
   before( :each ) do
     @filter    = Wackamole::SearchFilter.new
-    now        = Time.now    
+    now        = Time.now
     @test_time = Chronic.parse( "%d/%2d/%2d 17:00:00" % [now.year,now.month,now.day] )
   end
   
@@ -67,7 +67,7 @@ describe Wackamole::SearchFilter do
       conds = @filter.to_conds
       conds.should have(1).item
       conds.key?( '$where' ).should == true
-      conds['$where'].should == "((this.did == '#{@test_time.to_date_id}' && this.tid >= '070001') || ( this.did == '#{(@test_time+24*60*60).to_date_id}' && this.tid <= '065959') )"
+      conds['$where'].should == "((this.did == '#{@test_time.to_date_id}' && this.tid >= '060001') || ( this.did == '#{(@test_time+24*60*60).to_date_id}' && this.tid <= '055959') )"
     end
     
     it "should include browser if specified correctly" do
@@ -98,9 +98,8 @@ describe Wackamole::SearchFilter do
     
     describe "search terms" do
       before( :all ) do
-        Wackamole::Control.init_config( File.join(File.dirname(__FILE__), %w[.. .. config test.yml]), 'test' )
-        Wackamole::Control.connection.should_not be_nil
-        Wackamole::Control.db( "mole_app1_test_mdb" )
+        Wackamole::Control.init_config( File.join(File.dirname(__FILE__), %w[.. .. config test.yml]) )
+        Wackamole::Control.current_db( "test", "app1", "test", true )
       end
       
       it "should retrieve features correctly" do

data/spec/wackamole/models/user_spec.rb

@@ -3,9 +3,8 @@ require 'chronic'
 
 describe Wackamole::User do
   before( :all ) do
-    Wackamole::Control.init_config( File.join(File.dirname(__FILE__), %w[.. .. config test.yml]), 'test' )
-    Wackamole::Control.connection.should_not be_nil
-    Wackamole::Control.db( "mole_app1_test_mdb" )
+    Wackamole::Control.init_config( File.join(File.dirname(__FILE__), %w[.. .. config test.yml]) )
+    Wackamole::Control.current_db( "test", "app1", "test", true )
   end
   
   it "should paginate a user collection correctly" do

data/views/features/_rows.erb

@@ -14,7 +14,7 @@
       <% count=0;@features.each do |row| %>
         <% color = count % 2 == 0 ? 'transparent' : 'transparent url(/images/fade.png) repeat-x' %>
         <tr style="background:<%=color%>">
-          <td><b><%=display_context( row[:name] )%></b></td>
+          <td><%=link_to display_context( row[:name] ), "/logs/feature/#{row[:fid]}", :class => 'nav_link'%></td>
           <td align="right"><b><%=row[:total]%></b></td>
         </tr>
       <% count+=1;end %>

data/views/layout.erb

@@ -9,54 +9,46 @@
     <%= javascripts %w[jquery_min jquery_ui_min] %>
   </head>
 
-<style>
-span#version {
-  position:    relative;
-  top:        -12px;
-  left:        32px;
-  font-weight: bold;
-  color:       #316071;
-}
-a.logout {
-  font-size: 0.8em;
-}
-</style>
   <body id="body">
     <div id="overall">      
       <div id="logo">
         <span id="version"><%=Wackamole.version%></span>        
         <%= link_to image_tag( 'wackamole_logo.png', :border => 0 ), '/mission' %>
       </div>      
-      <div id="app_info">        
+      <div id="links">        
         <% if console_auth? and !root_path? %>
           <%= link_to "log out", "/session/delete", :class => "site_link logout" %>
         <% end %>                
         
-        <% if @app_info %>        
-          <ul>
-            <li>&laquo;<span><%=@app_info[:app_name]%></span>&raquo;</li>
-            <li id="env"><%=@app_info[:stage]%></li>
-          <ul>
-        <% end %>        
         <% unless root_path? %>
           <p><span id="timestamp"><%=partial :'shared/timestamp'%></span></p>
         <% end %>
+        
+        <% if @app_info and authenticated? %>
+          <ul id="app_info">
+            <li>zone<span class="zone"><%=@app_info[:zone]%></span></li>
+            <li><span class="app"><%=@app_info[:app]%></span><span class="stage"><%=@app_info[:stage]%></span></li>
+          </ul>
+        <% end %>                
       </div>
       <div id="main">     
         <div class="flash"></div>
         
-        <% if @app_info %>
+        <% if @app_info and authenticated? %>
           <div id='navigation' class='corners'>
             <% unless Wackamole::Control.single_app? %>
               <%=link_to "mission control", "/mission", :class => "site_link land" %>&nbsp;&bull;&nbsp;
             <% end %>
-            <%=link_to "dashboard"      , "/dashboard/#{@app_info[:app_name]}/#{@app_info[:stage]}", :class => "site_link dash" %>&nbsp;&bull;&nbsp;            
-            <%=link_to "logs"           , "/logs/1"                                                , :class => "site_link logs" %>&nbsp;&bull;&nbsp;
-            <%=link_to "features"       , "/features/1"                                            , :class => "site_link features" %>&nbsp;&bull;&nbsp;
-            <%=link_to "users"          , "/users/1"                                               , :class => "site_link users" %>
+            <%=link_to "dashboard", "/dashboard/#{@app_info[:zone]}/#{@app_info[:app]}/#{@app_info[:stage]}", 
+              :class => "site_link dash" %>&nbsp;&bull;&nbsp;            
+            <%=link_to "logs", "/logs/1", 
+              :class => "site_link logs" %>&nbsp;&bull;&nbsp;
+            <%=link_to "features", "/features/1", 
+              :class => "site_link features" %>&nbsp;&bull;&nbsp;
+            <%=link_to "users", "/users/1", 
+              :class => "site_link users" %>
           </div>
-        <% end %>
-                
+        <% end %>  
         <%= yield %>
       </div>
       

data/views/logs/show.erb

@@ -13,6 +13,12 @@
           <td><%=@log['pat']%></td>
         </tr>
       <% end %>      
+      <% if @log['msg'] %>
+        <tr>
+          <td class="label" valign="top">Error</td>
+          <td><%=truncate( @log['msg'], 300 )%></td>
+        </tr>      
+      <% end %>
       <tr>
         <td class="label">User</td>
         <td><%=user_name_for( {}, @log['uid'] ) %></td>
@@ -55,10 +61,6 @@
       </tr>
       <% end %>
       <% if @log['msg'] %>
-        <tr>
-          <td class="label" valign="top">Error</td>
-          <td><%=truncate( @log['msg'], 300 )%></td>
-        </tr>      
         <tr>
           <td class="label" valign="top">Stack [<%=@log['sta'].size%>]</td>
           <td><%=partial :'logs/array', :object => @log['sta']%></td>

data/views/mission/_report.erb

@@ -1,54 +1,54 @@
-<% applications = extract_applications( @pulse ) %>
-<% if applications.empty? == 0 %>
+<% if @zones.empty? == 0 %>
   <div class="doh">
-    <p>Unable to find a Rackamole MongoDb database on this connection <%=Wackamole::Control.connection.host%>:<%=Wackamole::Control.connection.port%>.</p>
-    <p>Make sure you moled database follows this naming convention</p>
-    <p>mole_{<i>application name in lower case</i>}_{<i>environment</i>}_mdb</p>
+    <p>Unable to locate zone information please double check your zones file in ~/.wackamole/zones.yml/p>
   </div>
 <% else %>
   <table class="logs" id="mission">
     <thead>
-      <tr>
-        <th width="25%">application</th>
-        <th width="10%">environment</th>
+      <tr>  
+        <th width="20%">application</th>
+        <th width="10%">zone</th>
+        <th width="10%">env</th>
         <th width="20%">to date</th>
         <th width="20%">today</th>
         <th width="20%">last tick</th>
       </tr>
     </thead>
     <tbody>      
-      <% applications.each_pair do |app_name, envs| %>
-        <% envs.each do |env| %>
-          <tr class="app_info" id="<%=app_name%>_<%=env%>">
-            <td valign="top"><%= link_to app_name, "/dashboard/#{app_name}/#{env}", :class => 'site_link' %></td>
-            <td valign="top"><%= env %></td>
-            <% %w(to_date today last_tick).each do |period| %>
-              <% info = @pulse[period.to_sym][app_name][env] %>
-              <td>
-                <table border="0" width="100%">
-                  <tbody>
-                    <% info.each_pair do |type, count| %>
-                      <tr>
-                        <% 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/#{app_name}/#{env}/#{type}", :class => "site_link", :id => "#{app_name}_#{env}_#{type}" %>:
-                          <% else %>
-                            <%=Wackamole::Mission.to_type_name(type)%>:
-                          <% end %>
-                        </td>
-                        <td align='right'>
-                          <span class="<%= (clazz and count > 0 ? "#{period}_#{clazz}" : '') %>">
-                            &nbsp;<%= format_number(count) %>&nbsp;
-                          </span>
-                        </td>
-                      </tr>
-                    <% end %>
-                  </tbody>
-                </table>
-              </td>
+      <% @zones.each_pair do |zone, app_info| %>
+        <% app_info.each_pair do |app_name, env_info| %>
+          <% env_info.each_pair do |env_name, totals| %>
+            <tr class="app_info" id="<%=zone%>" >                
+              <td valign="top"><%= link_to app_name, "/dashboard/#{zone}/#{app_name}/#{env_name}", :class => 'site_link' %></td>
+              <td valign="top"><%= zone %></td>              
+              <td valign="top"><%= env_name %></td>                                  
+              <% %w(to_date today last_tick).each do |period| %>
+                <td>
+                  <table border="0" width="100%">
+                    <tbody>
+                      <% totals[period.to_sym].each_pair do |type, count| %>
+                        <tr>
+                          <% 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}" %>:
+                            <% else %>
+                              <%=Wackamole::Mission.to_type_name(type)%>:
+                            <% end %>
+                          </td>
+                          <td align='right'>
+                            <span class="<%= (clazz and count > 0 ? "#{period}_#{clazz}" : '') %>">
+                              &nbsp;<%= format_number(count) %>&nbsp;
+                            </span>
+                          </td>
+                        </tr>
+                      <% end %>
+                    </tbody>            
+                  </table>                  
+                </td>              
             <% end %>
-          </tr>        
+            </tr>          
+          <% end %>
         <% end %>
       <% end %>
     </tbody>