wackamole 0.1.2 → 0.1.3

data/History.txt

@@ -34,4 +34,10 @@
 * Added support for auth on mongo instance - see README for info
 
 === 0.1.0 /2010-03-10
-* Cleaning up
+* Cleaning up
+
+=== 0.1.1
+=== 0.1.2
+=== 0.1.3
+* Updated to mongo 1.0.1
+  NOTE: mongo ruby driver api changed broke OrderedHash

data/Rakefile

@@ -30,14 +30,15 @@ PROJ.rdoc.include = %w[.rb]
 
 # Dependencies
 depend_on "rack"                  , ">= 1.1.0"
-depend_on "mongo"                 , ">= 0.18.1"
-depend_on "mongo_ext"             , ">= 0.18.1"
+depend_on "mongo"                 , ">= 1.0.1"
+depend_on "bson"                  , ">= 1.0.1"
+depend_on "bson_ext"              , ">= 1.0.1"
 depend_on "agnostic-will_paginate", ">= 3.0.0"
 depend_on "memcache-client"       , ">= 1.5.0"
 depend_on "main"                  , ">= 4.2.0"
-depend_on "sinatra"               , ">= 0.9.4"
+depend_on "sinatra"               , ">= 1.0"
 depend_on "mongo_rack"            , ">= 0.0.3"
 depend_on "rackamole"             , ">= 0.0.3"
 
 # Rake
-task :default => ['fixtures:load','spec:run']
+task :default => ['fixtures:load','spec:run']

data/bin/wackamole

