klear 0.1.4 → 0.1.5

data/README.md

@@ -29,7 +29,8 @@ Format is ZIP so a .kle file is just a zip-file containing files and folders.
 **Directory Layout**
 
 + *DIR* 'META-INF' (mandatory)
-    + 'kle.yml', YAML file containing meta-data describing aspects like framerate & more
+    + 'kle.yml', YAML file containing meta-data describing aspects like
+      framerate & more
     + 'MANIFEST.MF' containing meta-data about the klear file itself (e.g.
       format version)
 + *DIR* 'frames' (mandatory)
@@ -44,11 +45,17 @@ Format is ZIP so a .kle file is just a zip-file containing files and folders.
 
 ### Workflow
 
-The initial source of a kle is a sequence of PNGs + metadata. Those are used to generate a .kle file incl. the file 'frames.bin'. The metadata is stored in 'META-INF/kle.yml' and describes aspects like fps.
+The initial source of a kle is a sequence of PNGs + metadata. Those are used
+to generate a .kle file incl. the file 'frames.bin'. The metadata is stored in
+'META-INF/kle.yml' and describes aspects like fps.
 
-If a kle file does not have frame.bin in its cache directory it can be regenerated. This is also useful for future format changes together with the manifest to detect if a frames.bin is deprecated and needs to be regenerated.
+If a kle file does not have frame.bin in its cache directory it can be
+regenerated. This is also useful for future format changes together with the
+manifest to detect if a frames.bin is deprecated and needs to be regenerated.
 
-The source sequence of PNGs is stored in the KLE-file as well, which allows features like frames.bin regeneration in the first place.
+The source sequence of PNGs is stored in the KLE-file as well. Having the source
+PNGs included with the archives allows for resampling of `frames.bin` and other
+manipulations later on.
 
 ## Command Line Usage
 
@@ -62,52 +69,74 @@ dumps archive content info to stdout.
 
 *Notice: file generation depends on jruby because of its usage of Java JAI*
 
-Klear files are zipped directory structures which are generated from a set of images. The pixel values directly map to motor position and light intensity. On top of that, the klear file contains some additional meta info and cache date to speed up its loading at runtime. Generating a klear file from a images sequence in a directory goes like:
+Klear files are zipped directory structures which are generated from a set of
+images. The pixel values directly map to motor position and light intensity.
+On top of that, the klear file contains some additional meta info and cache
+date to speed up its loading at runtime. Generating a klear file from a images
+sequence in a directory goes like:
 
     $ rvm jruby exec ./bin/klear.rb generate image_sequence_dir outfile.kle
     
-and of course, more documentation needs to come (means must be converted from the internal wiki to here).
-
+and of course, more documentation needs to come.
 
 ## File Format Details
 
 ### PNGs
 
-Each single PNG represents exactly one frame and is stored with 16-bit / channel. The size of the PNGs is determined by the number of columns and rows, where each tile is 10px x 10px in size. A Column represents the state of a blade at a frame (a certain point in time). The number of columns represents the number of blades. A Row represents one aspect across all blades, e.g. an outermost light or the state of the motor.
+Each single PNG represents exactly one frame and is stored with 16-bit /
+channel. The size of the PNGs is determined by the number of columns and rows,
+where each tile is 10px x 10px in size. A Column represents the state of a
+blade at a frame (a certain point in time). The number of columns represents
+the number of blades. A Row represents one aspect across all blades, e.g. an
+outermost light or the state of the motor.
 
-*Example*
+**Example**
 
-!Waves_00129.png!
+![Waves_00129.png](spec/fixtures/kle_generate/Waves/Waves_00129.png)
 
 * We have 11 rows and 14 columns (blades)
-* The lowest row describes the motor state
-* The other rows describe the state of the lights from one direction to the other (TODO:
-  Define the direction - what is a point of reference?)
-* The Png then is 140x110px in size.
+* (as a convention) buttom row describes the motor state
+* Other rows describe the state of the lights from one direction to the
+  other (TODO: Define the direction - what is a point of reference?)
+* The PNG is 140px by 110px in size.
 
 ### Sequence of PNGs
 
