av 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18f4f0325d4b9af49abd34117b65e75813252fc5
-  data.tar.gz: 82007c918c6dbed310a06ad87f666f8361007bac
+  metadata.gz: 22be43869ad466b354fc8b29a8a0e3e85cc47cad
+  data.tar.gz: 4a90b4d4fd1dd385dd44b322a5f903bfc36c4641
 SHA512:
-  metadata.gz: 189b6844e75dbd5950c5ece010486bf6baa7ea69b5c69e4cf6e32919af8e9b95dc6ff4fd057a5952ccc78cafbf853fae0fbcbf1ca718d95840456dc284855057
-  data.tar.gz: 48c0873c6e8d35f00e304d005e18ddc21c593ec6ff37b36461e0934b5358df384c7a426eb078af454262ed1b5336cf6a545c44336b3f2e2ff1344657fe89d5bc
+  metadata.gz: a9aba31db65e5f2adabd4d619923371ac1f1a4a2a1753a1fffc6933f1b75face639e884ded35e2ca665855be95fa058e383dbd20f235b9673dcd334d72191a4c
+  data.tar.gz: ab8d8cea8456ea0a89abf152e83524dfacbd7973ca63981355c7e6b0d38cd8917a4b91527c4e7263bdfb93cee36db0736561d1e9d11117d402bb56879795ea47

data/README.md

