media 0.0.3 → 0.0.4

data/README.md

@@ -4,6 +4,10 @@ An `ffmpeg` or `avconv` wrapper
 
 ## Installation
 
+Install ffmpeg:
+
+    brew install ffmpeg
+
 Add this line to your application's Gemfile:
 
     gem 'media'
@@ -18,56 +22,39 @@ Or install it yourself as:
 
 ## Usage
 
-    Media.convert do
-      option 'v', 'warning'
+    conversion = Media.convert do
+      options y: true
   
-      input 'in1.mov'
-  
-      input 'in2.mov' do
-        option 'foo', 'bar'
+      input 'http://www.google.com/images/srpr/logo3w.png' do
+        options loop: 1, f: 'image2'
       end
   
-      output 'out.mov' do
+      output '/path/to/test2.webm' do
+        options vcodec: 'libvpx', acodec: 'libvorbis', t: 4
+        maps label('video'), label('audio')
         graph do
           chain do
-            filter 'split' do
-              input 'in'
-              output 'T1'
-            end
-            filter 'fifo'
-            filter 'overlay' do
-              input 'T2'
-              arg '0'
-              arg 'H/2'
-              output 'out'
+            filter 'negate'
+            filter 'hflip' do
+              outputs 'video'
             end
           end
           chain do
-            filter 'fifo' do
-              input 'T1'
-            end
-            filter 'crop' do
-              arg 'iw'
-              arg 'ih/2'
-              arg '0'
-              arg 'ih/2'
-            end
-            filter 'vflip' do
-              output 'T2'
+            filter 'aevalsrc' do
+              arguments 'sin(440*2*PI*t)' => true
+              outputs 'audio'
             end
           end
         end
-    
-        map 'out'
-    
-        option 'f', 'prores'
       end
     end
-    
-Outputs:    
 
-    ffmpeg -v warning -i in1.mov -foo bar -i in2.mov -filter_complex "[in] split [T1], fifo, [T2] overlay=0:H/2 [out]; [T1] fifo, crop=iw:ih/2:0:ih/2, vflip [T2]" -map out -f prores out.mov
+    conversion.call {|progress| p progress}
 
+Outputs:    
+
+    ffmpeg -v info -y -loop 1 -f image2 -i http://www.google.com/images/srpr/logo3w.png -vcodec libvpx -acodec libvorbis -t 4 -map [video] -map [audio] -filter_complex negate, hflip [video]; aevalsrc=sin(440*2*PI*t) [audio] /path/to/test2.webm
+    
 ## Contributing
 
 1. Fork it

data/lib/media.rb

@@ -4,17 +4,22 @@ require_relative 'media/command'
 require_relative 'media/container'
 require_relative 'media/filter'
 require_relative 'media/input'
-require_relative 'media/label'
 require_relative 'media/option'
 require_relative 'media/output'
-require_relative 'media/size'
-
-require_relative 'media/builder/command/converter'
+require_relative 'media/helper'
 
 module Media
   extend self
   
-  def convert(&blk)
-    Command::Converter.extend(Builder::Command::Converter).build(&blk)
+  def convert(&block)
+    Media::Command::Converter.new(&block)
+  end
+  
+  def size(args)
+    Media::Helper::Size.new(args)
+  end
+  
+  def label(name)
+    Media::Helper::Label.new(name: name)
   end
 end

data/lib/media/command/converter.rb

@@ -1,4 +1,6 @@
 require_relative 'subshell'
+require_relative 'progress'
+require_relative '../option'
 
 module Media
   module Command
@@ -6,21 +8,65 @@ module Media
       
       attr_accessor :options, :inputs, :outputs
       
-      def initialize(args={})
+      def initialize(args={}, &block)
         @options = Array args.fetch(:options, [])
         @inputs  = Array args.fetch(:inputs, [])
         @outputs = Array args.fetch(:outputs, [])
         
         @cmd      = args.fetch(:cmd, 'ffmpeg')
         @subshell = args.fetch(:subshell, Subshell)
