[Madeleine-commit] madeleine/lib madeleine.rb,1.44,1.45

[Anders B. <nd...@us...>]

Update of /cvsroot/madeleine/madeleine/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8037/lib

Modified Files:
	madeleine.rb 
Log Message:
Merged fs-wrapper and re-implemented CommandLog test.

Index: madeleine.rb
===================================================================
RCS file: /cvsroot/madeleine/madeleine/lib/madeleine.rb,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** madeleine.rb	19 Jul 2004 17:01:12 -0000	1.44
--- madeleine.rb	28 Jul 2004 22:12:57 -0000	1.45
***************
*** 20,23 ****
--- 20,24 ----
    require 'thread'
    require 'sync'
+   require 'madeleine/files'
  
    MADELEINE_VERSION = "0.7"
***************
*** 217,221 ****
      def recover_logs(executer)
        executer.recovery {
!         CommandLog.log_file_names(@directory_name).each {|file_name|
            open(@directory_name + File::SEPARATOR + file_name, "rb") {|log|
              recover_log(executer, log)
--- 218,222 ----
      def recover_logs(executer)
        executer.recovery {
!         CommandLog.log_file_names(@directory_name, FileService.new).each {|file_name|
            open(@directory_name + File::SEPARATOR + file_name, "rb") {|log|
              recover_log(executer, log)
***************
*** 252,258 ****
    class CommandLog #:nodoc:
  
!     def self.log_file_names(directory_name)
!       return [] unless File.exist?(directory_name)
!       result = Dir.entries(directory_name).select {|name|
          name =~ /^\d{#{FILE_COUNTER_SIZE}}\.command_log$/
        }
--- 253,259 ----
    class CommandLog #:nodoc:
  
!     def self.log_file_names(directory_name, file_service)
!       return [] unless file_service.exist?(directory_name)
!       result = file_service.dir_entries(directory_name).select {|name|
          name =~ /^\d{#{FILE_COUNTER_SIZE}}\.command_log$/
        }
***************
*** 262,269 ****
      end
  
!     def initialize(path)
!       id = CommandLog.highest_log(path) + 1
        numbered_file = NumberedFile.new(path, "command_log", id)
!       @file = open(numbered_file.name, 'wb')
      end
  
--- 263,270 ----
      end
  
!     def initialize(path, file_service)
!       id = self.class.highest_log(path, file_service) + 1
        numbered_file = NumberedFile.new(path, "command_log", id)
!       @file = file_service.open(numbered_file.name, 'wb')
      end
  
***************
*** 278,284 ****
      end
  
!     def self.highest_log(directory_name)
        highest = 0
!       log_file_names(directory_name).each {|file_name|
          match = /^(\d{#{FILE_COUNTER_SIZE}})/.match(file_name)
          n = match[1].to_i
--- 279,285 ----
      end
  
!     def self.highest_log(directory_name, file_service)
        highest = 0
!       log_file_names(directory_name, file_service).each {|file_name|
          match = /^(\d{#{FILE_COUNTER_SIZE}})/.match(file_name)
          n = match[1].to_i
***************
*** 293,297 ****
    class DefaultLogFactory #:nodoc:
      def create_log(directory_name)
!       CommandLog.new(directory_name)
      end
    end
--- 294,298 ----
    class DefaultLogFactory #:nodoc:
      def create_log(directory_name)
!       CommandLog.new(directory_name, FileService.new)
      end
    end