@@ -8,7 +8,7 @@ A Ruby Programmable interface for FFmpeg and Libav.
 [![Coverage Status](https://coveralls.io/repos/ruby-av/av/badge.png?branch=master)](https://coveralls.io/r/ruby-av/av?branch=master)
 [![Code Climate](https://codeclimate.com/github/ruby-av/av/badges/gpa.svg)](https://codeclimate.com/github/ruby-av/av)
 [![Dependency Status](https://gemnasium.com/ruby-av/av.svg)](https://gemnasium.com/ruby-av/av)
-
+[![Gem Version](https://badge.fury.io/rb/av.svg)](http://badge.fury.io/rb/av)
 ## Installation
 
 Add this line to your application's Gemfile:

data/lib/av/commands/base.rb

@@ -15,18 +15,18 @@ module Av
 
       attr_accessor :source
       attr_accessor :destination
-      
+
       def initialize(options = {})
         reset_input_filters
         reset_output_filters
         reset_default_filters
         @options = options
       end
-      
+
       def add_source src
         @source = src
       end
-      
+
       def add_destination dest
         # infer format from extension unless format has already been set
         if @output_format.nil?
@@ -34,21 +34,21 @@ module Av
         end
         @destination = dest
       end
-      
+
       def reset_input_filters
         @input_params = ParamHash.new
         @audio_filters = ParamHash.new
         @video_filters = ParamHash.new
       end
-      
+
       def reset_output_filters
         @output_params = ParamHash.new
       end
-      
+
       def reset_default_filters
         @default_params = ParamHash.new
       end
-      
+
       def add_input_param *param
         p = parse_param(param)
         ::Av.log "Adding input parameter #{p}"
@@ -56,11 +56,11 @@ module Av
         @input_params[p[0]] << p[1]
         self
       end
-      
+
       def set_input_params hash
         @input_params = hash
       end
-      
+
       def add_output_param *param
         p = parse_param(param)
         ::Av.log "Adding output parameter #{p}"
@@ -68,11 +68,11 @@ module Av
         @output_params[p[0]] << p[1]
         self
       end
-      
+
       def set_output_params hash
         @output_params = hash
       end
-      
+
       def run
         raise Av::CommandError if (@source.nil? && @destination.nil?) || @command_name.nil?
 
@@ -90,7 +90,7 @@ module Av
         command_line = parameters.flatten.compact.join(" ").strip.squeeze(" ")
         ::Av.run(command_line)
       end
-      
+
       def identify path
         meta = {}
         command = %Q(#{@command_name} -i "#{File.expand_path(path)}" 2>&1)
@@ -104,7 +104,10 @@ module Av
           if line =~ /Video:(.*)/
             size = $1.to_s.match(/\d{3,5}x\d{3,5}/).to_s
             meta[:size] = size unless size.empty?
-            meta[:aspect] = size.split('x').first.to_f / size.split('x').last.to_f if meta[:size]
+            if meta[:size]
+              meta[:width], meta[:height] = meta[:size].split('x').map(&:to_i)
+              meta[:aspect] = meta[:width].to_f / meta[:height].to_f
+            end
           end
           # Matching Stream #0.0: Audio: libspeex, 8000 Hz, mono, s16
           if line =~ /Audio:(.*)/
@@ -113,19 +116,20 @@ module Av
           # Matching Duration: 00:01:31.66, start: 0.000000, bitrate: 10404 kb/s
           if line =~ /Duration:(\s.?(\d*):(\d*):(\d*\.\d*))/
             meta[:length] = $2.to_s + ":" + $3.to_s + ":" + $4.to_s
+            meta[:duration] = $2.to_i * 3600 + $3.to_i * 60 + $4.to_f
           end
           if line =~ /rotate\s*:\s(\d*)/
             meta[:rotate] = $1.to_i
           end
         end
         if meta.empty?
-          ::Av.log "Empty metadata from #{path}. Got the following output: #{out}" 
+          ::Av.log "Empty metadata from #{path}. Got the following output: #{out}"
         else
           return meta
         end
         nil
       end
-      
+
       def output_format format
         @output_format = format
         case format.to_s
@@ -145,12 +149,23 @@ module Av
           add_output_param 'strict', 'experimental'
         end
       end
-      
+
       # Children should override the following methods
       def filter_rotate degrees
         raise ::Av::FilterNotImplemented, 'rotate'
       end
-      
+
+      # Children should override the following methods
+      def filter_volume vol
+        raise ::Av::FilterNotImplemented, 'volume'
+      end
+
+      # ffmpeg and avconf both have the same seeking params
+      def filter_seek seek
+        add_input_param ss: seek
+        self
+      end
+
       def parse_param param
         list = []
         if param.count == 2
@@ -165,6 +180,6 @@ module Av
         end
         list
       end
-    end  
+    end
   end
 end

data/lib/av/version.rb

@@ -1,3 +1,3 @@
 module Av
-  VERSION = "0.8.1"
+  VERSION = "0.9.0"
 end

data/spec/av/base_spec.rb

@@ -3,23 +3,23 @@ require 'spec_helper'
 describe Av::Commands::Base do
   let(:subject) { Av.cli }
   let(:source) { File.new(Dir.pwd + '/spec/support/assets/sample.mp4').path }
-  
+
   describe '.identify' do
     describe 'supported files' do
       let(:meta) { subject.identify source }
-    
+
       it { expect(meta).to be_a Hash }
-      it { expect(meta.keys).to include :size, :aspect }
+      it { expect(meta.keys).to include :size, :aspect, :width, :height, :length, :duration }
     end
 
     describe 'unsupported files' do
       let(:unsupported) { File.new(Dir.pwd + '/spec/support/assets/image.png').path }
       let(:meta) { subject.identify unsupported }
-    
+
       it { expect(meta).to be_nil }
     end
   end
-  
+
   describe '.add_input_param' do
     before do
       subject.add_input_param({k: 'value'})
@@ -49,7 +49,15 @@ describe Av::Commands::Base do
       it { expect(subject.output_params.to_s).to eq '-k value value1 value2 -x y' }
     end
   end
-  
+
+  describe '.filter_seek' do
+    before do
+      subject.filter_seek('00:00:01.11')
+    end
+
+    it { expect(subject.input_params.to_s).to eq "-ss 00:00:01.11" }
+  end
+
   describe '.run' do
     before do
       subject.add_output_param(ar: 44100)
@@ -57,7 +65,7 @@ describe Av::Commands::Base do
       subject.add_destination(Tempfile.new(['one', '.ogv']).path)
     end
     it { expect { subject.run }.not_to raise_exception }
-    
+
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: av
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Omar Abdel-Wahab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-11 00:00:00.000000000 Z
+date: 2015-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler