ralf 0.1.1 → 0.1.3

data/spec/ralf_spec.rb

@@ -5,7 +5,11 @@ require 'ralf'
 describe Ralf do
 
   before(:each) do
-    @default_params = {:config => File.dirname(__FILE__) + '/fixtures/config.yaml', :date => '2010-02-10'}
+    @default_params = {
+      :config => File.dirname(__FILE__) + '/fixtures/config.yaml',
+      :out_seperator => ':year/:month/:day',
+      :date => '2010-02-10'
+    }
   end
 
   it "should initialize properly" do
@@ -62,7 +66,7 @@ describe Ralf do
   describe "Date handling" do
 
     it "should set the date to today" do
-      ralf = Ralf.new(@default_params)
+      ralf = Ralf.new()
       date = Date.today
       ralf.date.should  eql("%4d-%02d-%02d" % [date.year, date.month, date.day])
     end
@@ -74,11 +78,21 @@ describe Ralf do
 
     it "should raise error when invalid date given" do
       lambda {
-        ralf = Ralf.new(@default_params.merge(:date => 'now'))
+        ralf = Ralf.new(@default_params.merge(:date => 'someday'))
         ralf.date.should  be_nil
       }.should raise_error(ArgumentError, "invalid date")
     end
 
+    xit "should accept a range of dates" do
+      ralf = Ralf.new(@default_params.merge(:date => 'now'))
+      ralf.date.should  be_nil
+    end
+
+    xit "should accept a month and convert it to a date" do
+      ralf = Ralf.new(@default_params.merge(:date => 'januari'))
+      ralf.date.should  be_nil
+    end
+
   end
 
   describe "Handle Buckets" do
@@ -86,10 +100,11 @@ describe Ralf do
     before(:each) do
       @ralf = Ralf.new(@default_params)
       @bucket1 = {:name => 'bucket1'}
-      @bucket1.should_receive(:logging_info).any_number_of_times.and_return({ :enabled => true, :targetprefix => "log/" })
+      @bucket1.should_receive(:logging_info).any_number_of_times.and_return({ :enabled => true, :targetprefix => "log/access_log-" })
       @bucket1.should_receive(:name).any_number_of_times.and_return('media.kerdienstgemist.nl')
       @bucket2 = {:name => 'bucket2'}
       @bucket2.should_receive(:logging_info).any_number_of_times.and_return({ :enabled => false, :targetprefix => "log/" })
+      @bucket2.should_receive(:name).any_number_of_times.and_return('media.kerdienstgemist.nl')
     end
 
     it "should find buckets with logging enabled" do
@@ -100,16 +115,17 @@ describe Ralf do
     end
 
     it "should save logging to disk" do
-      @key1 = {:name => 'log/2010-02-10-00-05-32-ZDRFGTCKUYVJCT', :data => 'This is content'}
-      @key2 = {:name => 'log/2010-02-10-00-07-28-EFREUTERGRSGDH', :data => 'This is content'}
+      @key1 = {:name => 'log/access_log-2010-02-10-00-05-32-ZDRFGTCKUYVJCT', :data => 'This is content'}
+      @key2 = {:name => 'log/access_log-2010-02-10-00-07-28-EFREUTERGRSGDH', :data => 'This is content'}
       @bucket1.should_receive(:keys).any_number_of_times.and_return([@key1, @key2])
       @key1.should_receive(:name).any_number_of_times.and_return(@key1[:name])
       @key2.should_receive(:name).any_number_of_times.and_return(@key2[:name])
       @key1.should_receive(:data).any_number_of_times.and_return(@key1[:data])
       @key2.should_receive(:data).any_number_of_times.and_return(@key2[:data])
-      File.should_receive(:makedirs).twice.and_return(true)
-      File.should_receive(:exists?).twice.and_return(false, true)
-      File.should_receive(:open).once.and_return(true)
+      File.should_receive(:makedirs).twice.with('/Users/berl/S3/media.kerdienstgemist.nl/log/2010/02/10').and_return(true)
+      File.should_receive(:exists?).once.with(  '/Users/berl/S3/media.kerdienstgemist.nl/log/2010/02/10/access_log-2010-02-10-00-07-28-EFREUTERGRSGDH').and_return(true)
+      File.should_receive(:exists?).once.with(  '/Users/berl/S3/media.kerdienstgemist.nl/log/2010/02/10/access_log-2010-02-10-00-05-32-ZDRFGTCKUYVJCT').and_return(false)
+      File.should_receive(:open).once.with(     '/Users/berl/S3/media.kerdienstgemist.nl/log/2010/02/10/access_log-2010-02-10-00-05-32-ZDRFGTCKUYVJCT', "w").and_return(true)
 
       @ralf.save_logging_to_disk(@bucket1).should eql([@key1, @key2])
     end
