sequencer 1.0.5 → 1.1.0

data/Gemfile

@@ -0,0 +1,6 @@
+source :rubygems
+
+group :development do
+  gem "jeweler"
+  gem "rake"
+end

data/History.txt

@@ -1,26 +1,30 @@
-=== 1.0.5 / 2011-07-07
+=== 1.1.0
+
+* Make Sequence comparable to allow for sorted and unique sequences
+
+=== 1.0.5
 
 * Dicking around with testing frameworks that become obsolete is the worst thing ever.
 
-=== 1.0.4 / 2010-10-26
+=== 1.0.4
 
 * Add rseqrename binary that batch-renames sequences
 
-=== 1.0.3 / 2010-10-26
+=== 1.0.3
 
 * Add rseqpad binary that zero-pads sequences
 
-=== 1.0.2 / 2010-05-06
+=== 1.0.2
 
 * Add Sequence#from_glob for scavenging all sequences from all subdirs
 * Add Sequence#first_frame_no and Sequence#last_frame_no for first and last frame offset
 * Add Sequence#to_sequences that returns the whole subsequences contained within a sequence
 
-=== 1.0.1 / 2010-02-10
+=== 1.0.1
 
 * Add Sequence#length, Sequence#to_a, Sequence#directory and Sequence#to_paths
 
-=== 1.0.0 / 2010-02-10
+=== 1.0.0
 
 * 1 major enhancement
 

data/README.rdoc

@@ -1,10 +1,10 @@
-= sequencer
+Sequencer is the swiss army knife of image sequence management for Ruby. It helps with things like
 
-* http://guerilla-di.org/sequencer
-
-== DESCRIPTION:
-
-Simplifies working with image sequences
+* Collapsing multibillion-files directory listings to sequence lists with sane names and sane string representations
+* Detecting gaps in image sequences
+* Renaming sequences for filename uniformity, number uniformity and so on
+* Managing image sequences as whole units for media management
+* ..and getting laid (sometimes)
 
 == FEATURES:
 

data/Rakefile

@@ -1,13 +1,30 @@
 # -*- ruby -*-
 require 'rubygems'
-require 'hoe'
+require 'jeweler'
 require File.dirname(__FILE__) + "/lib/sequencer"
 
-Hoe::RUBY_FLAGS.gsub!(/^-w/, '')
-Hoe.spec 'sequencer' do | s |
-  s.readme_file   = 'README.rdoc'
-  s.extra_rdoc_files  = FileList['*.rdoc']
-  s.developer('Julik Tarkhanov', 'me@julik.nl')
+Jeweler::Tasks.new do |gem|
+  gem.version = Sequencer::VERSION
+  gem.name = "sequencer"
+  gem.summary = "Image sequence sorting, scanning and manipulation"
+  gem.email = "me@julik.nl"
+  gem.homepage = "http://guerilla-di.org/sequencer"
+  gem.authors = ["Julik Tarkhanov"]
+  gem.license = 'MIT'
+  gem.executables = %w( rseqls rseqpad rseqrename )
+  
+  # Do not package invisibles
+  gem.files.exclude ".*"
 end
 
-# vim: syntax=ruby
+Jeweler::RubygemsDotOrgTasks.new
+
+require 'rake/testtask'
+desc "Run all tests"
+Rake::TestTask.new("test") do |t|
+  t.libs << "test"
+  t.pattern = 'test/**/test_*.rb'
+  t.verbose = true
+end
+
+task :default => [ :test ]

data/bin/rseqpad

@@ -1,36 +1,22 @@
 #!/usr/bin/env ruby
 
 require File.dirname(__FILE__) + "/../lib/sequencer"
+require 'optparse'
+$pad = nil
+OptionParser.new do | op |
+  op.on(" -z", "--zeroes LENGTH", Integer, "Set the specific pad length (otherwise sequence length)"){|pad| $pad = pad }
+end.parse!
 
 d = ARGV.shift || Dir.pwd
 
 renames = []
 Sequencer.entries(d).each do | e |
   next if e.length < 2
-  
-  padz = e.length.to_s.length
-  
-  puts "Repadding sequence #{e} with #{padz} zeroes"
-  
-  e.each do | f |
-    rep_name = f.gsub(/([\.\-\_]?)(\d+)\.(\w+)$/) do
-      ".%0#{padz}d.%s" % [$2.to_i, $3]
-    end
-    # Now this is a replaced name
-    from_to =  [File.join(e.directory, f), File.join(e.directory, rep_name)]
-    renames.push(from_to)
-  end
+  r = Sequencer::Padder.new(e, $pad)
+  renames += r.get_renames
 end
 
