appstats 0.0.14 → 0.0.15

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    appstats (0.0.14)
+    appstats (0.0.15)
       daemons
       net-scp
       rails (>= 2.3.0)

data/lib/appstats/log_collector.rb

@@ -15,7 +15,7 @@ module Appstats
       begin
         Appstats.log(:info,"Looking for logs in [#{remote_login[:user]}@#{remote_login[:host]}:#{path}] labelled [#{log_template}]")
         Net::SSH.start(remote_login[:host], remote_login[:user], :password => remote_login[:password] ) do |ssh|
-         all_files = ssh.exec!("cd #{path} && ls | grep #{log_template}").split
+         all_files = ssh.exec!("cd #{path} && ls -tr | grep #{log_template}").split
          load_remote_files(remote_login,path,all_files)
         end
       rescue Exception => e
@@ -35,7 +35,9 @@ module Appstats
       Appstats.log(:info, "About to analyze #{all_files.size} file(s).")
       all_files.each do |log_name|
         filename = File.join(path,log_name)
-        if LogCollector.find_by_host_and_filename(remote_login[:host],filename).nil?
+        if !log_name.match("(.*)#{Time.now.strftime('%Y-%m-%d')}.log").nil?
+          Appstats.log(:info, "  - IGNORING CURRENT LOG FILE #{remote_login[:user]}@#{remote_login[:host]}:#{filename}")
+        elsif LogCollector.find_by_host_and_filename(remote_login[:host],filename).nil?
           log_collector = LogCollector.create(:host => remote_login[:host], :filename => filename, :status => "unprocessed")
           Appstats.log(:info, "  - #{remote_login[:user]}@#{remote_login[:host]}:#{filename}")
           count += 1

data/lib/appstats/tasks.rb

@@ -23,7 +23,6 @@ module Appstats
       @env = 'DB'
       @default_env = 'development'
       @verbose = true
-      @log_level = Logger::ERROR
       yield self if block_given?
       # Add to load_path every "lib/" directory in vendor
       Dir["#{vendor}/**/lib"].each{|p| $LOAD_PATH << p }

data/lib/appstats/version.rb

@@ -1,3 +1,3 @@
 module Appstats
-  VERSION = "0.0.14"
+  VERSION = "0.0.15"
 end

data/lib/daemons/appstats_log_collector_ctl

@@ -9,6 +9,8 @@ gem 'activerecord', '>=3.0.0.beta4'
 require 'active_support'
 require 'active_record'
 
+require File.dirname(__FILE__) + "/../appstats.rb"
+
 # For some reason, ActiveSupport 3.0.0 doesn't load.
 # Load needed extension directly for now.
 require "active_support/core_ext/object"

data/spec/entry_spec.rb

@@ -143,18 +143,18 @@ module Appstats
       end
       
       it "should understand an entry without contexts" do
-        entry = Entry.load_from_logger_entry("0.0.14 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search")
+        entry = Entry.load_from_logger_entry("0.0.15 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search")
         Entry.count.should == @before_count + 1
         entry.action.should == "address_search"
-        entry.raw_entry.should == "0.0.14 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search"
+        entry.raw_entry.should == "0.0.15 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search"
         entry.occurred_at.should == Time.parse("2010-09-21 23:15:20")
       end
       
       it "should understand contexts" do
-        entry = Entry.load_from_logger_entry("0.0.14 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live")
+        entry = Entry.load_from_logger_entry("0.0.15 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live")
         Entry.count.should == @before_count + 1
         entry.action.should == "address_filter"
-        entry.raw_entry.should == "0.0.14 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live"
+        entry.raw_entry.should == "0.0.15 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live"
         entry.occurred_at.should == Time.parse("2010-09-21 23:15:20")
         entry.contexts.size.should == 2
         entry.contexts[0].context_key = "app_name"

data/spec/log_collector_spec.rb

@@ -4,6 +4,9 @@ module Appstats
   describe LogCollector do
 
     before(:each) do
+      @time = Time.parse('2010-01-03 10:20:30')
+      Time.stub!(:now).and_return(@time)
+
       LogCollector.delete_all
       @log_collector = Appstats::LogCollector.new
       @login = { :host => "myhost.localnet", :user => "deployer", :password => "pass" }
@@ -53,12 +56,13 @@ module Appstats
       it "should log all transactions" do
         ssh = mock(Net::SSH)
         Net::SSH.should_receive(:start).with("myhost.localnet","deployer",{ :password => "pass"}).and_yield(ssh)
-        ssh.should_receive(:exec!).with("cd /my/path/log && ls | grep mystats").and_return("mystats1\nmystats2")
-        
+        ssh.should_receive(:exec!).with("cd /my/path/log && ls -tr | grep mystats").and_return("mystats_2010-01-01.log\nmystats_2010-01-02.log\nmystats_2010-01-03.log")
+
         Appstats.should_receive(:log).with(:info, "Looking for logs in [deployer@myhost.localnet:/my/path/log] labelled [mystats]")