+        @progress = args.fetch(:progress, Progress)
+        
+        block.arity < 1 ? instance_eval(&block) : block.call(self) if block_given?
+      end
+      
+      def call(&blk)
+        progress = @progress.new
+        
+        process = @subshell.new(cmd: to_a).call do |line|   
+          progress.update(line, &blk)
+        end
+        progress.complete(&blk) if process.success?
+        
+        process
       end
       
-      def call
-        @subshell.new(cmd: to_s).call
+      def to_a
+        [
+          @cmd,
+          (required_options + options).map(&:to_a),
+          inputs.map(&:to_a),
+          outputs.map(&:to_a)
+        ].flatten
       end
       
       def to_s
-        [@cmd, options, inputs, outputs].reject(&:empty?).join(' ')
+        to_a.join(' ')
+      end
+      
+      def options(value=nil)
+        return @options unless value
+        
+        @options = value.map {|k,v| Option.new(key: k, value: v)}
+      end
+      alias_method :options=, :options
+      
+      def add_input(url, &block)
+        @inputs << Input.new(url: url, &block)
+      end
+      alias_method :input, :add_input
+      
+      def add_output(url, &block)
+        @outputs << Output.new(url: url, &block)
+      end
+      alias_method :output, :add_output
+      
+      private
+      
+      def required_options
+        [
+          Option.new(key: 'v', value: 'info')
+        ]
       end
     end
   end

data/lib/media/command/probe.rb

@@ -13,11 +13,15 @@ module Media
       end
       
       def call
-        @subshell.new(cmd: to_s).call
+        @subshell.new(cmd: to_a).call
       end
       
-      def to_s
-        [@cmd, @options, @input].reject(&:empty?).join(' ')
+      def to_a
+        [
+          @cmd,
+          @options.map(&:to_a),
+          @input
+        ].flatten
       end
     end
   end

data/lib/media/command/progress.rb

@@ -0,0 +1,36 @@
+module Media
+  module Command
+    class Progress
+      
+      DURATION = /Duration: (\d+):(\d+):(\d+.\d+), start: (\d+.\d+)/
+      TIME     = /time=(\d+):(\d+):(\d+.\d+)/
+      
+      attr_reader :duration, :time
+      
+      def initialize(args={})
+        @duration = args.fetch(:duration, 0.0)
+        @time     = args.fetch(:time, 0.0)
+      end
+      
+      def update(line)
+        case line
+        when DURATION
+          @duration = ($1.to_i * 3600) + ($2.to_i * 60) + $3.to_f + $4.to_f
+          yield self if block_given?
+        when TIME
+          @time = ($1.to_i * 3600) + ($2.to_i * 60) + $3.to_f
+          yield self if block_given?
+        end
+      end
+      
+      def complete
+        @time = @duration
+        yield self if block_given?
+      end
+      
+      def to_f
+        time / duration rescue ZeroDivisionError 0.0
+      end
+    end
+  end
+end

data/lib/media/command/subshell.rb

@@ -10,11 +10,30 @@ module Media
       attr_reader :out, :error, :status
     
       def initialize(args)
-        @cmd = args.fetch(:cmd)
+        @cmd = Array(args.fetch(:cmd))
       end
     
       def call
-        @out, @error, @status = Open3.capture3(@cmd)
+        @out, @error, @status = Open3.popen3(*@cmd) {|stdin,stdout,stderr,thread|
+          
+          out = Thread.new do
+            stdout.each_with_object([]) do |line, memo|
+              memo << line
+              yield line.strip if block_given?
+            end.join
+          end
+          
+          err = Thread.new do
+            stderr.each_with_object([]) do |line, memo|
+              memo << line
+              yield line.strip if block_given?
+            end.join
+          end
+          
+          stdin.close
+          
+          [out.value, err.value, thread.value]
+        }
         self
       end
     

data/lib/media/container.rb

@@ -6,9 +6,13 @@ require_relative 'option'
 
 module Media
   class Container
+    
+    attr_reader :url, :options
+    
     def initialize(args)
-      @input = args.fetch(:input)
-      @probe = args.fetch(:probe, Command::Probe) 
+      @url   = args.fetch(:url)
+      @probe = args.fetch(:probe, Command::Probe)
+      @options = args.fetch(:options, []) + required_options
     end
     
     def format
@@ -29,10 +33,10 @@ module Media
     end
     
     def probe
