file_series 0.1.0 → 0.2.0

data/.autotest

@@ -0,0 +1,5 @@
+# less resource-intense way to watch for changed files, OSX only.
+require 'autotest/fsevent'
+
+# show failure messages via growl.
+require 'autotest/growl'

data/Gemfile

@@ -6,6 +6,9 @@ source "http://rubygems.org"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
+  gem "autotest-standalone"
+  gem "autotest-fsevent"
+  gem "autotest-growl"
   gem "rspec", "~> 2.8.0"
   gem "rdoc", "~> 3.12"
   gem "bundler", "~> 1.0.0"

data/Gemfile.lock

@@ -1,7 +1,12 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    autotest-fsevent (0.2.8)
+      sys-uname
+    autotest-growl (0.2.16)
+    autotest-standalone (4.5.9)
     diff-lcs (1.1.3)
+    ffi (1.1.0)
     git (1.2.5)
     jeweler (1.8.4)
       bundler (~> 1.0)
@@ -20,12 +25,17 @@ GEM
     rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.8.0)
+    sys-uname (0.9.0)
+      ffi (>= 1.0.0)
     timecop (0.3.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  autotest-fsevent
+  autotest-growl
+  autotest-standalone
   bundler (~> 1.0.0)
   jeweler (~> 1.8.4)
   rdoc (~> 3.12)

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/file_series.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "file_series"
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alex Dean"]
-  s.date = "2012-07-18"
+  s.date = "2012-07-19"
   s.description = "Automatically start writing to a new file every X seconds without any locking or file moving/renaming."
   s.email = "alex@crackpot.org"
   s.extra_rdoc_files = [
@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
     "README.rdoc"
   ]
   s.files = [
+    ".autotest",
     ".document",
     ".rspec",
     "Gemfile",
@@ -40,12 +41,18 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<autotest-standalone>, [">= 0"])
+      s.add_development_dependency(%q<autotest-fsevent>, [">= 0"])
+      s.add_development_dependency(%q<autotest-growl>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
       s.add_development_dependency(%q<timecop>, ["= 0.3.5"])
     else
+      s.add_dependency(%q<autotest-standalone>, [">= 0"])
+      s.add_dependency(%q<autotest-fsevent>, [">= 0"])
+      s.add_dependency(%q<autotest-growl>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -53,6 +60,9 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<timecop>, ["= 0.3.5"])
     end
   else
+    s.add_dependency(%q<autotest-standalone>, [">= 0"])
+    s.add_dependency(%q<autotest-fsevent>, [">= 0"])
+    s.add_dependency(%q<autotest-growl>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.8.0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])

data/lib/file_series.rb

@@ -33,13 +33,13 @@ class FileSeries
 		@current_ts = nil
 		@filename_prefix = options[:prefix] || DEFAULT_PREFIX
 		@rotate_freq = options[:rotate_every] || DEFAULT_FREQ #seconds
-		@binary_writes = options[:binary]
+		@binary_mode = options[:binary]
 		@separator = options[:separator] || DEFAULT_SEPARATOR
 	end
 
 	# write something to the current log file.
 	def write(message)
-		log_file.write(message + @separator)
+		log_file.write(message.to_s + @separator)
 	end
 
 	# return a File object for the current log file.
@@ -65,7 +65,7 @@ class FileSeries
 	def rotate(ts=nil)
 		ts ||= this_period
 		@file.close if @file
-		@file = File.open(filename(ts), "a#{'b' if @binary_writes}")
+		@file = File.open(filename(ts), "a#{'b' if @binary_mode}")
 		@current_ts = ts
 	end
 
@@ -88,4 +88,13 @@ class FileSeries
 		end
 	end
 
+	# enumerate over all the writes in a series, across all files.
+	def each
+		complete_files.sort.each do |file|
+			File.open(file,"r#{'b' if @binary_mode}").each_line(@separator) do |raw|
+				yield raw
+			end
+		end
+	end
+
 end

data/spec/file_series_spec.rb

@@ -38,6 +38,17 @@ describe "FileSeries" do
 
 	end
 
+	it "should support binary file writing" do
+		# TODO: need to come up with some sequence which can't be written in non-binary mode.
+		# Trying to write a Marshal'd version of
+		# https://github.com/tedconf/videometrics/blob/83ad528b013ce591ac2500d7317e0904270356f9/spec/controllers/imports_controller_spec.rb#L92
+		# in non-binary mode fails with
+		#   Failure/Error: post :record_event, :event => @event
+    #   Encoding::UndefinedConversionError:
+    #   "\x87" from ASCII-8BIT to UTF-8
+    # Writing in binary mode works fine. How to reproduce that more simply for a test?
+	end
+
 	describe "#write" do
 		it "should call log_file.write with message and separator" do
 			fs = FileSeries.new(:separator=>'...')
@@ -100,4 +111,71 @@ describe "FileSeries" do
 		end
 	end
 
+	describe "#each" do
+		it "should enumerate all lines in all files in a series" do
+			fs = FileSeries.new(:dir=>test_dir, :rotate_every=>60, :prefix=>'events')
+
+			# write 3 files with consecutive integers.
+			Timecop.freeze(100) do
+				(0..9).each do |i|
+					fs.write i
+				end
+			end
+			Timecop.freeze(160) do
+				(10..19).each do |i|
+					fs.write i
+				end
+			end
+			Timecop.freeze(220) do
+				(20..29).each do |i|
+					fs.write i
+				end
+			end
+			fs.file.flush
+
+			out = []
+			fs.each do |line|
+				out << line
+			end
+
+			out.should == (0..29).to_a.map {|i| i.to_s+"\n" }
+		end
+
+		it "should enumerate all entries in a binary file series" do
+			fs = FileSeries.new(
+				:binary=>true,
+				:separator=>'!~!~!',
+				:dir=>test_dir,
+				:prefix=>'bin',
+				:rotate_every=>60
+			)
+
+			Timecop.freeze(100) do
+				(0..9).each do |i|
+					fs.write Marshal.dump(i)
+				end
+			end
+			Timecop.freeze(160) do
+				(10..19).each do |i|
+					fs.write Marshal.dump(i)
+				end
+			end
+			Timecop.freeze(220) do
+				(20..29).each do |i|
+					fs.write Marshal.dump(i)
+				end
+			end
+			fs.file.flush
+
+			out = []
+			fs.each do |line|
+				out << Marshal.load(line)
+			end
+
+			# note that we don't get the separator, and they're Fixnum not String
+			out.should == (0..29).to_a.map {|i| i }
+
+		end
+	end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: file_series
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,56 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-18 00:00:00.000000000 Z
+date: 2012-07-19 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: autotest-standalone
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: autotest-fsevent
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: autotest-growl
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -100,6 +148,7 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
 files:
+- .autotest
 - .document
 - .rspec
 - Gemfile
@@ -127,7 +176,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3623692300417860031
+      hash: 2322774718501649979
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: