edl 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8229f60333ce6d40281980eb5dfb8188f5283882
-  data.tar.gz: 24b0c0eb16e8563a228543213142d06104876312
+  metadata.gz: 92c9e98e3aae5318b201b581548227410c0add31
+  data.tar.gz: 775136de2ed133788783aabb995674b68bf610bf
 SHA512:
-  metadata.gz: 895259b1cf0bc020766d6dc6b075a3cb1b5853ab2775f65c385544d0113cb0b3d74a34fe2f2d4082f53d0381e1ab09368d2cb5670bae1479b61a196d72567438
-  data.tar.gz: 7bd9cfccbd517a5a1f2c5ccc9541c5552d7a529409d11cd9dc89377ea6970c9eb352b015839e7f323af8c684101e4a571d3d70ba4451031d2e8b0c765317b0b6
+  metadata.gz: 64487e6d8b2558e74ae04781a347c2ed91d1c5ad362b764b0af479628077fd70ea831e1df7d1403afabcf794aa10deb1087fa484d7e46f23e70e555b07802ba7
+  data.tar.gz: 6eb2449c27c2188dcfe11df99b4a987d78436f938fdf7795bc996e7c22dc1d7c3f6b9c42a815f07b79238ae626e8e7b9a3d77576b393c8ed17bdc7151b4835c7

data/.gitignore

@@ -0,0 +1,4 @@
+.bundle
+pkg
+.DS_Store
+Gemfile.lock

data/.rspec

@@ -0,0 +1,2 @@
+--format documentation --color
+--require spec_helper

data/.ruby-gemset

@@ -0,0 +1 @@
+edl

data/.ruby-version

@@ -0,0 +1 @@
+2.4.1

data/.travis.yml

@@ -0,0 +1,9 @@
+sudo: false
+rvm:
+  - 1.9.3
+  - 2.1.5
+  - 2.2.5
+  - 2.3.3
+  - 2.4.1
+  - jruby
+  - ruby-head

data/Gemfile

@@ -1,13 +1,6 @@
+# frozen_string_literal: true
+
 # -*- ruby -*-
 source 'https://rubygems.org'
 
-gem "timecode"
-
-group :development do
-  gem 'shoulda-context'
-  gem "test-unit", :require => "test/unit"
-  gem "jeweler"
-  gem "rake"
-  flexmock_ver = (RUBY_VERSION > "1.8") ? "~> 1.3.2" : "~> 0.8"
-  gem "flexmock", flexmock_ver, :require => %w( flexmock flexmock/test_unit )
-end
+gemspec

data/Rakefile

@@ -1,27 +1,15 @@
+# frozen_string_literal: true
+
 require 'rubygems'
-require './lib/edl.rb'
-require 'jeweler'
+require 'bundler/gem_tasks'
+require 'rake/testtask'
 
-Jeweler::Tasks.new do |gem|
-  gem.version = EDL::VERSION
-  gem.name = "edl"
-  gem.summary = "Parser for EDL (Edit Decision List) files"
-  gem.email = "me@julik.nl"
-  gem.homepage = "http://guerilla-di.org/edl"
-  gem.authors = ["Julik Tarkhanov"]
-  
-  # Do not package invisibles
-  gem.files.exclude ".*"
-end
+begin
+  require 'rspec/core/rake_task'
 
-Jeweler::RubygemsDotOrgTasks.new
+  RSpec::Core::RakeTask.new(:spec)
 
-require 'rake/testtask'
-desc "Run all tests"
-Rake::TestTask.new("test") do |t|
-  t.libs << "test"
-  t.pattern = 'test/**/test_*.rb'
-  t.verbose = true
+  task default: :spec
+rescue LoadError
+  # no rspec available
 end
-
-task :default => [ :test ]

data/edl.gemspec

@@ -1,80 +1,45 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path('../lib', __FILE__)
+
+# Maintain your gem's version:
+require 'edl/version'
 
 Gem::Specification.new do |s|
