sequencer 1.1.2 → 1.2.0

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.2.0
+
+* Adds Sequencer.recursive_entries() for recursive sequence scans
+
 === 1.1.1
 
 * Fix comparison bugs

data/lib/sequencer.rb

@@ -1,5 +1,5 @@
 module Sequencer
-  VERSION = '1.1.2'
+  VERSION = '1.2.0'
   NUMBERS_AT_END = /(\d+)([^\d]+)?$/
   
   extend self
@@ -7,7 +7,14 @@ module Sequencer
   # Detects sequences in the passed directory (same as Dir.entries but returns Sequence objects).
   # Single files will be upgraded to single-frame Sequences
   def entries(of_dir)
-    actual_files = Dir.entries(of_dir).reject{|e| %w(.. .).include?(e)}
+    actual_files = Dir.entries(of_dir)
+    
+    # Remove all dotfiles
+    actual_files.reject!{|f| f =~ /^\./}
+    
+    # Ensure files are presorted
+    actual_files.sort!
+    
     groups = {}
     
     actual_files.each do | e |
@@ -28,6 +35,21 @@ module Sequencer
     end
   end
   
+  # Detects sequences in the passed directory and all of it's subdirectories
+  # It will skip all the entries starting with a dot
+  # TODO: fix symlink handling
+  def recursive_entries(of_dir)
+    detected_sequences = entries(of_dir)
+    possible_subdirs = Dir.entries(of_dir)
+    possible_subdirs.each do | possible_subdir |
+      next if possible_subdir =~ /^\./
+      
+      dirpath = File.join(of_dir, possible_subdir)
+      detected_sequences += recursive_entries(dirpath) if File.directory?(dirpath)
+    end
+    detected_sequences.sort
+  end
+  
   # Detect a Sequence from a single file and return a handle to it
   def from_single_file(path_to_single_file)
     #File.stat(path_to_single_file)

data/sequencer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "sequencer"
-  s.version = "1.1.2"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Julik Tarkhanov"]
-  s.date = "2012-05-30"
+  s.date = "2012-08-27"
   s.email = "me@julik.nl"
   s.executables = ["rseqls", "rseqpad", "rseqrename"]
   s.extra_rdoc_files = [
@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://guerilla-di.org/sequencer"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.15"
+  s.rubygems_version = "1.8.24"
   s.summary = "Image sequence sorting, scanning and manipulation"
 
   if s.respond_to? :specification_version then

data/test/test_sequencer.rb

@@ -82,9 +82,10 @@ class Sequencer_entries_should < Test::Unit::TestCase
   def setup; emit_test_dirs; end
   def teardown; teardown_test_dirs; end
   
-  def test_returns_entries_for_every_sequence_in_a_directory
-    entries = Sequencer.entries(TEST_DIR + "/many_seqs")
-    flunk "this test is not finished"
+  def test_returns_entries_recursive_for_every_sequence_in_a_directory
+    entries = Sequencer.recursive_entries(TEST_DIR + "/many_seqs")
+    names = entries.map{|e| e.to_s }
+    assert_equal ["anotherS [228..312].tif", "seq1.[458..512].tif", "single.tif", "in_subdir [445..471].tif"], names
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequencer
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-30 00:00:00.000000000 Z
+date: 2012-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &9134000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9134000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &9132990 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +37,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9132990
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: me@julik.nl
 executables:
@@ -69,7 +79,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -408673631
+      hash: -3510175113673425325
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -78,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Image sequence sorting, scanning and manipulation