-# Check for dupes
-destinations = renames.map{|e| e[1] }
-
-if (destinations.uniq.length != destinations.length)
-  twice = destinations.length - destinations.uniq.length
-  $stderr.puts "Cannot rename - #{twice} files will overwrite each other or files will be renamed twice"
-  twice.each {|e| $stderr.puts e }
-  exit -1
-end
+Sequencer::Padder.check_renames_for_dupes(renames)
 
 # And do the job
 renames.each do | from, to |

data/lib/sequencer.rb

@@ -1,5 +1,5 @@
 module Sequencer
-  VERSION = '1.0.5'
+  VERSION = '1.1.0'
   NUMBERS_AT_END = /(\d+)([^\d]+)?$/
   
   extend self
@@ -82,7 +82,7 @@ module Sequencer
   public
   
   class Sequence
-    include Enumerable
+    include Enumerable, Comparable
     attr_reader :pattern
     attr_reader :directory
     
@@ -217,6 +217,18 @@ module Sequencer
         map.merge(filename => (with_pattern % frame_no))
       end
       
+      destination = into_directory || directory
+      
+      # Ensure it's there
+      if (!File.exist?(destination))
+        raise "The destination #{destination} does not exist"
+      end
+      
+      # Ensure it's a dir
+      if (!File.directory?(destination))
+        raise "The destination #{destination} is not a directory"
+      end
+      
       # Ensure we will not produce dupes
       if (rename_map.values.uniq.length != rename_map.length)
         raise "This would would produce non-unique files"
@@ -226,12 +238,10 @@ module Sequencer
         raise "This would overwrite old files with the renamed ones (#{error[0..1]}.join(',')..)"
       end
       
-      if (error = (Dir.entries(@directory) & rename_map.values)).any?
+      if (error = (Dir.entries(destination) & rename_map.values)).any?
         raise "Files that will be created by the rename are already in place (#{error[0..1]}.join(',')..)"
       end
       
-      destination = into_directory || directory
-      
       rename_map.each_pair do | from_path, to_path |
         src, dest = File.join(directory, from_path), File.join(destination, to_path)
         File.rename(src, dest)
@@ -241,6 +251,10 @@ module Sequencer
       self.class.new(destination, rename_map.values)
     end
     
+    def <=>(another)
+      to_a <=> another.to_a
+    end
+    
     private
     
     def natural_sort(ar)
@@ -263,7 +277,7 @@ module Sequencer
           ["%0#{$1.length}d", $2].join
         end
       
-        # Look at the first file in the sequence. If it has a lesser number of 
+        # Look at the first file in the sequence. 
         lowest_padding = @filenames[0].scan(NUMBERS_AT_END).flatten.shift.length
         if lowest_padding < highest_padding # Natural numbering
           @pattern = @filenames[0].gsub(NUMBERS_AT_END) do
@@ -297,3 +311,5 @@ module Sequencer
   end
   
 end
+
+require File.dirname(__FILE__) + "/sequencer/padder"

data/lib/sequencer/padder.rb

@@ -0,0 +1,29 @@
+class Sequencer::Padder
+  def initialize(with_sequence, pad_length = nil)
+    @sequence = with_sequence
+    @padz = (pad_length || e.length.to_s.length).to_i
+  end
+  
+  # Return an array of tuples containing /source/file/path and /destination/file/path
+  # renames
+  def get_renames
+    @sequence.inject([]) do | renames, f |
+      rep_name = f.gsub(/([\.\-\_]?)(\d+)\.(\w+)$/) do
+        ".%0#{@padz}d.%s" % [$2.to_i, $3]
+      end
+      # Now this is a replaced name
+      from_to =  [File.join(e.directory, f), File.join(e.directory, rep_name)]
+      renames.push(from_to)
+    end
+  end
+  
+  def self.check_renames_for_dupes(renames)
+    # Check for dupes
+    destinations = renames.map{|e| e[1] }
+    
+    if (destinations.uniq.length != destinations.length)
+      twice = destinations - destinations.uniq
+      raise "Cannot rename - #{twice.join(', ')} will overwrite each other through mangled renames"
+    end
+  end
+end