-        Appstats.should_receive(:log).with(:info, "About to analyze 2 file(s).")
-        Appstats.should_receive(:log).with(:info, "  - deployer@myhost.localnet:/my/path/log/mystats1")
-        Appstats.should_receive(:log).with(:info, "  - deployer@myhost.localnet:/my/path/log/mystats2")
+        Appstats.should_receive(:log).with(:info, "About to analyze 3 file(s).")
+        Appstats.should_receive(:log).with(:info, "  - deployer@myhost.localnet:/my/path/log/mystats_2010-01-01.log")
+        Appstats.should_receive(:log).with(:info, "  - deployer@myhost.localnet:/my/path/log/mystats_2010-01-02.log")
+        Appstats.should_receive(:log).with(:info, "  - IGNORING CURRENT LOG FILE deployer@myhost.localnet:/my/path/log/mystats_2010-01-03.log")
         Appstats.should_receive(:log).with(:info, "Loaded 2 file(s).")
         LogCollector.find_remote_files(@login,"/my/path/log","mystats").should == 2
       end
@@ -66,14 +70,14 @@ module Appstats
       it "should talk to remote server" do
         ssh = mock(Net::SSH)
         Net::SSH.should_receive(:start).with("myhost.localnet","deployer",{ :password => "pass"}).and_yield(ssh)
-        ssh.should_receive(:exec!).with("cd /my/path/log && ls | grep mystats").and_return("mystats1\nmystats2")
+        ssh.should_receive(:exec!).with("cd /my/path/log && ls -tr | grep mystats").and_return("mystats_2010-01-01.log\nmystats_2010-01-02.log")
         
         LogCollector.find_remote_files(@login,"/my/path/log","mystats").should == 2
         LogCollector.count.should == @before_count + 2
 
         log_collector = LogCollector.last
         log_collector.host.should == "myhost.localnet"
-        log_collector.filename.should == "/my/path/log/mystats2"
+        log_collector.filename.should == "/my/path/log/mystats_2010-01-02.log"
         log_collector.status.should == "unprocessed"
       end
       
@@ -98,7 +102,6 @@ module Appstats
         Appstats.should_receive(:log).with(:info,"No remote logs to load.")
         LogCollector.load_remote_files(@login,"/my/path/log",[]).should == 0
       end
-
       
       it "should log the files loaded" do
         LogCollector.load_remote_files(@login,"/my/path/log",["app2"]).should == 1
@@ -110,6 +113,15 @@ module Appstats
         Appstats.should_receive(:log).with(:info, "Loaded 2 file(s).")
         LogCollector.load_remote_files(@login,"/my/path/log",["app1","app2","app3"]).should == 2
       end
+
+      it "should ignore today's file" do
+        Appstats.should_receive(:log).with(:info, "About to analyze 3 file(s).")
+        Appstats.should_receive(:log).with(:info, "  - deployer@myhost.localnet:/my/path/log/app1")
+        Appstats.should_receive(:log).with(:info, "  - deployer@myhost.localnet:/my/path/log/app2")
+        Appstats.should_receive(:log).with(:info, "  - IGNORING CURRENT LOG FILE deployer@myhost.localnet:/my/path/log/app3_2010-01-03.log")
+        Appstats.should_receive(:log).with(:info, "Loaded 2 file(s).")
+        LogCollector.load_remote_files(@login,"/my/path/log",["app1","app2","app3_2010-01-03.log"]).should == 2
+      end
       
       it "should create an unprocessed record per file" do
         LogCollector.load_remote_files(@login,"/my/path/log",["app1","app2","app3"]).should == 3

data/spec/logger_spec.rb

@@ -127,29 +127,29 @@ module Appstats
     
        it "should handle a statistics entry" do
          expected = { :action => "address_search", :timestamp => "2010-09-21 23:15:20" }
-         actual = Appstats::Logger.entry_to_hash("0.0.14 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search")
+         actual = Appstats::Logger.entry_to_hash("0.0.15 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search")
          actual.should == expected
        end
        
        it "should handle contexts" do
          expected = { :action => "address_filter", :timestamp => "2010-09-21 23:15:20", :server => "Live", :app_name => 'Market' }
-         actual = Appstats::Logger.entry_to_hash("0.0.14 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live")
+         actual = Appstats::Logger.entry_to_hash("0.0.15 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live")
          actual.should == expected
        end
     
        it "should handle actions with the delimiter (and change the delimiter)" do
          expected = { :action => "address:=search-n", :timestamp => "2010-09-21 23:15:20" }
-         actual = Appstats::Logger.entry_to_hash("0.0.14 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=search-n")
+         actual = Appstats::Logger.entry_to_hash("0.0.15 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=search-n")
          actual.should == expected
     
          expected = { :action => "address::search==--n", :timestamp => "2010-09-21 23:15:20" }