-  s.name = "edl"
-  s.version = "0.1.5"
+  s.name = 'edl'
+  s.version = EDL::VERSION
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Julik Tarkhanov"]
-  s.date = "2014-03-24"
-  s.email = "me@julik.nl"
+  s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
+  s.authors = ['Julik Tarkhanov']
+  s.date = '2014-03-24'
+  s.email = 'me@julik.nl'
   s.extra_rdoc_files = [
-    "README.rdoc"
-  ]
-  s.files = [
-    "Gemfile",
-    "History.txt",
-    "README.rdoc",
-    "Rakefile",
-    "edl.gemspec",
-    "illustr/edl-explain.ai",
-    "lib/edl.rb",
-    "lib/edl/cutter.rb",
-    "lib/edl/event.rb",
-    "lib/edl/grabber.rb",
-    "lib/edl/linebreak_magician.rb",
-    "lib/edl/parser.rb",
-    "lib/edl/timewarp.rb",
-    "lib/edl/transition.rb",
-    "test/samples/45S_SAMPLE.EDL",
-    "test/samples/FCP_REVERSE.EDL",
-    "test/samples/KEY_TRANSITION.EDL",
-    "test/samples/PLATES.EDL",
-    "test/samples/REEL_IS_CLIP.txt",
-    "test/samples/REVERSE.EDL",
-    "test/samples/SIMPLE_DISSOLVE.EDL",
-    "test/samples/SPEEDUP_AND_FADEOUT.EDL",
-    "test/samples/SPEEDUP_REVERSE_AND_FADEOUT.EDL",
-    "test/samples/SPLICEME.EDL",
-    "test/samples/TIMEWARP.EDL",
-    "test/samples/TIMEWARP_HALF.EDL",
-    "test/samples/TRAILER_EDL.edl",
-    "test/samples/edl_mixed_line_endings.edl",
-    "test/test_edl.rb"
+    'README.rdoc'
   ]
-  s.homepage = "http://guerilla-di.org/edl"
-  s.require_paths = ["lib"]
-  s.rubygems_version = "2.0.3"
-  s.summary = "Parser for EDL (Edit Decision List) files"
 