@@ -19,8 +19,6 @@ Main {
     
   # Enter main loop  
   def run
-puts params[:pool].inspect
-puts params[:environment].inspect
     require File.expand_path( File.join(File.dirname(__FILE__), %w[.. lib wackamole]))
         
     @@options = parse_args( params[:pool].value )

data/lib/app.rb

@@ -6,6 +6,7 @@ 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,13 +20,13 @@ end
 # Configurations
 
 # configure :production do
-#   set :logging,  true
+   set :logging,  false
 #   set :sessions, true
 # end
 
 configure do
   set :sessions, false
-  set :logging,  true
+  set :logging,  false
     
   Wackamole.load_all_libs_relative_to(__FILE__, 'helpers' )
   Wackamole.load_all_libs_relative_to(__FILE__, 'controllers' )
@@ -85,4 +86,4 @@ before do
     #   session[:app_info] = nil
     # end
   end
-end
+end

data/lib/controllers/logs.rb

@@ -33,7 +33,7 @@ module Logs
   # ---------------------------------------------------------------------------
   # Fecth info about a particular log
   get "/logs/:id/show" do
-    @log = Wackamole::Log.find_one( Mongo::ObjectID.from_string( params[:id] ) )
+    @log = Wackamole::Log.find_one( BSON::ObjectID.from_string( params[:id] ) )
     erb :"logs/show", :layout => false 
   end
   

data/lib/helpers/flash_helper.rb

@@ -3,14 +3,14 @@ module FlashHelper
    
    # clear out flash object
    def clear_flash!
-     @flash = session[:flash] || OrderedHash.new     
+     @flash = session[:flash] || BSON::OrderedHash.new     
      @flash.clear
      session[:flash] = @flash
    end
    
    # add flash message
    def flash_it!( type, msg )
-     @flash = session[:flash] || OrderedHash.new
+     @flash = session[:flash] || BSON::OrderedHash.new
      @flash[type] = msg
      session[:flash] = @flash
    end

data/lib/helpers/mission_helper.rb

@@ -2,7 +2,7 @@ module MissionHelper
   helpers do 
 
     def extract_applications( pulse )
-      apps = OrderedHash.new
+      apps = BSON::OrderedHash.new
       pulse[:to_date].keys.sort.each { |app_name| apps[app_name] = pulse[:to_date][app_name].keys.sort }
       apps
     end

data/lib/wackamole.rb

@@ -1,7 +1,7 @@
 module Wackamole
 
   # :stopdoc:
-  VERSION = '0.1.2'                                                          unless defined? Wackamole::VERSION
+  VERSION = '0.1.3'                                                          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

@@ -20,22 +20,20 @@ module Wackamole
       # Fetch day logs          
       utc_time = now.clone.utc
       conds = SearchFilter.time_conds( now, 0 )
-# puts conds.inspect      
+    
       day_logs = logs_cltn.find( conds, 
         :fields => [:typ, :fid, :tid, :did, :uid], 
         :sort => [ [:tid => Mongo::ASCENDING] ] )
-# puts "Found logs #{day_logs.count}"        
       # Count all logs per hourly time period
       users         = Set.new
       features      = Set.new
       local_time    = now.clone.localtime
       hours         = (0...24).to_a
-      hour_info     = hours.inject(OrderedHash.new) { |res,hour| res[hour] = { :user => 0, :feature => 0, :perf => 0, :fault => 0 };res }    
+      hour_info     = hours.inject(BSON::OrderedHash.new) { |res,hour| res[hour] = { :user => 0, :feature => 0, :perf => 0, :fault => 0 };res }    
       user_per_hour = {}
       day_logs.each do |log|
         date_tokens = log['did'].match( /(\d{4})(\d{2})(\d{2})/ ).captures
         time_tokens = log['tid'].match( /(\d{2})(\d{2})(\d{2})/ ).captures
-# puts "#{log['did']} - #{log['tid']} - #{log['uid']}"
         log_utc     = Time.utc( date_tokens[0], date_tokens[1], date_tokens[2], time_tokens[0], time_tokens[1], time_tokens[2] )
         local       = log_utc.clone.localtime
         hour        = local.hour

data/lib/wackamole/models/search_filter.rb

@@ -178,7 +178,7 @@ module Wackamole
     
       # filter mole_features
       unless feature_id.to_s == "-1"
-        conds[:fid] = Mongo::ObjectID.from_string( feature_id )
+        conds[:fid] = BSON::ObjectID.from_string( feature_id )
       end
                                 
       if search_terms and !search_terms.empty?

data/spec/wackamole/models/search_filter_spec.rb

@@ -93,7 +93,7 @@ describe Wackamole::SearchFilter do
       conds = @filter.to_conds
       time = Chronic.parse( "now" ).utc
       conds.should have(2).items
-      conds[:fid].should == Mongo::ObjectID.from_string( "4b25b0049983a8a193000010" )
+      conds[:fid].should == BSON::ObjectID.from_string( "4b25b0049983a8a193000010" )
     end
     
     describe "search terms" do

data/tasks/rdoc.rake

@@ -1,5 +1,5 @@
 require 'rake/rdoctask'
-require 'darkfish-rdoc'
+# require 'darkfish-rdoc'
 
 namespace :doc do
 

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: wackamole
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Fernand Galiana
@@ -9,109 +14,162 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-21 00:00:00 -06:00
+date: 2010-06-04 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
+        - 0
         version: 1.1.0
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: mongo
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.18.1
-    version: 
+        segments: 
+        - 1
+        - 0
+        - 1
+        version: 1.0.1
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: mongo_ext
+  name: bson
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 1
+        version: 1.0.1
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: bson_ext
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.18.1
-    version: 
+        segments: 
+        - 1
+        - 0
+        - 1
+        version: 1.0.1
+  type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: agnostic-will_paginate
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        - 0
         version: 3.0.0
-    version: 
+  type: :runtime
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: memcache-client
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 5
+        - 0
         version: 1.5.0
-    version: 
+  type: :runtime
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: main
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 4
+        - 2
+        - 0
         version: 4.2.0
-    version: 
+  type: :runtime
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: sinatra
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.4
-    version: 
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
+  type: :runtime
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: mongo_rack
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 0
+        - 3
         version: 0.0.3
-    version: 
+  type: :runtime
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: rackamole
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 0
+        - 3
         version: 0.0.3
-    version: 
+  type: :runtime
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: bones
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 5
+        - 1
         version: 2.5.1
-    version: 
+  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: 
@@ -350,20 +408,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: !binary |
   AA==
 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A companion web app to Rackamole