-         actual = Appstats::Logger.entry_to_hash("0.0.14 setup[:::,===,---n] 2010-09-21 23:15:20 action===address::search==--n")
+         actual = Appstats::Logger.entry_to_hash("0.0.15 setup[:::,===,---n] 2010-09-21 23:15:20 action===address::search==--n")
          actual.should == expected
        end
     
        it "should handle contexts with the delimiter (and change the delimiter)" do
          expected = { :action => "address", :timestamp => "2010-09-21 23:15:20", :server => "market:eval=-n" }
-         actual = Appstats::Logger.entry_to_hash("0.0.14 setup[::,==,--n] 2010-09-21 23:15:20 action==address :: server==market:eval=-n")
+         actual = Appstats::Logger.entry_to_hash("0.0.15 setup[::,==,--n] 2010-09-21 23:15:20 action==address :: server==market:eval=-n")
          actual.should == expected
        end
        
@@ -158,66 +158,66 @@ module Appstats
     describe "#entry_to_s" do
       
       it "should handle a statistics entry" do
-        expected = "0.0.14 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search"
+        expected = "0.0.15 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search"
         actual = Appstats::Logger.entry_to_s("address_search")
         actual.should == expected
       end
       
       it "should handle numbers" do
-        expected = "0.0.14 setup[:,=,-n] 2010-09-21 23:15:20 action=1 : note=2.2"
+        expected = "0.0.15 setup[:,=,-n] 2010-09-21 23:15:20 action=1 : note=2.2"
         actual = Appstats::Logger.entry_to_s(1,:note => 2.2)
         actual.should == expected
       end
       
       it "should handle default contexts" do
         Appstats::Logger.default_contexts[:app_name] = "market"
-        expected = "0.0.14 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search : app_name=market"
+        expected = "0.0.15 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search : app_name=market"
         actual = Appstats::Logger.entry_to_s("address_search")
         actual.should == expected
       end
       
       it "should handle contexts (and sort them by symbol)" do
-        expected = "0.0.14 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live"
+        expected = "0.0.15 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live"
         actual = Appstats::Logger.entry_to_s("address_filter", { :server => "Live", :app_name => 'Market' })
         actual.should == expected
       end
 
       it "should handle actions with the delimiter (and change the delimiter)" do
-        expected = "0.0.14 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=search-n"
+        expected = "0.0.15 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=search-n"
         actual = Appstats::Logger.entry_to_s("address:=search-n")
         actual.should == expected
 
-        expected = "0.0.14 setup[:::,===,---n] 2010-09-21 23:15:20 action===address::search==--n"
+        expected = "0.0.15 setup[:::,===,---n] 2010-09-21 23:15:20 action===address::search==--n"
         actual = Appstats::Logger.entry_to_s("address::search==--n")
         actual.should == expected
       end
 
       it "should handle contexts with the delimiter (and change the delimiter)" do
-        expected = "0.0.14 setup[::,==,--n] 2010-09-21 23:15:20 action==address :: server==market:eval=-n"
+        expected = "0.0.15 setup[::,==,--n] 2010-09-21 23:15:20 action==address :: server==market:eval=-n"
         actual = Appstats::Logger.entry_to_s("address", :server => 'market:eval=-n')
         actual.should == expected
       end
 
       it "should ignore spaces" do
-        expected = "0.0.14 setup[:,=,-n] 2010-09-21 23:15:20 action=address search"
+        expected = "0.0.15 setup[:,=,-n] 2010-09-21 23:15:20 action=address search"
         actual = Appstats::Logger.entry_to_s("address search")
         actual.should == expected
       end
       
       it "should convert newlines in action" do
-        expected = "0.0.14 setup[:,=,-n] 2010-09-21 23:15:20 action=address_-nsearch"
+        expected = "0.0.15 setup[:,=,-n] 2010-09-21 23:15:20 action=address_-nsearch"
         actual = Appstats::Logger.entry_to_s("address_\nsearch")
         actual.should == expected
       end
 
       it "should convert newlines in context" do
-        expected = "0.0.14 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search : blah=some-nlong-nstatement"
+        expected = "0.0.15 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search : blah=some-nlong-nstatement"
         actual = Appstats::Logger.entry_to_s("address_search",:blah => "some\nlong\nstatement")
         actual.should == expected
       end
       
       it "should convert newlines based on the delimiter" do
-        expected = "0.0.14 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=--nsearch-n"
+        expected = "0.0.15 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=--nsearch-n"
         actual = Appstats::Logger.entry_to_s("address:=\nsearch-n")
         actual.should == expected
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: appstats
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 0
-  - 14
-  version: 0.0.14
+  - 15
+  version: 0.0.15
 platform: ruby
 authors: 
 - Andrew Forward
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-04 00:00:00 -05:00
+date: 2011-02-07 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -207,7 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.1
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Provide usage statistics about how your application is being used