-  if s.respond_to? :specification_version then
+  s.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  s.bindir        = 'exe'
+  s.executables   = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  s.require_paths = ['lib']
+
+  s.homepage = 'http://guerilla-di.org/edl'
+  s.require_paths = ['lib']
+  s.rubygems_version = '2.0.3'
+  s.summary = 'Parser for EDL (Edit Decision List) files'
+
+  if s.respond_to? :specification_version
     s.specification_version = 4
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<timecode>, [">= 0"])
-      s.add_development_dependency(%q<shoulda-context>, [">= 0"])
-      s.add_development_dependency(%q<test-unit>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<flexmock>, ["~> 1.3.2"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0')
+      s.add_runtime_dependency 'timecode', '>= 0'
+      s.add_development_dependency 'rake', '>= 0'
+      s.add_development_dependency 'rspec', '~> 3.5'
     else
-      s.add_dependency(%q<timecode>, [">= 0"])
-      s.add_dependency(%q<shoulda-context>, [">= 0"])
-      s.add_dependency(%q<test-unit>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<flexmock>, ["~> 1.3.2"])
+      s.add_dependency 'timecode', '>= 0'
+      s.add_dependency 'rake', '>= 0'
     end
   else
-    s.add_dependency(%q<timecode>, [">= 0"])
-    s.add_dependency(%q<shoulda-context>, [">= 0"])
-    s.add_dependency(%q<test-unit>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<flexmock>, ["~> 1.3.2"])
+    s.add_dependency 'timecode', '>= 0'
+    s.add_dependency 'rake', '>= 0'
   end
 end
-

data/lib/edl.rb

@@ -1,48 +1,50 @@
-require "rubygems"
-require "timecode"
-require "stringio"
+# frozen_string_literal: true
 
-require File.dirname(__FILE__) + '/edl/event'
-require File.dirname(__FILE__) + '/edl/transition'
-require File.dirname(__FILE__) + '/edl/timewarp'
-require File.dirname(__FILE__) + '/edl/parser'
-require File.dirname(__FILE__) + '/edl/linebreak_magician'
+require 'timecode'
+require 'pp'
+require 'stringio'
+require 'edl/cutter'
+require 'edl/event'
+require 'edl/grabber'
+require 'edl/linebreak_magician'
+require 'edl/parser'
+require 'edl/timewarp'
+require 'edl/transition'
+require 'edl/version'
 
 # A simplistic EDL parser
 module EDL
-  VERSION = "0.1.5"
   DEFAULT_FPS = 25.0
-  
+
   # Represents an EDL, is returned from the parser. Traditional operation is functional style, i.e.
   #  edl.renumbered.without_transitions.without_generators
   class List < Array
-    
     def events #:nodoc:
-      STDERR.puts "EDL::List#events is deprecated and will be removed, use EDL::List as an array instead"
+      STDERR.puts 'EDL::List#events is deprecated and will be removed, use EDL::List as an array instead'
       self
     end
-    
+
     # Return the same EDL with all dissolves stripped and replaced by the clips underneath
     def without_transitions
       # Find dissolves
       cpy = []
-      each_with_index do | e, i |
+      each_with_index do |e, i|
         # A dissolve always FOLLOWS the incoming clip
         if e.ends_with_transition?
-          dissolve = self[i+1]
+          dissolve = self[i + 1]
           len = dissolve.transition.duration.to_i
-          
+
           # The dissolve contains the OUTGOING clip, we are the INCOMING. Extend the
           # incoming clip by the length of the dissolve, that's the whole mission actually
           incoming = e.copy_properties_to(e.class.new)
           incoming.src_end_tc += len
           incoming.rec_end_tc += len
-          
+
           outgoing = dissolve.copy_properties_to(Event.new)
-          
+
           # Add the A suffix to the ex-dissolve
           outgoing.num += 'A'
-          
+
           # Take care to join the two if they overlap - TODO
           cpy << incoming
           cpy << outgoing
@@ -56,27 +58,30 @@ module EDL
       # (0...cpy.length).map{|e| cpy[e].num = "%03d" % e }
       self.class.new(cpy)
     end
-    
+
     # Return the same EDL, with events renumbered starting from 001
     def renumbered
-      renumed = self.dup
+      renumed = dup
       pad = renumed.length.to_s.length
       pad = 3 if pad < 3
-      
-      (0...renumed.length).map{|e| renumed[e].num = "%0#{pad}d" % (e+1) }
+
+      (0...renumed.length).map { |e| renumed[e].num = "%0#{pad}d" % (e + 1) }
       self.class.new(renumed)
     end
-        
+
     # Return the same EDL with all timewarps expanded to native length. Clip length
     # changes have rippling effect on footage that comes after the timewarped clip
     # (so this is best used in concert with the original EDL where record TC is pristine)
     def without_timewarps
       self.class.new(
-        map do | e |
+        map do |e|
           if e.has_timewarp?
             repl = e.copy_properties_to(e.class.new)
-            from, to = e.timewarp.actual_src_start_tc, e.timewarp.actual_src_end_tc
-            repl.src_start_tc, repl.src_end_tc, repl.timewarp = from, to, nil
+            from = e.timewarp.actual_src_start_tc
+            to = e.timewarp.actual_src_end_tc
+            repl.src_start_tc = from
+            repl.src_end_tc = to
+            repl.timewarp = nil
             repl
           else
             e
@@ -84,36 +89,36 @@ module EDL
         end
       )
     end
-    
+
     # Return the same EDL without AX, BL and other GEN events (like slug, text and solids).
     # Usually used in concert with "without_transitions"
     def without_generators
-      self.class.new(self.reject{|e| e.generator? })
+      self.class.new(reject(&:generator?))
     end
-    
+
     # Return the list of clips used by this EDL at full capture length
     def capture_list
       without_generators.without_timewarps.spliced.from_zero
     end
-    
+
     # Return the same EDL with the first event starting at 00:00:00:00 and all subsequent events
     # shifted accordingly
     def from_zero
       shift_by = self[0].rec_start_tc
       self.class.new(
-        map do | original |
+        map do |original|
           e = original.dup
-          e.rec_start_tc =  (e.rec_start_tc - shift_by)
-          e.rec_end_tc =  (e.rec_end_tc - shift_by)
+          e.rec_start_tc = (e.rec_start_tc - shift_by)
+          e.rec_end_tc = (e.rec_end_tc - shift_by)
           e
         end
       )
     end
-    
+
     # Return the same EDL with neighbouring clips joined at cuts where applicable (if a clip
     # is divided in two pieces it will be spliced). Most useful in combination with without_timewarps
     def spliced
-      spliced_edl = inject([]) do | spliced, cur  |
+      spliced_edl = each_with_object([]) do |cur, spliced|
         latest = spliced[-1]
         # Append to latest if splicable
         if latest && (latest.reel == cur.reel) && (cur.src_start_tc == (latest.src_end_tc + 1))
@@ -122,140 +127,135 @@ module EDL
         else
           spliced << cur.dup
         end
-        spliced
       end
       self.class.new(spliced_edl)
     end
   end
-  
+
   #:stopdoc:
-  
+
   # A generic matcher
   class Matcher
     class ApplyError < RuntimeError
       def initialize(msg, line)
-        super("%s - offending line was %s" % [msg, line.inspect])
+        super('%s - offending line was %s' % [msg, line.inspect])
       end
     end
-    
+
     def initialize(with_regexp)
       @regexp = with_regexp
     end
-    
+
     def matches?(line)
-      !!(line =~ @regexp)
+      line =~ @regexp
     end
-    
-    def apply(stack, line)
+
+    def apply(_stack, line)
       STDERR.puts "Skipping #{line}"
     end
   end
-  
+
   # EDL clip comment matcher, a generic one
   class CommentMatcher < Matcher
     def initialize
-      super(/\*(.+)/)
+      super(/^\*(.+)/)
     end
-    
+
     def apply(stack, line)
-      raise ApplyError.new("No event to attach a comment to", line) if stack.empty?
+      raise ApplyError.new('No event to attach a comment to', line) if stack.empty?
       # TODO: we should really remove "* " prefixes from comments
-      stack[-1].comments.push("* %s" % line.scan(@regexp).flatten.pop.strip)
+      stack[-1].comments.push('* %s' % line.scan(@regexp).flatten.pop.strip)
     end
   end
-  
+
   # Fallback matcher for things like FINAL CUT PRO REEL
   class FallbackMatcher < Matcher
     def initialize
       super(/^(\w)(.+)/)
     end
-    
+
     def apply(stack, line)
-      begin
-        stack[-1].comments << line.scan(@regexp).flatten.join.strip
-      rescue NoMethodError 
-        raise ApplyError.new("Line can only be a comment but no event was on the stack", line)
-      end
+      stack[-1].comments << line.scan(@regexp).flatten.join.strip
+    rescue NoMethodError
+      raise ApplyError.new('Line can only be a comment but no event was on the stack', line)
     end
   end
 
   # Clip name matcher
   class NameMatcher < Matcher
     def initialize
-      super(/\*\s*FROM CLIP NAME:(\s+)(.+)/)
+      super(/^\*\s*FROM CLIP NAME:(\s+)(.+)/)
     end
-    
+
     def apply(stack, line)
       stack[-1].clip_name = line.scan(@regexp).flatten.pop.strip
       CommentMatcher.new.apply(stack, line)
     end
   end
-  
+
   class EffectMatcher < Matcher
     def initialize
-      super(/\*\s*EFFECT NAME:(\s+)(.+)/)
+      super(/^\*\s*EFFECT NAME:(\s+)(.+)/)
     end
-    
+
     def apply(stack, line)
       stack[-1].transition.effect = line.scan(@regexp).flatten.pop.strip
       CommentMatcher.new.apply(stack, line)
     end
   end
-  
+
   class TimewarpMatcher < Matcher
-    
     attr_reader :fps
-    
+
     def initialize(fps)
       @fps = fps
       @regexp = /M2(\s+)(\w+)(\s+)(\-?\d+\.\d+)(\s+)(\d{1,2}):(\d{1,2}):(\d{1,2}):(\d{1,2})/
     end
-    
+
     def apply(stack, line)
-      matches = line.scan(@regexp).flatten.map{|e| e.strip}.reject{|e| e.nil? || e.empty?}
-      
+      matches = line.scan(@regexp).flatten.map(&:strip).reject { |e| e.nil? || e.empty? }
+
       from_reel = matches.shift
       fps = matches.shift
-      
+
       begin
         # FIXME
         tw_start_source_tc = Parser.timecode_from_line_elements(matches, @fps)
       rescue Timecode::Error => e
-        raise ApplyError, "Invalid TC in timewarp (#{e})", line
+        raise ApplyError.new("Invalid TC in timewarp (#{e})", line)
       end
-      
-      evt_with_tw = stack.reverse.find{|e| e.src_start_tc == tw_start_source_tc && e.reel == from_reel }
-      
-      unless evt_with_tw
-        raise ApplyError, "Cannot find event marked by timewarp", line
-      else
+
+      evt_with_tw = stack.reverse.find { |e| e.src_start_tc == tw_start_source_tc && e.reel == from_reel }
+
+      if evt_with_tw
         tw = Timewarp.new
-        tw.actual_framerate, tw.clip = fps.to_f, evt_with_tw
+        tw.actual_framerate = fps.to_f
+        tw.clip = evt_with_tw
         evt_with_tw.timewarp = tw
+      else
+        raise ApplyError.new('Cannot find event marked by timewarp', line)
       end
     end
   end
-  
+
   # Drop frame goodbye
   TC = /(\d{1,2}):(\d{1,2}):(\d{1,2}):(\d{1,2})/
-  
-  class EventMatcher < Matcher
 
+  class EventMatcher < Matcher
     # 021  009      V     C        00:39:04:21 00:39:05:09 01:00:26:17 01:00:27:05
-    EVENT_PAT = /(\d+)(\s+)(\w+)(\s+)(\w+)(\s+)(\w+)(\s+)((\w+\s+)?)#{TC} #{TC} #{TC} #{TC}/
-    
+    EVENT_PAT = /(\d+)(\s+)([^\s]+)(\s+)(\w+)(\s+)(\w+)(\s+)((\w+\s+)?)#{TC} #{TC} #{TC} #{TC}/
+
     attr_reader :fps
-    
+
     def initialize(some_fps)
       super(EVENT_PAT)
       @fps = some_fps
     end
-    
+
     def apply(stack, line)
-      
       matches = line.scan(@regexp).shift
       props = {}
-      
+
       # FIrst one is the event number
       props[:num] = matches.shift
       matches.shift
@@ -271,7 +271,7 @@ module EDL
       # Then the type
       props[:transition] = matches.shift
       matches.shift
-      
+
       # Then the optional generator group - skip for now
       if props[:transition] != 'C'
         props[:duration] = matches.shift.strip
@@ -279,50 +279,49 @@ module EDL
         matches.shift
       end
       matches.shift
-      
+
       # Then the timecodes
-      [:src_start_tc, :src_end_tc, :rec_start_tc, :rec_end_tc].each do | k |
+      [:src_start_tc, :src_end_tc, :rec_start_tc, :rec_end_tc].each do |k|
         begin
           props[k] = EDL::Parser.timecode_from_line_elements(matches, @fps)
-        rescue Timecode::Error => e 
-          raise ApplyError, "Cannot parse timecode - #{e}", line
+        rescue Timecode::Error => e
+          raise ApplyError.new("Cannot parse timecode - #{e}", line)
         end
       end
-      
+
       evt = Event.new
       transition_idx = props.delete(:transition)
       evt.transition = case transition_idx
-        when 'C'
-          nil
-        when 'D'
-          d = Dissolve.new
-          d.duration = props.delete(:duration).to_i
-          d
-        when /W(\d+)/
-          w = Wipe.new
-          w.duration = props.delete(:duration).to_i
-          w.smpte_wipe_index = transition_idx.gsub(/W/, '')
-          w
-        when 'K'
-          k = Key.new
-          k.duration = props.delete(:duration).to_i
-          k
-        else
-          raise "Unknown transition type #{transition_idx}"
+                       when 'C'
+                         nil
+                       when 'D'
+                         d = Dissolve.new
+                         d.duration = props.delete(:duration).to_i
+                         d
+                       when /W(\d+)/
+                         w = Wipe.new
+                         w.duration = props.delete(:duration).to_i
+                         w.smpte_wipe_index = transition_idx.delete('W')
+                         w
+                       when 'K'
+                         k = Key.new
+                         k.duration = props.delete(:duration).to_i
+                         k
+                       else
+                         raise "Unknown transition type #{transition_idx}"
       end
-      
+
       # Give a hint on the incoming clip as well
       if evt.transition && stack[-1]
         stack[-1].outgoing_transition_duration = evt.transition.duration
       end
-      
-      props.each_pair { | k, v | evt.send("#{k}=", v) }
-      
+
+      props.each_pair { |k, v| evt.send("#{k}=", v) }
+
       stack << evt
-      evt # FIXME - we dont need to return this is only used by tests
+      evt # FIXME: - we dont need to return this is only used by tests
     end
   end
-  
-  #:startdoc:
 
+  #:startdoc:
 end