data/sequencer.gemspec

@@ -0,0 +1,52 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "sequencer"
+  s.version = "1.1.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Julik Tarkhanov"]
+  s.date = "2012-03-31"
+  s.email = "me@julik.nl"
+  s.executables = ["rseqls", "rseqpad", "rseqrename"]
+  s.extra_rdoc_files = [
+    "README.rdoc"
+  ]
+  s.files = [
+    "Gemfile",
+    "History.txt",
+    "README.rdoc",
+    "Rakefile",
+    "bin/rseqls",
+    "bin/rseqpad",
+    "bin/rseqrename",
+    "lib/sequencer.rb",
+    "lib/sequencer/padder.rb",
+    "sequencer.gemspec",
+    "test/test_sequencer.rb"
+  ]
+  s.homepage = "http://guerilla-di.org/sequencer"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.15"
+  s.summary = "Image sequence sorting, scanning and manipulation"
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<rake>, [">= 0"])
+    else
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<rake>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<rake>, [">= 0"])
+  end
+end
+

data/test/test_sequencer.rb

@@ -180,6 +180,12 @@ class A_Sequence_created_from_pad_numbered_files_should < Test::Unit::TestCase
     assert !@with_gaps.include?("bogus.123.tif")
   end
   
+  def test_equals_another
+    assert_not_nil @with_gaps
+    another = Sequencer.from_single_file(TEST_DIR + "/sequence_and_sole_file/broken_seq.000245.tif")
+    assert_equal @with_gaps, another
+  end
+  
   def test_return_subsequences_without_gaps
     subseqs = @with_gaps.to_sequences
     assert_kind_of Sequencer::Sequence, subseqs[0]

metadata

@@ -1,82 +1,85 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sequencer
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.1.0
   prerelease: 
-  version: 1.0.5
 platform: ruby
-authors: 
+authors:
 - Julik Tarkhanov
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-07 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
+date: 2012-03-31 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: &8997550 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: *8997550
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &8995670 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2.10"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-description: Simplifies working with image sequences
-email: 
-- me@julik.nl
-executables: 
+  prerelease: false
+  version_requirements: *8995670
+description: 
+email: me@julik.nl
+executables:
 - rseqls
 - rseqpad
 - rseqrename
 extensions: []
-
-extra_rdoc_files: 
-- History.txt
-- Manifest.txt
+extra_rdoc_files:
 - README.rdoc
-files: 
-- .autotest
+files:
+- Gemfile
 - History.txt
-- Manifest.txt
 - README.rdoc
 - Rakefile
 - bin/rseqls
 - bin/rseqpad
 - bin/rseqrename
 - lib/sequencer.rb
+- lib/sequencer/padder.rb
+- sequencer.gemspec
 - test/test_sequencer.rb
-- .gemtest
-has_rdoc: true
 homepage: http://guerilla-di.org/sequencer
-licenses: []
-
+licenses:
+- MIT
 post_install_message: 
-rdoc_options: 
-- --main
-- README.rdoc
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: 65822483
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: sequencer
-rubygems_version: 1.6.2
+rubyforge_project: 
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
-summary: Simplifies working with image sequences
-test_files: 
-- test/test_sequencer.rb
+summary: Image sequence sorting, scanning and manipulation
+test_files: []

data/.autotest

@@ -1,23 +0,0 @@
-# -*- ruby -*-
-
-require 'autotest/restart'
-
-# Autotest.add_hook :initialize do |at|
-#   at.extra_files << "../some/external/dependency.rb"
-#
-#   at.libs << ":../some/external"
-#
-#   at.add_exception 'vendor'
-#
-#   at.add_mapping(/dependency.rb/) do |f, _|
-#     at.files_matching(/test_.*rb$/)
-#   end
-#
-#   %w(TestA TestB).each do |klass|
-#     at.extra_class_map[klass] = "test/test_misc.rb"
-#   end
-# end
-
-# Autotest.add_hook :run_command do |at|
-#   system "rake build"
-# end

data/Manifest.txt

@@ -1,10 +0,0 @@
-.autotest
-History.txt
-Manifest.txt
-README.rdoc
-Rakefile
-bin/rseqls
-bin/rseqpad
-bin/rseqrename
-lib/sequencer.rb
-test/test_sequencer.rb