aviglitch 0.0.3 → 0.1.0

data/ChangeLog

@@ -1,9 +1,14 @@
+== 0.1.0 / 2010-07-09
+
+* Minor version up.
+* Fixed bugs with Ruby 1.8.7.
+* Fixed the synchronization problem with datamosh cli.
+
 == 0.0.3 / 2010-07-07
 
 * Changed AviGlitch::Frames allowing to slice and concatenate frames
 (like Array).
 * Changed datamosh cli to accept multiple files.
-* And some tiny fixes.
 
 == 0.0.2 / 2010-05-17
 

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.1.0

data/bin/datamosh

@@ -10,7 +10,7 @@ all = false
 
 opts = OptionParser.new do |opts|
   opts.banner = "datamosh - AviGlitch's datamoshing video generator."
-  opts.define_head "Usage: #{File.basename($0)} <input> [options]"
+  opts.define_head "Usage: #{File.basename($0)} [options] file [file2 ...]"
   opts.separator "Options:"
   opts.on("-o", "--output [OUTPUT]", 
     "Output the video to OUTPUT (./out.avi by default)") do |f|
@@ -34,12 +34,12 @@ end
 
 a = AviGlitch.open input.shift
 a.glitch_with_index :keyframe do |frame, i|
-  (!all && i == 0) ? frame : "\000" * frame.size # keep the first frame
+  (!all && i == 0) ? frame : nil # keep the first frame
 end
 input.each do |file|
   b = AviGlitch.open file
   b.glitch :keyframe do |frame|
-    "\000" * frame.size
+    nil
   end
   a.frames.concat b.frames
 end

data/lib/aviglitch.rb

@@ -1,3 +1,8 @@
+require 'tempfile'
+require 'fileutils'
+require 'readline'
+require 'pathname'
+require 'stringio'
 require 'aviglitch/base'
 require 'aviglitch/frame'
 require 'aviglitch/frames'
@@ -29,7 +34,7 @@ require 'aviglitch/frames'
 #
 module AviGlitch
 
-  VERSION = '0.0.3'
+  VERSION = '0.1.0'
 
   class << self
     ##

data/lib/aviglitch/base.rb

@@ -1,8 +1,3 @@
-require 'tempfile'
-require 'fileutils'
-require 'readline'
-require 'pathname'
-
 module AviGlitch
   # Base is the object that provides interfaces mainly used.
   # To glitch, and save file. The instance returned through AviGlitch#open.

data/lib/aviglitch/frames.rb

@@ -1,5 +1,3 @@
-require 'stringio'
-
 module AviGlitch
 
   # Frames provides the interface to access each frame
@@ -230,7 +228,8 @@ module AviGlitch
     ##
     # Removes frame(s) at the given index or the range (same as []).
     # Inserts the given Frame or Frames's contents into the removed index.
-    def []= *args, value
+    def []= *args
+      value = args.pop
       b, l = get_beginning_and_length *args
       ll = l.nil? ? 1 : l
       head = self.slice(0, b)

data/spec/datamosh_spec.rb

@@ -6,10 +6,10 @@ describe AviGlitch, 'datamosh cli' do
     FileUtils.mkdir OUTPUT_DIR unless File.exist? OUTPUT_DIR
     @in = FILES_DIR + 'sample.avi'
     @out = OUTPUT_DIR + 'out.avi'
-    datamosh = Pathname.new(
-      File.join(File.dirname(__FILE__), '..', 'bin/datamosh')
-    ).realpath
-    @cmd = "ruby %s -o %s " % [datamosh, @out]
+    here = File.dirname(__FILE__)
+    lib = Pathname.new(File.join(here, '..', 'lib')).realpath
+    datamosh = Pathname.new(File.join(here, '..', 'bin/datamosh')).realpath
+    @cmd = "ruby -I%s %s -o %s " % [lib, datamosh, @out]
   end
 
   after :each do
@@ -21,39 +21,32 @@ describe AviGlitch, 'datamosh cli' do
   end
 
   it 'should correctly process files' do
+    a = AviGlitch.open @in
+    keys = a.frames.inject(0) do |c, f|
+      c += 1 if f.is_keyframe?
+      c
+    end
+    total = a.frames.size
+    a.close
+
     system [@cmd, @in].join(' ')
     o = AviGlitch.open @out
-    o.frames.each_with_index do |f, i|
-      if f.is_keyframe? && i == 0
-        f.data.should_not match /^\000+$/
-      elsif f.is_keyframe?
-        f.data.should match /^\000+$/
-      end
-    end
+    o.frames.size.should == total - keys + 1
+    o.frames.first.is_keyframe?.should be true
     o.close
     AviGlitch::Base.surely_formatted?(@out, true).should be true
 
     system [@cmd, '-a', @in].join(' ')
     o = AviGlitch.open @out
-    o.frames.each do |f|
-      if f.is_keyframe?
-        f.data.should match /^\000+$/
-      end
-    end
+    o.frames.size.should == total - keys
+    o.frames.first.is_keyframe?.should be false
     o.close
     AviGlitch::Base.surely_formatted?(@out, true).should be true
 
     system [@cmd, @in, @in, @in].join(' ')
-    a = AviGlitch.open @in
     o = AviGlitch.open @out
-    o.frames.size.should == a.frames.size * 3
-    o.frames.each_with_index do |f, i|
-      if f.is_keyframe? && i == 0
-        f.data.should_not match /^\000+$/
-      elsif f.is_keyframe?
-        f.data.should match /^\000+$/
-      end
-    end
+    o.frames.size.should == 1 + (total - keys) * 3
+    o.frames.first.is_keyframe?.should be true
     o.close
     AviGlitch::Base.surely_formatted?(@out, true).should be true
   end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: aviglitch
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  hash: 27
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 0
+  version: 0.1.0
 platform: ruby
 authors: 
 - ucnv
@@ -9,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-07 00:00:00 +09:00
+date: 2010-07-09 00:00:00 +09:00
 default_executable: datamosh
 dependencies: []
 
@@ -50,21 +56,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A Ruby library to destroy your AVI files.