-The order of the sequence is defined by the sorting delivered by the Posix command `sort -n`. So any natural alphabetical naming to order the sequence is allowed.
-
-The number of columns and rows must be the same for all PNGs.
+The order of the sequence is determined by the **intuitiv** numerial order of the file names. This is done by extracting digits from the filenames and than sort them numerial. This is different than the directory listing order in some cases where the frame number is embedded in the filename or is not padded with a leading zero. When no frame numbe is present in the filenames the sorting is in normal alphabetical order.
 
 *Examples*
 
 * `A.png, B.png, X.png` is valid sequence of 3 PNGs
-* `Test_0001.png, Test_0002.png, Test__1000.png` is a valid sequence
+* `Test_0001.png, Test_0002.png, Test_1000.png` is a valid sequence
+
+A sequence does not need to be consecutive (it can have gaps e.g.
+`01.png,10.png` is valid and the existence of e.g. 05.png is not enforced).
 
-A sequence does not need to be consecutive (it can have gaps e.g. `01.png,10.png` is valid and the existence of e.g. 05.png is not enforced).
+*Sequence Order:* 
+
+      ls -1 (shell order) | intuitive Animation Order
+    ----------------------+-------------------------------------
+      frame_1.png         | frame_1.png      
+      frame_10.png        | frame_2.png     
+      frame_100.png       | frame_10.png    
+      frame_12.png        | frame_12.png     
+      frame_2.png         | frame_100.png      
+
+The number of columns and rows must be the same for all PNGs.
 
 ### kle.yml
 
-Contains information about how to use the frames:
+Contains information fields about how to use the frames:
 
  * Number of columns and rows (geometry)
  * Frames per second
  * recommended gamma value
- * Potentially a free descriptor (name)
+ * pixel scale for the input PNGs
+ * descriptor (optional)
 
-The geometry is determined automatically by reading the first png in the png sequence and dividing width and height by 10 respectively. This relies on one tile in the png being 10x10px in size.
+The geometry is determined automatically by reading the first png in the png
+sequence and dividing width and height by 10 respectively. This relies on one
+tile in the png being 10x10px in size.
 
 *Example:*
 <pre>
@@ -119,6 +148,18 @@ The geometry is determined automatically by reading the first png in the png seq
  fps: 25
 </pre>
 
+## Klear file version 1.1 format update
+
+*Kle-Version: 1.1*
+<pre>
+ pixel_scale:
+ - 30
+ - 30
+</pre>
+
+In version 1.1 the pixel_scale attribute is added which was fixed to 10px pixel before. The pixel scale defines the amout of pixels per axis, default value is 10px. This means a 10x10 pixel square in the input PNG stands for one axis. For easier visibility now pixel scale can be manually overwridden. For installations with few axises, for example 10 by 2, it might be reasonable to define pixel scale as 30. This would result in a PNG size of  300 by 60 pixel, which is much easier to review on the computer screen than a 10 by 2 pixel image.  
+
+
 ### MANIFEST.MF
 
 The manifest contains meta information about the file and file format itself:
@@ -132,15 +173,18 @@ The manifest contains meta information about the file and file format itself:
 <pre>
 Manifest-Version: 1.0
 
-Kle-Version: 1.0
-Created-By: ruby-kle-generator 0.344b
+Kle-Version: 1.1
+Created-By: bin/klear (0.1.5)
 </pre>
 
 ### frames.bin
 
-The frames.bin binary file contains the extracted 16-bit values sampled from each tile of the PNGs. It contains all frames and each frame contains all columns and rows.
+The frames.bin binary file contains the extracted 16-bit values sampled from
+each tile of the PNGs. It contains all frames and each frame contains all
+columns and rows.
 
