av 0.1.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3a866330bd9c784df99f3235220e5184973215f
-  data.tar.gz: 671c46357af67d353a607948e6bdc03beefb2962
+  metadata.gz: 2680b92872fd043f4f223ccaad0d7b667c8e9e51
+  data.tar.gz: 29f2a2d421492496ba12f0942845cefe817069eb
 SHA512:
-  metadata.gz: 5aa51d99ae99ae7aeb65287030b91a30eb16665ae8f582b2625e6816771c09d166129c854a99877db4aff1882d8620699ef6f1e3f3ca9022d552dbb27678ba8e
-  data.tar.gz: b4b7714fd9163a4178116e04ba38e693dcae73de65132a38cc9ecbe512ab2bcc9f2257e2ac1cc6190ba318680020599b9cec98ce855f10c0f048d1d00d651129
+  metadata.gz: 94ed1426a502750e3e2b8e336d89805f64ef6f136655adf5caa37596d6689762e1b9f5952f7b9bdbb192f9ab96d6e3c4582eca0a373baa49d357da774af50947
+  data.tar.gz: ce444930d672df1b1c5805909bde0c9934ac84c95538d437ccadf939a8f41dfeb667334e2ae67d9b477e9602c8b85d1e2dd72aeb143a48faf85c161fc76e61bb

data/lib/av.rb

@@ -1,15 +1,25 @@
 require "av/version"
 require "av/exceptions"
+require "av/logger"
 require "av/cli"
 require "av/param_hash"
 require "av/commands/ffmpeg"
 require "av/commands/avconv"
 require "cocaine"
+require "av/engine" if defined?(Rails)
 
 module Av
   extend self
+  extend Logger
+  
+  def options
+    @options ||= {
+      log: false
+    }
+  end
   
   def cli(options = {})
+    @options = options unless options.empty?
     ::Av::Cli.new(options)
   end
   
@@ -21,8 +31,4 @@ module Av
       raise Av::CommandError, "error while running command #{line}: #{e}"
     end
   end
-  
-  def log message
-    puts "[AV] #{message}"
-  end
 end

data/lib/av/commands/base.rb

@@ -104,8 +104,8 @@ module Av
           if line =~ /Video:(.*)/
              v = $1.to_s
              size = v.match(/\d{3,5}x\d{3,5}/).to_s
-             meta[:size] = size
-             meta[:aspect] = size.split('x').first.to_f / size.split('x').last.to_f
+             meta[:size] = size unless size.empty?
+             meta[:aspect] = size.split('x').first.to_f / size.split('x').last.to_f if meta[:size]
            end
           # Matching Duration: 00:01:31.66, start: 0.000000, bitrate: 10404 kb/s
           if line =~ /Duration:(\s.?(\d*):(\d*):(\d*\.\d*))/
@@ -115,7 +115,7 @@ module Av
             meta[:rotate] = $1.to_i
           end
         end
-        meta
+        meta unless meta.empty?
       end
       
       def output_format format

data/lib/av/engine.rb

@@ -0,0 +1,7 @@
+module Av
+  class Engine < ::Rails::Engine
+    initializer 'av.logger' do
+      Av.logger = ::Rails.logger
+    end
+  end
+end

data/lib/av/logger.rb

@@ -0,0 +1,17 @@
+require "logger"
+
+module Av
+  module Logger
+    def log message
+      logger.info "[AV] #{message}" if options[:log]
+    end
+  
+    def logger
+      @logger ||= ::Logger.new(STDOUT)
+    end
+
+    def logger=(logger)
+      @logger = logger
+    end
+  end  
+end

data/lib/av/version.rb

@@ -1,3 +1,3 @@
 module Av
-  VERSION = "0.1.2"
+  VERSION = "0.4.0"
 end

data/spec/av/base_spec.rb

@@ -5,10 +5,19 @@ describe Av::Commands::Base do
   let(:source) { File.new(Dir.pwd + '/spec/support/assets/sample.mp4').path }
   
   describe '.identify' do
-    let(:meta) { subject.identify source }
+    describe 'supported files' do
+      let(:meta) { subject.identify source }
     
-    it { expect(meta).to be_a Hash }
-    it { expect(meta.keys).to include :size, :fps, :length, :aspect }
+      it { expect(meta).to be_a Hash }
+      it { expect(meta.keys).to include :size, :fps, :length, :aspect }
+    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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: av
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Omar Abdel-Wahab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-11 00:00:00.000000000 Z
+date: 2014-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -85,7 +85,9 @@ files:
 - lib/av/commands/avconv.rb
 - lib/av/commands/base.rb
 - lib/av/commands/ffmpeg.rb
+- lib/av/engine.rb
 - lib/av/exceptions.rb
+- lib/av/logger.rb
 - lib/av/param_hash.rb
 - lib/av/version.rb
 - spec/av/av_spec.rb
@@ -93,6 +95,7 @@ files:
 - spec/av/base_spec.rb
 - spec/av/ffmpeg_spec.rb
 - spec/spec_helper.rb
+- spec/support/assets/image.png
 - spec/support/assets/sample.mp4
 homepage: https://github.com/ruby-av
 licenses:
@@ -124,4 +127,5 @@ test_files:
 - spec/av/base_spec.rb
 - spec/av/ffmpeg_spec.rb
 - spec/spec_helper.rb
+- spec/support/assets/image.png
 - spec/support/assets/sample.mp4