-      @probe.new(input: @input, options: options).call
+      @probe.new(input: @url, options: options).call
     end
     
-    def options
+    def required_options
       [ 
         Option.new(key: 'print_format', value: 'json'),
         Option.new(key: 'show_format'),

data/lib/media/filter.rb

@@ -1,25 +1,46 @@
-require 'shellwords'
-
 require_relative 'filter/argument'
 require_relative 'filter/chain'
 require_relative 'filter/graph'
-require_relative 'label'
+require_relative 'helper/label'
 
 module Media
   class Filter
-    attr_reader :name, :arguments, :inputs, :outputs
+    attr_reader :name
     
-    def initialize(args)
+    def initialize(args, &block)
       @name      = args.fetch(:name)
       @arguments = Array args.fetch(:arguments, [])
       @inputs    = Array args.fetch(:inputs, [])
       @outputs   = Array args.fetch(:outputs, [])
+      
+      block.arity < 1 ? instance_eval(&block) : block.call(self) if block_given?
     end
     
     def to_s      
       [inputs, filter, outputs].reject(&:empty?).join(' ')
     end
     
+    def inputs(*value)
+      return @inputs if value.empty?
+        
+      @inputs = value.map {|name| Helper::Label.new(name: name)}
+    end
+    alias_method :inputs=, :inputs
+    
+    def outputs(*value)
+      return @outputs if value.empty?
+      
+      @outputs = value.map {|name| Helper::Label.new(name: name)}
+    end
+    alias_method :outputs=, :outputs
+    
+    def arguments(value=nil)
+      return @arguments unless value
+      
+      @arguments = value.map {|k,v| Argument.new(key: k, value: v)}
+    end
+    alias_method :arguments=, :arguments
+    
     private
     
     def filter

data/lib/media/filter/argument.rb

@@ -3,12 +3,12 @@ module Media
     class Argument
       def initialize(args)
         @key   = args.fetch(:key)
-        @value = args.fetch(:value, true) 
+        @value = args.fetch(:value, true)
       end
       
       def to_s
         case @value
-        when TrueClass, FalseClass then @key
+        when TrueClass, FalseClass then @key.to_s
         else                "#{@key}=#{value}"
         end
       end
@@ -16,7 +16,7 @@ module Media
       private
       
       def value
-        @value.gsub(/([\[\]=;,])/, "\\\\\\1")
+        @value.to_s.gsub(/([\[\]=;,])/, "\\\\\\1")
       end
     end
   end

data/lib/media/filter/chain.rb

@@ -3,13 +3,20 @@ module Media
     class Chain
       attr_reader :filters
       
-      def initialize(args={}, &blk)
+      def initialize(args={}, &block)
         @filters = args.fetch(:filters, [])
+        
+        block.arity < 1 ? instance_eval(&block) : block.call(self) if block_given?
       end
       
       def to_s
         filters.join(', ')
       end
+      
+      def add_filter(name, &block)
+        @filters << Filter.new(name: name, &block)
+      end
+      alias_method :filter, :add_filter
     end
   end
 end

data/lib/media/filter/graph.rb

@@ -5,13 +5,20 @@ module Media
     class Graph
       attr_reader :chains
       
-      def initialize(args={}, &blk)
+      def initialize(args={}, &block)
         @chains = args.fetch(:chains, [])
+        
+        block.arity < 1 ? instance_eval(&block) : block.call(self) if block_given?
       end
       
       def to_s
-        "\"#{chains.join('; ')}\""
+        chains.join('; ')
       end
+      
+      def add_chain(&block)
+        @chains << Filter::Chain.new(&block)
+      end
+      alias_method :chain, :add_chain
     end
   end
 end

data/lib/media/helper.rb

@@ -0,0 +1,2 @@
+require_relative 'helper/size'
+require_relative 'helper/label'

data/lib/media/helper/label.rb

@@ -0,0 +1,13 @@
+module Media
+  module Helper
+    class Label
+      def initialize(args)
+        @name = args.fetch(:name, [])
+      end
+      
+      def to_s
+        "[#{@name}]"
+      end
+    end
+  end
+end

data/lib/media/helper/size.rb

@@ -0,0 +1,14 @@
+module Media
+  module Helper
+    class Size
+      def initialize(args)
+        @width  = args.fetch(:width)
+        @height = args.fetch(:height)
+      end
+    
+      def to_s
+        [@width, @height].join('x')
+      end
+    end
+  end
+end

data/lib/media/input.rb

@@ -3,21 +3,36 @@ require_relative 'filter/graph'
 
 module Media
   class Input
-    attr_reader :options
     
-    def initialize(args)
-      @url     = args.fetch(:url)
+    def initialize(args, &block)
+      @url     = args.fetch(:url) { raise ':url required'}
       @options = Array args.fetch(:options, [])
+      
+      block.arity < 1 ? instance_eval(&block) : block.call(self) if block_given?
     end
     
-    def to_s
-      [options, url].reject(&:empty?).join(' ')
+    def to_a
+      (options << graph << url).compact.map(&:to_a)
     end
     
+    def options(value=nil)
+      return @options unless value
+        
+      @options = value.map {|k,v| Option.new(key: k, value: v)}
+    end
+    alias_method :options=, :options
+    
+    def graph(&block)
+      return @graph unless block_given?
+      
+      @graph = Option.new(key: 'filter_complex', value: Filter::Graph.new(&block))
+    end
+    alias_method :graph=, :graph
+    
     private
     
     def url
-      Option.new(key: 'i', value: @url).to_s
+      Option.new(key: 'i', value: @url)
     end
   end
 end

data/lib/media/option.rb

@@ -5,11 +5,11 @@ module Media
       @value = args.fetch(:value, true)
     end
     
-    def to_s
+    def to_a
       case @value
-      when TrueClass  then "-#{@key}"
-      when FalseClass then "-no#{@key}"
-      else                 "-#{@key} #{@value}"
+      when TrueClass  then ["-#{@key}"]
+      when FalseClass then ["-no#{@key}"]
+      else                 ["-#{@key}", @value.to_s]
       end
     end
   end

data/lib/media/output.rb

@@ -3,15 +3,43 @@ require_relative 'option'
 module Media
   class Output
     
-    attr_reader :options
+    attr_reader :options, :maps
     
-    def initialize(args, &blk)
-      @url  = args.fetch(:url)
+    def initialize(args, &block)
+      @url     = args.fetch(:url) { raise ':url required'}
       @options = Array args.fetch(:options, [])
+      @maps    = Array args.fetch(:maps, [])
+      
+      block.arity < 1 ? instance_eval(&block) : block.call(self) if block_given?
     end
     
-    def to_s
-      [options, @url].join(' ')
+    def to_a
+      (options + maps << graph).compact.map(&:to_a) + [@url]
     end
+    
+    def options(value=nil)
+      return @options unless value
+        
+      @options = value.map {|k,v| Option.new(key: k, value: v)}
+    end
+    alias_method :options=, :options
+    
+    def maps(*value)
+      return @maps if value.empty?
+      
+      @maps = value.map {|v| Option.new(key: 'map', value: v)}
+    end
+    alias_method :maps=, :maps
+    
+    def label(name)
+      Media.label(name)
+    end
+    
+    def graph(&block)
+      return @graph unless block_given?
+      
+      @graph = Option.new(key: 'filter_complex', value: Filter::Graph.new(&block))
+    end
+    alias_method :graph=, :graph
   end
 end

data/lib/media/version.rb

@@ -1,3 +1,3 @@
 module Media
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/test/media/command/test_converter.rb

@@ -18,27 +18,31 @@ module Media
       end
       
       def test_empty_call
-        subshell.expect(:new, subshell, [cmd: 'ffmpeg'])
-        subshell.expect(:call, true)
+        stub = Class.new do
+          def success?; true; end
+        end
+        
+        subshell.expect(:new, subshell, [cmd: ['ffmpeg', '-v', 'info']])
+        subshell.expect(:call, stub.new)
         
         subject.call
       end
       
       def test_with_options
-        assert_equal 'ffmpeg options', subject(options: ['options']).to_s
+        assert_equal ['ffmpeg', '-v', 'info', 'option'], subject(options: [['option']]).to_a
       end
       
       def test_call_with_inputs
-        assert_equal 'ffmpeg inputs', subject(inputs: ['inputs']).to_s
+        assert_equal ['ffmpeg', '-v', 'info', 'input'], subject(inputs: [['input']]).to_a
       end
       
       def test_call_with_outputs
-        assert_equal 'ffmpeg outputs', subject(outputs: ['outputs']).to_s
+        assert_equal ['ffmpeg', '-v', 'info', 'output'], subject(outputs: [['output']]).to_a
       end
       
       def test_call_with_all
-        assert_equal 'ffmpeg options inputs outputs',
-          subject(options: ['options'], inputs: ['inputs'], outputs: ['outputs']).to_s
+        assert_equal ['ffmpeg', '-v', 'info', 'option', 'input', 'output'],
+          subject(options: [['option']], inputs: [['input']], outputs: [['output']]).to_a
       end
     end
   end

data/test/media/command/test_probe.rb

@@ -18,19 +18,19 @@ module Media
       end
       
       def test_call
-        subshell.expect(:new, subshell, [cmd: 'ffprobe input'])
+        subshell.expect(:new, subshell, [cmd: ['ffprobe', 'input']])
         subshell.expect(:call, true)
         
         subject(input: ['input']).call
       end
       
       def test_call_with_input
-        assert_equal 'ffprobe input', subject(input: ['input']).to_s
+        assert_equal ['ffprobe', 'input'], subject(input: ['input']).to_a
       end
       
       def test_call_with_all
-        assert_equal 'ffprobe options input',
-          subject(options: ['options'], input: ['input']).to_s
+        assert_equal ['ffprobe', 'option', 'input'],
+          subject(options: [['option']], input: ['input']).to_a
       end
     end
   end

data/test/media/command/test_subshell.rb

@@ -10,15 +10,15 @@ module Media
       end
       
       def test_stdout
-        shell = subject.new(cmd: 'echo hello')
+        shell = subject.new(cmd: ['echo', 'hello'])
         
         assert_equal("hello\n", shell.call.out)
       end
       
       def test_stderr
-        shell = subject.new(cmd: 'echo hello 1>&2')
-        
-        assert_equal("hello\n", shell.call.error)
+        shell = subject.new(cmd: ['ffprobe'])
+
+        assert_match(/^ffprobe/, shell.call.error)
       end
       
       def test_success
@@ -32,6 +32,15 @@ module Media
         
         refute(shell.call.success?)
       end
+      
+      def test_streaming
+        shell = subject.new(cmd: ['echo', "hello\n", 'there'])
+        
+        out = []
+        shell.call {|line| out << line}
+        
+        assert_equal(['hello', 'there'], out)
+      end
     end
   end
 end

data/test/media/filter/test_graph.rb

@@ -6,7 +6,7 @@ module Media
     class TestGraph < MiniTest::Unit::TestCase
       
       def test_to_s
-        assert_equal('"a; b; c"', Graph.new(chains: %w(a b c)).to_s)
+        assert_equal('a; b; c', Graph.new(chains: %w(a b c)).to_s)
       end
     end
   end

data/test/media/{test_label.rb → helper/test_label.rb}

@@ -1,11 +1,11 @@
 require 'helper'
-require 'media/label'
+require 'media/helper/label'
 
 module Media
   class TestLabel < MiniTest::Unit::TestCase
     
     def test_to_s
-      assert_equal '[foo]', Label.new(name: 'foo').to_s
+      assert_equal '[foo]', Helper::Label.new(name: 'foo').to_s
     end
   end
 end

data/test/media/test_input.rb

@@ -5,9 +5,9 @@ module Media
   class TestInput < MiniTest::Unit::TestCase
     
     def test_to_s
-      input = Input.new(url: 'url', options: 'options')
+      input = Input.new(url: 'url', options: [['option']])
       
-      assert_equal('options -i url', input.to_s)
+      assert_equal([['option'], ['-i', 'url']], input.to_a)
     end
   end
 end

data/test/media/test_option.rb

@@ -9,15 +9,15 @@ module Media
     end
     
     def test_option
-      assert_equal '-foo bar', subject.new(key: 'foo', value: 'bar').to_s
+      assert_equal ['-foo', 'bar'], subject.new(key: 'foo', value: 'bar').to_a
     end
     
     def test_true_flag
-      assert_equal '-foo', subject.new(key: 'foo').to_s
+      assert_equal ['-foo'], subject.new(key: 'foo').to_a
     end
     
     def test_false_flag
-      assert_equal '-nofoo', subject.new(key: 'foo', value: false).to_s
+      assert_equal ['-nofoo'], subject.new(key: 'foo', value: false).to_a
     end
   end
 end

data/test/media/test_output.rb

@@ -5,9 +5,9 @@ module Media
   class TestOutput < MiniTest::Unit::TestCase
     
     def test_to_s
-      output = Output.new(url: 'url', options: 'options')
+      output = Output.new(url: 'url', options: [['option']])
       
-      assert_equal('options url', output.to_s)
+      assert_equal([['option'], 'url'], output.to_a)
     end
   end
 end

metadata

@@ -2,14 +2,14 @@
 name: media
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Jamie Hodge
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-13 00:00:00.000000000 Z
+date: 2013-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   prerelease: false
@@ -62,24 +62,14 @@ files:
   UmFrZWZpbGU=
 - !binary |-
   bGliL21lZGlhLnJi
-- !binary |-
-  bGliL21lZGlhL2J1aWxkZXIvY29tbWFuZC9jb252ZXJ0ZXIucmI=
-- !binary |-
-  bGliL21lZGlhL2J1aWxkZXIvZmlsdGVyLnJi
-- !binary |-
-  bGliL21lZGlhL2J1aWxkZXIvZmlsdGVyL2NoYWluLnJi
-- !binary |-
-  bGliL21lZGlhL2J1aWxkZXIvZmlsdGVyL2dyYXBoLnJi
-- !binary |-
-  bGliL21lZGlhL2J1aWxkZXIvaW5wdXQucmI=
-- !binary |-
-  bGliL21lZGlhL2J1aWxkZXIvb3V0cHV0LnJi
 - !binary |-
   bGliL21lZGlhL2NvbW1hbmQucmI=
 - !binary |-
   bGliL21lZGlhL2NvbW1hbmQvY29udmVydGVyLnJi
 - !binary |-
   bGliL21lZGlhL2NvbW1hbmQvcHJvYmUucmI=
+- !binary |-
+  bGliL21lZGlhL2NvbW1hbmQvcHJvZ3Jlc3MucmI=
 - !binary |-
   bGliL21lZGlhL2NvbW1hbmQvc3Vic2hlbGwucmI=
 - !binary |-
@@ -93,15 +83,17 @@ files:
 - !binary |-
   bGliL21lZGlhL2ZpbHRlci9ncmFwaC5yYg==
 - !binary |-
-  bGliL21lZGlhL2lucHV0LnJi
+  bGliL21lZGlhL2hlbHBlci5yYg==
 - !binary |-
-  bGliL21lZGlhL2xhYmVsLnJi
+  bGliL21lZGlhL2hlbHBlci9sYWJlbC5yYg==
+- !binary |-
+  bGliL21lZGlhL2hlbHBlci9zaXplLnJi
+- !binary |-
+  bGliL21lZGlhL2lucHV0LnJi
 - !binary |-
   bGliL21lZGlhL29wdGlvbi5yYg==
 - !binary |-
   bGliL21lZGlhL291dHB1dC5yYg==
-- !binary |-
-  bGliL21lZGlhL3NpemUucmI=
 - !binary |-
   bGliL21lZGlhL3ZlcnNpb24ucmI=
 - !binary |-
@@ -120,12 +112,12 @@ files:
   dGVzdC9tZWRpYS9maWx0ZXIvdGVzdF9jaGFpbi5yYg==
 - !binary |-
   dGVzdC9tZWRpYS9maWx0ZXIvdGVzdF9ncmFwaC5yYg==
+- !binary |-
+  dGVzdC9tZWRpYS9oZWxwZXIvdGVzdF9sYWJlbC5yYg==
 - !binary |-
   dGVzdC9tZWRpYS90ZXN0X2ZpbHRlci5yYg==
 - !binary |-
   dGVzdC9tZWRpYS90ZXN0X2lucHV0LnJi
-- !binary |-
-  dGVzdC9tZWRpYS90ZXN0X2xhYmVsLnJi
 - !binary |-
   dGVzdC9tZWRpYS90ZXN0X29wdGlvbi5yYg==
 - !binary |-
@@ -175,12 +167,12 @@ test_files:
   dGVzdC9tZWRpYS9maWx0ZXIvdGVzdF9jaGFpbi5yYg==
 - !binary |-
   dGVzdC9tZWRpYS9maWx0ZXIvdGVzdF9ncmFwaC5yYg==
+- !binary |-
+  dGVzdC9tZWRpYS9oZWxwZXIvdGVzdF9sYWJlbC5yYg==
 - !binary |-
   dGVzdC9tZWRpYS90ZXN0X2ZpbHRlci5yYg==
 - !binary |-
   dGVzdC9tZWRpYS90ZXN0X2lucHV0LnJi
-- !binary |-
-  dGVzdC9tZWRpYS90ZXN0X2xhYmVsLnJi
 - !binary |-
   dGVzdC9tZWRpYS90ZXN0X29wdGlvbi5yYg==
 - !binary |-

data/lib/media/builder/command/converter.rb

@@ -1,55 +0,0 @@
-require_relative '../../option'
-require_relative '../../input'
-require_relative '../../output'
-
-require_relative '../../builder/input'
-require_relative '../../builder/output'
-
-module Media
-  module Builder
-    module Command
-      module Converter
-      
-        module ClassMethods
-        
-          def build(&blk)
-            converter = new
-          
-            if block_given?
-              context = eval('self', blk.binding)
-              converter.instance_variable_set(:@context, context)
-              
-              converter.instance_eval(&blk)
-            end
-            converter
-          end
-        end
-      
-        module InstanceMethods
-        
-          def option(key, value)
-            options << Media::Option.new(key: key, value: value)
-          end
-      
-          def input(url, &blk)
-            inputs << Media::Input.extend(Builder::Input).build(url, &blk)
-          end
-      
-          def output(url, &blk)
-            outputs << Media::Output.extend(Builder::Output).build(url, &blk)
-          end
-        
-          def method_missing(method, *args, &blk)
-            @context && @context.send(method, *args, &blk)
-          end
-        end
-      
-        def self.extended(receiver)
-          receiver.extend(ClassMethods)
-          receiver.send(:include, InstanceMethods)
-        end
-      end
-    end
-  end
-end
-    

data/lib/media/builder/filter.rb

@@ -1,48 +0,0 @@
-require_relative '../filter/argument'
-
-module Media
-  module Builder
-    module Filter
-      
-      module ClassMethods
-        
-        def build(name, &blk)
-          filter = new(name: name)
-          
-          if block_given?
-            context = eval('self', blk.binding)
-            filter.instance_variable_set(:@context, context)
-            
-            filter.instance_eval(&blk)
-          end
-          filter
-        end
-      end
-      
-      module InstanceMethods
-        
-        def input(name)
-          inputs << Media::Label.new(name: name)
-        end
-    
-        def output(name)
-          outputs << Media::Label.new(name: name)
-        end
-    
-        def argument(key, value=true)
-          arguments << Media::Filter::Argument.new(key: key, value: value)
-        end
-        alias :arg :argument
-        
-        def method_missing(method, *args, &blk)
-          @context && @context.send(method, *args, &blk)
-        end
-      end
-      
-      def self.extended(receiver)
-        receiver.extend(ClassMethods)
-        receiver.send(:include, InstanceMethods)
-      end
-    end
-  end
-end

data/lib/media/builder/filter/chain.rb

@@ -1,41 +0,0 @@
-require_relative '../filter'
-
-module Media
-  module Builder
-    module Filter
-      module Chain
-        
-        module ClassMethods
-          
-          def build(&blk)
-            chain = new
-          
-            if block_given?
-              context = eval('self', blk.binding)
-              chain.instance_variable_set(:@context, context)
-              
-              chain.instance_eval(&blk)
-            end
-            chain
-          end
-        end
-        
-        module InstanceMethods
-          
-          def filter(name, &blk)
-            filters << Media::Filter.extend(Filter).build(name, &blk)
-          end
-          
-          def method_missing(method, *args, &blk)
-            @context && @context.send(method, *args, &blk)
-          end
-        end
-        
-        def self.extended(receiver)
-          receiver.extend(ClassMethods)
-          receiver.send(:include, InstanceMethods)
-        end
-      end
-    end
-  end
-end

data/lib/media/builder/filter/graph.rb

@@ -1,43 +0,0 @@
-require_relative '../../filter/chain'
-
-require_relative 'chain'
-
-module Media
-  module Builder
-    module Filter
-      module Graph
-        
-        module ClassMethods
-          
-          def build(&blk)
-            graph = new
-          
-            if block_given?
-              context = eval('self', blk.binding)
-              graph.instance_variable_set(:@context, context)
-              
-              graph.instance_eval(&blk)
-            end
-            graph
-          end
-        end
-        
-        module InstanceMethods
-          
-          def chain(&blk)
-            chains << Media::Filter::Chain.extend(Chain).build(&blk)
-          end
-          
-          def method_missing(method, *args, &blk)
-            @context && @context.send(method, *args, &blk)
-          end
-        end
-        
-        def self.extended(receiver)
-          receiver.extend(ClassMethods)
-          receiver.send(:include, InstanceMethods)
-        end
-      end
-    end
-  end
-end

data/lib/media/builder/input.rb

@@ -1,46 +0,0 @@
-require_relative 'filter/graph'
-
-module Media
-  module Builder
-    module Input
-      
-      module ClassMethods
-        
-        def build(url, &blk)
-          input = new(url: url)
-          
-          if block_given?
-            context = eval('self', blk.binding)
-            input.instance_variable_set(:@context, context)
-            
-            input.instance_eval(&blk)
-          end
-          input
-        end
-      end
-      
-      module InstanceMethods
-        
-        def option(key, value=true)
-          @options << Media::Option.new(key: key, value: value).to_s
-        end
-    
-        def graph(&blk)
-          @options << Option.new(
-            key: 'filter_complex', 
-            value: Media::Filter::Graph.extend(Filter::Graph).build(&blk)
-          )
-        end
-        
-        def method_missing(method, *args, &blk)
-          @context && @context.send(method, *args, &blk)
-        end
-      end
-      
-      def self.extended(receiver)
-        receiver.extend(ClassMethods)
-        receiver.send(:include, InstanceMethods)
-      end
-    end
-  end
-end

data/lib/media/builder/output.rb

@@ -1,51 +0,0 @@
-require_relative '../option'
-require_relative '../filter/graph'
-
-require_relative 'filter/graph'
-
-module Media
-  module Builder
-    module Output
-      
-      module ClassMethods
-  
-        def build(url, &blk)
-          output = new(url: url)
-          
-          if block_given?
-            context = eval('self', blk.binding)
-            output.instance_variable_set(:@context, context)
-            
-            output.instance_eval(&blk)
-          end
-          output
-        end
-      end
-
-      module InstanceMethods
-  
-        def option(key, value=true)
-          @options << Media::Option.new(key: key, value: value)
-        end
-    
-        def map(value)
-          @options << Media::Option.new(key: 'map', value: value)
-        end
-        
-        def graph(&blk)
-          @options << Media::Option.new(key: 'filter_complex', 
-            value: Media::Filter::Graph.extend(Filter::Graph).build(&blk))
-        end
-  
-        def method_missing(method, *args, &blk)
-          @context && @context.send(method, *args, &blk)
-        end
-      end
-      
-      def self.extended(receiver)
-        receiver.extend(ClassMethods)
-        receiver.send(:include, InstanceMethods)
-      end
-    end
-  end
-end

data/lib/media/label.rb

@@ -1,11 +0,0 @@
-module Media
-  class Label
-    def initialize(args)
-      @name = args.fetch(:name, [])
-    end
-      
-    def to_s
-      "[#{@name}]"
-    end
-  end
-end

data/lib/media/size.rb

@@ -1,12 +0,0 @@
-module Media
-  class Size
-    def initialize(args)
-      @width  = args.fetch(:width)
-      @height = args.fetch(:height)
-    end
-    
-    def to_s
-      [@width, @height].join('x')
-    end
-  end
-end