-Each 16-bit value is saved as unsigned 16 bit integer big endian (network byte order) and uses 2 bytes in frames.bin.
+Each 16-bit value is saved as unsigned 16 bit integer big endian (network byte
+order) and uses 2 bytes in frames.bin.
 
 A PNG with 11 rows and 14 columns uses `14 x 11 x 2 bytes = 308 bytes`.
 
@@ -166,4 +210,4 @@ which results in a binary big endian (network) byte order sequence like:
 
     0xBA1D 0xAFEF 0xA381    0xC753 0xC821 0xC27D    0x6981 0x97E5 0xB8E3
 
-As a note: row 1 is the motor state.
+*(note: row 1 is the motor state by convention)*

data/bin/klear

@@ -8,22 +8,25 @@ $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'klear'
 
 def usage
-  puts <<HELP
+  puts <<-HELP
 klear usage (version: #{Klear::VERSION} - #{Klear::DATE})
 
   klear --help
     * this help
-  klear [OPTIONS] generate <path_to_png_folder> <kle-file>
-    * Generates kle file from png_folder
-  klear [OPTIONS] regenerate <kle-file>
-    * Regenerates kle file's cache
-  klear info <kle-file>
-    * Produces report on a kle file.
+
+  klear [OPTIONS] generate <path to PNG files folder> <klear-file>
+    * Generates klear file from png_folder
+
+  klear [OPTIONS] regenerate <klear-file>
+    * Regenerates klear file's cache
+
+  klear info <klear-file>
+    * Produces report on a klear file.
 
   OPTIONS
-    -- silent:[true/false] - default false
-HELP
-#'
+    --silent:[true/false]  : default false
+    --overwrite            : force overwriting of existing files
+  HELP
 
   exit
 end
@@ -37,11 +40,12 @@ Defaults = {
 Applix.main(ARGV, Defaults) do
   prolog do |_, opts|
     opts[:help] and usage
+    $silent = opts[:silent]
     @app = Klear::FileGenerator.new(opts)
   end
   
   handle(:generate) do |*args, opts|
-    (1 < args.size) or usage
+    (2 <= args.size) or usage
     @app.generate(*args)
   end
   

data/lib/klear.rb

@@ -8,3 +8,4 @@ require 'klear/file'
 require 'klear/filters'
 require 'klear/choreography'
 require 'klear/file_generator'
+require 'klear/animation_order'

data/lib/klear/animation_order.rb

@@ -0,0 +1,26 @@
+module Klear::AnimationOrder
+
+  def glob pattern, &blk
+    filenames = sort(Dir.glob(pattern))
+    blk.nil? or filenames.each {|fname| blk.call(fname)}
+    filenames
+  end
+
+  def sort(filenames)
+    filenames.sort do |a, b| 
+      begin
+        frame_number_from_string(a) <=> frame_number_from_string(b)
+      rescue ArgumentError => e
+        a <=> b
+      end
+    end
+  end
+
+  def frame_number_from_string(filename)
+    Integer(filename.tr('^0-9', '').sub(/^0+(\d)/, '\1'))
+  rescue ArgumentError => e
+    raise e, "no frame number in filename: '#{filename}' - #{e}"
+  end
+
+  extend(self)
+end

data/lib/klear/file_generator.rb

@@ -1,31 +1,26 @@
-# TODO maybe use Zip::ZipOutputStream for generating the zip first in-memory?
-# TODO extract java/jruby specific stuff
-
 class Klear::FileGenerator
   
   Defaults = {
     overwrite: false, 
+    fps: 25,
+    gamma: 1.0,
+    pixel_scale: [10, 10],
   }
 
   def initialize options = {}
     @options = Defaults.merge(options)
+    @fps = @options[:fps]
+    @gamma = @options[:gamma]
+
+    @raw_frame_values = []
     @png_path = nil
     @kle_path = nil
-    @fps = 25
-    if @options.has_key? :fps
-      @fps = @options[:fps]
-    end
-    @gamma = 1.0
-    if @options.has_key? :gamma
-      @gamma = @options[:gamma]
-    end
     @geometry = nil
-    @raw_frame_values = []
     @kle_file = nil
-    @silent = true
-    if @options.has_key? :silent
-      @silent = !!@options[:silent]
-    end
+  end
+
+  def pixel_scale
+    @options[:pixel_scale]
   end
 
   def overwrite?
@@ -33,33 +28,33 @@ class Klear::FileGenerator
   end
   
   def load
-    Zip::ZipFile.open(@kle_path) { |kle|
-      @kle_file = kle
-    }
+    Zip::ZipFile.open(@kle_path) {|kle| @kle_file = kle}
   end
   
-  def write
-    Zip::ZipFile.open(@kle_path, Zip::ZipFile::CREATE) do |kle|
-      @kle_file = kle
-      add_pngs
-      regenerate_cache
+  def write(path)
+    # TODO:  maybe use Zip::ZipOutputStream to generate zip file in-memory?
+    Zip::ZipFile.open(path, Zip::ZipFile::CREATE) do |klear|
+      @kle_file = klear
+      add_pngs(@kle_file)
+      recache
       
       # Meta
-      kle.mkdir('META-INF')
-      kle.file.open("META-INF/MANIFEST.MF", "w") do |fd|
+      klear.mkdir('META-INF')
+      klear.file.open("META-INF/MANIFEST.MF", "w") do |fd|
         fd.write <<-MANIFEST
 Manifest-Version: 1.0
 
-Kle-Version: 1.0
+Kle-Version: 1.1
 Created-By: #{__FILE__} (#{Klear::VERSION})
 Generated-At: #{Time.now}
 
         MANIFEST
       end
 
-      kle.file.open("META-INF/kle.yml", "w") do |fd|
+      klear.file.open("META-INF/kle.yml", "w") do |fd|
         fd.write({
           "geometry"    => @geometry,
+          "pixel_scale" => pixel_scale,
           "gamma"       => @gamma,
           "fps"         => @fps
         }.to_yaml)
@@ -77,7 +72,7 @@ Generated-At: #{Time.now}
         raise "'#{@kle_path}' :: already exists! (use --overwrite to force it)"
       end
     end
-    write
+    write(@kle_path)
     report
   end
   
@@ -94,79 +89,100 @@ Output KleFile : '#{@kle_path}'
     * geometry : #{@geometry}
 
     REPORT
-    puts report if !@silent
+    puts report if !$silent
   end
   
   def regenerate theKleFile
     @kle_path = theKleFile
     load
-    regenerate_cache
+    recache
   end
   
   private
   
-  def add_pngs
-    @kle_file.mkdir('frames')
-    Dir.glob("#{@png_path}/*.png") do |file|
-      puts " * adding png file '#{file}' to '#{@kle_path}'" if !@silent
-      @kle_file.add("frames/#{File.basename(file)}", file)
+  def add_pngs(klear)
+    klear.mkdir('frames')
+    Klear::AnimationOrder.glob("#{@png_path}/*.png") do |file|
+      puts " * adding png file '#{file}' to '#{@kle_path}'" if !$silent
+      klear.add("frames/#{File.basename(file)}", file)
     end
   end
   
-  def regenerate_cache
-    puts "regenerating cache..." if !@silent
+  def recache
+    puts "regenerating cache..." if !$silent
     if @kle_file.dir.entries("/").include?("cache")
       @kle_file.dir.rmdir('cache')
     end
     @kle_file.dir.mkdir('cache')
     if @raw_frame_values.empty?
-      analyze_images
+      @raw_frame_values = analyze_images(@kle_file)
     end
-    @kle_file.file.open("cache/frames.bin", "wb") { |os|
+    @kle_file.file.open("cache/frames.bin", "wb") do |os|
       arr = BinData::Array.new(:type => :uint16be)
       arr.assign @raw_frame_values
       arr.write(os)
-    }
+    end
     @kle_file.commit
   end
   
+# TODO: extract java/jruby specific stuff
 if RUBY_PLATFORM.match /java/i
   include Java
   import 'javax.media.jai.JAI'
   import 'com.sun.media.jai.codec.ByteArraySeekableStream'
 
-  def analyze_images
-    @kle_file.dir.entries("/frames").each { |png|
-      puts "analyzing image file '#{png}'" if !@silent
-      seekable = ByteArraySeekableStream.new(@kle_file.file.read("/frames/#{png}").to_java_bytes)
-      image = JAI.create("stream", seekable)
-      @raw_frame_values = @raw_frame_values + analyze_image(image)
-    }
+  def analyze_images(klear)
+    bytes = []
+    klear.dir.entries("/frames").each do |png|
+      puts "analyzing image file '#{png}'" if !$silent
+      image = load_image(klear.file.read("/frames/#{png}"))
+      bytes.concat(analyze_image(image, pixel_scale))
+    end
+    bytes
   end
 
-  def analyze_image image
-    if !@geometry
-      @geometry = { :columns => image.width  / 10,
-                    :rows    => image.height / 10 }
-      puts "Determined geometry: #{@geometry.inspect}" if !@silent
-    end
+  def load_image(ruby_bytes)
+      istream = ByteArraySeekableStream.new(ruby_bytes.to_java_bytes)
+      image = JAI.create("stream", istream)
+
+      if @geometry.nil? # first loaded image defines the geometry
+        xs, ys = *pixel_scale
+        @geometry = {columns: image.width / xs, rows: image.height / ys}
+        puts "Determined geometry: #{@geometry.inspect}" if !$silent
+
+        if(image.width.modulo(xs) != 0) or (image.height.modulo(ys) != 0) 
+          raise "image size / pixel scale mismatch: #{@geometry} - #{p@ixel_scale}"
+        end
+      end
+
+      image
+  end
+
+  def analyze_image(image, pixel_scale)
+    #@geometry ||= (
+    #  puts "Determined geometry: #{@geometry.inspect}" if !$silent
+    #  {columns: image.width  / 10, rows: image.height / 10}
+    #)
+
+    xs, ys = *pixel_scale
+    xc, yc = image.width / xs, image.height / ys
 
     raster = image.getData
     bytes = []
-    (0...@geometry[:rows]).to_a.reverse!.each { |row|
-      (0...@geometry[:columns]).each { |col|
-        myPixelY = 5 + 10 * (row)
-        myPixelX = 5 + 10 * (col)
-        myPickedValue = raster.getPixel(myPixelX, myPixelY, nil)[0].to_i
-        #puts "value at (col #{col}, #{@geometry[:rows] - row - 1}) - pixel-coords: (#{myPixelX}, #{myPixelY}) => #{myPickedValue}"
-        bytes << myPickedValue
-      }
-    }
+    (0...yc).to_a.reverse!.each do |row|
+      (0...xc).each do |col|
+        yi = (row + 0.5) * ys    # 5 + 10 * (row)
+        xi = (col + 0.5) * xs # 5 + 10 * (col)
+        val = raster.getPixel(xi, yi, nil)[0].to_i
+        #puts "value at (col #{col}, #{@geometry[:rows] - row - 1}) - pixel-coords: (#{xi}, #{yi}) => #{val}"
+        bytes << val
+      end
+    end
     bytes
   end
 
 else # NOT JAVA!
-  def analyze_images
+  def analyze_images(*_)
     raise "use JRUBY to run this script with #analyse_images support"
   end
 end

data/lib/klear/version.rb

@@ -1,4 +1,4 @@
 module Klear
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
   DATE    = '2013-11-12'
 end

data/spec/lib/klear/animation_order_spec.rb

@@ -0,0 +1,68 @@
+require 'spec_helper'
+
+describe Klear::AnimationOrder do
+  let(:ao) { subject }
+
+  it 'globs animation from directory' do
+    ao_dir = "#{RSpec.configuration.fixtures}/animation_order"
+    expect(ao.glob("#{ao_dir}/frame_*.png")).to eq(%W(
+      #{ao_dir}/frame_1.png
+      #{ao_dir}/frame_2.png
+      #{ao_dir}/frame_10.png
+      #{ao_dir}/frame_12.png
+      #{ao_dir}/frame_100.png
+    ))
+  end
+
+  it 'globs files without frame number' do
+    ao_dir = "#{RSpec.configuration.fixtures}/animation_order"
+    expect(ao.glob("#{ao_dir}/?.png")).to eq(%W(
+      #{ao_dir}/a.png
+      #{ao_dir}/b.png
+      #{ao_dir}/x.png
+    ))
+  end
+
+  it 'raises exception on non numbered frames' do
+    expect{ao.frame_number_from_string('a.png')}.to raise_error(
+      /no frame number in filename: 'a.png'/
+    )
+  end
+
+  it 'extracts leading number' do
+    expect(ao.frame_number_from_string('23_a.png')).to eq(23)
+  end
+
+  it 'extracts trailing number' do
+    expect(ao.frame_number_from_string('tmp/frames/frame_0.png')).to eq(0)
+  end
+
+  it 'extracts zero padded leading number' do
+    expect(ao.frame_number_from_string('0023_a.png')).to eq(23)
+  end
+
+  it 'extracts zero padded trailing number' do
+    expect(ao.frame_number_from_string('a_0023.png')).to eq(23)
+  end
+
+  it 'is no confused by trailing zeros' do
+    expect(ao.frame_number_from_string('1000')).to eq(1000)
+  end
+
+
+  it 'sorts plain numbers' do 
+    expect(ao.sort(%w(1 2 3 4))).to eq(%w(1 2 3 4))
+  end
+
+  it 'handles zero padded numbers' do 
+    expect(ao.sort(%w(03 02 01 04))).to eq(%w(01 02 03 04))
+  end
+
+  it 'sorts numerical' do 
+    expect(ao.sort(%w(100 1 2 10))).to eq(%w(1 2 10 100))
+  end
+
+  it 'sorts numerical when number is in string' do 
+    expect(ao.sort(%w(f1 f100 f2 f20))).to eq(%w(f1 f2 f20 f100))
+  end
+end

data/spec/lib/klear/file_generator_spec.rb

@@ -3,15 +3,15 @@ require 'tmpdir'
 require 'fileutils'
 
 describe Klear::FileGenerator do
-  if RUBY_PLATFORM.match /java/i
-
+  unless RUBY_PLATFORM.match /java/i
+    pending 'porting tests from jruby'
+  else
     context 'default options' do
       let(:fg) { Klear::FileGenerator.new }
       it 'defaults to not overwrite' do 
         expect(fg.overwrite?).to be(false)
       end
     end
-
   
     it "reads a directory with pngs and produces a valid kle file" do
       fg = Klear::FileGenerator.new :fps => 33, :gamma => 2.4
@@ -85,5 +85,4 @@ describe Klear::FileGenerator do
       FileUtils.rmtree tmpDir
     end
   end # JAVA
-
 end

metadata

@@ -1,130 +1,148 @@
 --- !ruby/object:Gem::Specification
 name: klear
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
+  prerelease:
 platform: ruby
 authors:
 - art+com/dirk luesebrink
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2013-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: applix
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+    none: false
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: rubyzip
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubyzip
+    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+    none: false
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: bindata
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bindata
+    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+    none: false
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
+    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+    none: false
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: guard
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard
+    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+    none: false
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
+    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+    none: false
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.1
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
-  name: debugger
-  requirement: !ruby/object:Gem::Requirement
+  name: ruby-debug
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: " \n    create and manage choreographies for motors and lights on the
-  Manta Rhei.\n    klear is the kinetic-light-engine archive format and is used by
-  the\n    kinetic-light-engine runtime to drive the Manta Rhei installation.\n  "
+    none: false
+  prerelease: false
+  type: :development
+description: " \n    create and manage choreographies for motors and lights on the\
+  \ Manta Rhei.\n    klear is the kinetic-light-engine archive format and is used\
+  \ by the\n    kinetic-light-engine runtime to drive the Manta Rhei installation.\n\
+  \  "
 email:
 - dirk.luesebrink@artcom.de
 executables:
@@ -140,6 +158,7 @@ files:
 - bin/klear
 - klear.gemspec
 - lib/klear.rb
+- lib/klear/animation_order.rb
 - lib/klear/choreography.rb
 - lib/klear/file.rb
 - lib/klear/file_generator.rb
@@ -148,6 +167,14 @@ files:
 - lib/klear/frames.rb
 - lib/klear/motors.rb
 - lib/klear/version.rb
+- spec/fixtures/animation_order/a.png
+- spec/fixtures/animation_order/b.png
+- spec/fixtures/animation_order/frame_1.png
+- spec/fixtures/animation_order/frame_10.png
+- spec/fixtures/animation_order/frame_100.png
+- spec/fixtures/animation_order/frame_12.png
+- spec/fixtures/animation_order/frame_2.png
+- spec/fixtures/animation_order/x.png
 - spec/fixtures/black_to_white_linear.kle
 - spec/fixtures/kle_generate/Waves/Waves_00129.png
 - spec/fixtures/kle_generate/Waves/Waves_00130.png
@@ -419,6 +446,7 @@ files:
 - spec/fixtures/test.kle
 - spec/fixtures/test_without_gamma_and_fps.kle
 - spec/fixtures/wave.kle
+- spec/lib/klear/animation_order_spec.rb
 - spec/lib/klear/choreography_spec.rb
 - spec/lib/klear/file_generator_spec.rb
 - spec/lib/klear/file_spec.rb
@@ -430,8 +458,7 @@ files:
 - spec/spec_helper.rb
 homepage: http://www.artcom.de/en/projects/project/detail/manta-rhei/
 licenses: []
-metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -440,18 +467,28 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
+  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
+  none: false
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.6
-signing_key: 
-specification_version: 4
+rubyforge_project:
+rubygems_version: 1.8.24
+signing_key:
+specification_version: 3
 summary: create and manage choreographies for motors and lights on the Manta Rhei
 test_files:
+- spec/fixtures/animation_order/a.png
+- spec/fixtures/animation_order/b.png
+- spec/fixtures/animation_order/frame_1.png
+- spec/fixtures/animation_order/frame_10.png
+- spec/fixtures/animation_order/frame_100.png
+- spec/fixtures/animation_order/frame_12.png
+- spec/fixtures/animation_order/frame_2.png
+- spec/fixtures/animation_order/x.png
 - spec/fixtures/black_to_white_linear.kle
 - spec/fixtures/kle_generate/Waves/Waves_00129.png
 - spec/fixtures/kle_generate/Waves/Waves_00130.png
@@ -723,6 +760,7 @@ test_files:
 - spec/fixtures/test.kle
 - spec/fixtures/test_without_gamma_and_fps.kle
 - spec/fixtures/wave.kle
+- spec/lib/klear/animation_order_spec.rb
 - spec/lib/klear/choreography_spec.rb
 - spec/lib/klear/file_generator_spec.rb
 - spec/lib/klear/file_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 2ce4d5cdafe23e6dff8a591fbb74ab16316acff8
-  data.tar.gz: db86b996953818cadb54ae3217a6d911b097d83a
-SHA512:
-  metadata.gz: 996c00baae0b8081d085affe62d9d0b07e460148d01698fec8365e0e5be65d8e4699947cfbe7c2018c8cea23a6f3217b8732444db9cf5ffa6598e9cd801a4c66
-  data.tar.gz: 44b5b2ad67c6db67bc7fdf9590064a9f3e506a9612c15c0711b0ee15a4fbdaf62148104b85bde55f1d2d35eb534acda1ea259d87a635d8bb46dc54f5af8c80e5