@@ -117,16 +133,16 @@ describe Ralf do
     it "should merge all logs" do
       out_string = StringIO.new
 
-      Dir.should_receive(:glob).with('/Users/berl/S3/media.kerdienstgemist.nl/log/2010-02-10*').and_return(
-          ['/Users/berl/S3/media.kerdienstgemist.nl/log/2010-02-10-00-05-32-ZDRFGTCKUYVJCT',
-           '/Users/berl/S3/media.kerdienstgemist.nl/log/2010-02-10-00-07-28-EFREUTERGRSGDH'])
+      Dir.should_receive(:glob).with('/Users/berl/S3/media.kerdienstgemist.nl/log/2010/02/10/access_log-2010-02-10*').and_return(
+          ['/Users/berl/S3/media.kerdienstgemist.nl/log/2010/02/10/access_log-2010-02-10-00-05-32-ZDRFGTCKUYVJCT',
+           '/Users/berl/S3/media.kerdienstgemist.nl/log/2010/02/10/access_log-2010-02-10-00-07-28-EFREUTERGRSGDH'])
 
       File.should_receive(:open).with('/Users/berl/S3/s3_combined_media.kerdienstgemist.nl_2010-02-10.alf', "w").and_yield(out_string)
 
       LogMerge::Merger.should_receive(:merge).with(
         out_string, 
-        '/Users/berl/S3/media.kerdienstgemist.nl/log/2010-02-10-00-05-32-ZDRFGTCKUYVJCT',
-        '/Users/berl/S3/media.kerdienstgemist.nl/log/2010-02-10-00-07-28-EFREUTERGRSGDH'
+        '/Users/berl/S3/media.kerdienstgemist.nl/log/2010/02/10/access_log-2010-02-10-00-05-32-ZDRFGTCKUYVJCT',
+        '/Users/berl/S3/media.kerdienstgemist.nl/log/2010/02/10/access_log-2010-02-10-00-07-28-EFREUTERGRSGDH'
       )
 
       @ralf.merge_to_combined(@bucket1)
@@ -134,6 +150,30 @@ describe Ralf do
       out_string.string.should eql('')
     end
 
+    it "should save logs which have a targetprefix containing a '/'" do
+      @ralf.local_log_dirname(@bucket1).should  eql('/Users/berl/S3/media.kerdienstgemist.nl/log/2010/02/10')
+      @ralf.local_log_dirname(@bucket2).should  eql('/Users/berl/S3/media.kerdienstgemist.nl/log/2010/02/10')
+    end
+
+    it "should save to a subdir when a out_seperator is given" do
+      @ralf.local_log_dirname(@bucket1).should  eql('/Users/berl/S3/media.kerdienstgemist.nl/log/2010/02/10')
+
+      @ralf.out_seperator = ':year/w:week'
+      @ralf.local_log_dirname(@bucket1).should  eql('/Users/berl/S3/media.kerdienstgemist.nl/log/2010/w06')
+    end
+
+    it "should get the proper directories" do
+      @key.should_receive(:name).and_return('log/access_log-2010-02-10-00-05-32-ZDRFGTCKUYVJCT')
+      @ralf.local_log_file_basename_prefix(@bucket1).should   eql('access_log-')
+      @ralf.local_log_file_basename(@bucket1, @key).should    eql('access_log-2010-02-10-00-05-32-ZDRFGTCKUYVJCT')
+      @ralf.local_log_dirname(@bucket1).should                eql('/Users/berl/S3/media.kerdienstgemist.nl/log/2010/02/10')
+
+      @key.should_receive(:name).and_return('log/2010-02-10-00-05-32-ZDRFGTCKUYVJCT')
+      @ralf.local_log_file_basename_prefix(@bucket2).should   eql('')
+      @ralf.local_log_file_basename(@bucket2, @key).should    eql('2010-02-10-00-05-32-ZDRFGTCKUYVJCT')
+      @ralf.local_log_dirname(@bucket2).should                eql('/Users/berl/S3/media.kerdienstgemist.nl/log/2010/02/10')
+    end
+
   end
 
   describe "Conversion" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ralf
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors: 
 - Klaas Jan Wierenga
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-10 00:00:00 +01:00
+date: 2010-02-17 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,6 +33,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.0.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: chronic
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.2.3
+    version: 
 description: "    Download logfiles from Amazon S3 buckets to local disk and combine them in one Apache CLF per bucket\n"
 email: 
 executables: []