file_series 0.5.0 → 0.6.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YThmYzk0YjNkNjM1ZjA1Nzk4OGQwZTMxNDc0YzhmNTBkMTllNjcxMQ==
+    NzFjMWYwOWRjM2JmYWI2ZjY4ZDJkNTVhODE3Y2YwMGJkNTAxODM3Yw==
   data.tar.gz: !binary |-
-    Y2Q2OTllOTQ2NTEwNDE1YWM5NWMyNjJkNGFiZmQ0NGNjMGU2Njg3ZQ==
+    NmFmYTNhYzczMGUwMzAzNGYzZWE4MDhiMTJhNmJiZDA5NjNlYzNjNA==
 SHA512:
   metadata.gz: !binary |-
-    ODgwNjIyMTEyYTAyYTY4NjMwNzllM2MzODQwMDU2NzIwMjA2NmU1MzFlZTNh
-    ODEyZDc3Mjk4NTc5MDc4NjM3MTcxMTFiYmJhNTlhYjY4N2NlNjZmNTViMDg1
-    NWFiMmRmM2Q2NDAzN2I5N2MyMWZhMTJlNTVlMjNiZjgzMDlmMDA=
+    Njc2MGY4NmEzOWRjMGNiYTc0MjA1NTJiOTAxOWYwMGI0YWIxODZjNDgxOTQ4
+    MTVhZTgyMzcxMTI2ODRkMmIyZTJiMjI2OGRmNmIwNmYyMjlhYmQwMTk2Mzcx
+    ZWMxZTRmNmRlYzE1NzA2ZDk2NjRkZWQwOTU5NzVmMjY3MTBiYzM=
   data.tar.gz: !binary |-
-    YzM0ODUyOWNjZjM4OTFkNTRiODgyYzZmM2IwNzc4NGRmMjkwN2EyMDZkYzIw
-    ZGYwOWJjZWY4NmE5NWIwZjNhMzlkZmRkZThiYjZjMjUzMjNlYTk1MzE1NjE4
-    NWUzNmJiOTVkMmRjOTA0NzBlMDhjNTNmMzM0OGRjNDNlNjE2MTg=
+    YWEwMmY4OWNmNTZlOTI2ZjE1NGNjZTlmYzc2MjQ3MWEyYmQ2MDYxNmM3ODgx
+    M2QwYTM5ZjU2ZWRiOWEzMDU0MTU0Mzc5NDk0ZGY5MjViNTAyMGZhMDc4N2Jh
+    MzU3NWY1MTRhNmFkMWY4ZmQ1NTVmZDhiNTRiMzdhZGUwMWM5NmU=

data/.ruby-gemset

@@ -0,0 +1 @@
+file_series

data/.ruby-version

@@ -0,0 +1 @@
+1.9.3-p194

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.6.0

data/file_series.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: file_series 0.5.0 ruby lib
+# stub: file_series 0.6.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "file_series"
-  s.version = "0.5.0"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Alex Dean"]
-  s.date = "2014-06-05"
+  s.date = "2015-01-05"
   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 = [
@@ -22,6 +22,8 @@ Gem::Specification.new do |s|
     ".autotest",
     ".document",
     ".rspec",
+    ".ruby-gemset",
+    ".ruby-version",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",

data/lib/file_series.rb

@@ -75,11 +75,28 @@ class FileSeries
 
   # return a string filename for the logfile for the supplied timestamp.
   # defaults to current time period.
+  #
+  # changes to filename structure must be matched by changes to parse_filename
   def filename(ts=nil)
     ts ||= this_period
     File.join(@dir, "#{@filename_prefix}-#{Time.at(ts).utc.strftime('%Y%m%d-%H%M%SZ')}-#{@rotate_freq}.log")
   end
 
+  # extract the parts of a filename
+  def self.parse_filename(filename)
+    base = File.basename(filename, '.log')
+    prefix, date, time, duration = base.split('-')
+    {
+      prefix: prefix,
+      start_time: Time.parse("#{date} #{time}").utc,
+      duration: duration.to_i
+    }
+  end
+
+  def parse_filename(filename)
+    self.class.parse_filename(filename)
+  end
+
   def path
     filename
   end

data/spec/file_series_spec.rb

@@ -102,17 +102,38 @@ describe "FileSeries" do
 
   describe "#filename" do
     it "should accept a timestamp argument" do
-      fs = FileSeries.new( :dir=>'/tmp', :prefix=>'test', :rotate_every=>60)
+      fs = FileSeries.new(:dir=>'/tmp', :prefix=>'test', :rotate_every=>60)
       fs.filename(Time.parse('1970-01-01 00:20:34Z').to_i).should eq "/tmp/test-19700101-002034Z-60.log"
     end
 
     it "should use this_period when no timestamp is supplied" do
-      fs = FileSeries.new( :dir=>'/tmp', :prefix=>'test', :rotate_every=>3600)
+      fs = FileSeries.new(:dir=>'/tmp', :prefix=>'test', :rotate_every=>3600)
       fs.should_receive(:this_period) { Time.parse('1970-01-01 00:20:00Z').to_i }
       fs.filename.should == "/tmp/test-19700101-002000Z-3600.log"
     end
   end
 
+  describe "parse_filename" do
+    it "should return a hash of information about a filename" do
+      data = FileSeries.parse_filename("/tmp/test-19700101-002000Z-3600.log")
+
+      data[:prefix].should eq 'test'
+      data[:start_time].should eq Time.parse('1970-01-01T00:20:00Z')
+      data[:duration].should eq 3600
+    end
+
+    it "should have an instance version also" do
+      filename = "/tmp/test-19700101-002000Z-3600.log"
+      data1 = FileSeries.parse_filename(filename)
+
+      fs = FileSeries.new(:dir=>'/tmp', :prefix=>'test', :rotate_every=>3600)
+      data2 = fs.parse_filename(filename)
+
+      data2.should eq data1
+    end
+
+  end
+
   describe "#path" do
     it "should act like #filename with no arguments" do
       fs = FileSeries.new( :dir=>'/tmp', :prefix=>'test', :rotate_every=>3600)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: file_series
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Alex Dean
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-05 00:00:00.000000000 Z
+date: 2015-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -92,6 +92,8 @@ files:
 - .autotest
 - .document
 - .rspec
+- .ruby-gemset
+- .ruby-version
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt