vcs_ruby 1.1.10 → 1.1.11

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 85791e1e6f01c52a62bd1cf9d2464a91be7dfb3e
+  data.tar.gz: 7778a25b6432d84a550f851ebcf2b2d19be00a7d
+SHA512:
+  metadata.gz: ac320880819e49a35953e424469fd4d923d121362a643358aa23dea1a87c37191673ca5c84162782f12853415efff3dc5eee8ec9d53324880f1253856dfb5192
+  data.tar.gz: 96a803da37fc27152ed4295c58b99eecf95cfd1a36f6acf8ee66ae138faff2d8d5e9544bdbf668f10017403841bd5073cde4c3db0371ea4358734d186150cff3

data/lib/FFmpeg/ffmpeg.rb

@@ -19,6 +19,7 @@ module VCSRuby
       @video = video
       @ffmpeg = Command.new :ffmpeg, 'ffmpeg'
       @ffprobe = Command.new :ffmpeg, 'ffprobe'
+      @libav = nil
 
       detect_version if available?
     end
@@ -41,9 +42,9 @@ module VCSRuby
 
     def detect_version
       info = @ffmpeg.execute('-version')
-      match = /avconv ([\d|.|-|:]*)/.match(info)
+      match = /avconv ([\d|\.|\-|:]*)/.match(info)
       @libav = !!match
-      match = /ffmpeg version ([\d|.]*)/.match(info)
+      match = /ffmpeg version ([\d|\.]*)/.match(info)
       if match
         @version = match[1]
       end

data/lib/MPlayer/mplayer.rb

@@ -61,7 +61,7 @@ module VCSRuby
 
   private
     def format_split line
-      name = line.strip.split(' ', 2).first
+      line.strip.split(' ', 2).first
     end
 
     def check_cache

data/lib/MockCap/mock_capturer.rb

@@ -0,0 +1,42 @@
+#
+# Mock Implementation for Tests
+#
+
+require 'capturer'
+require 'command'
+
+module VCSRuby
+  class MockCapturer < Capturer
+    attr_reader :info, :video_streams, :audio_streams
+
+    def initialize video
+      @video = video
+      @info = nil
+      @video_streams = nil
+      @audio_streams = nil
+    end
+
+    def file_valid?
+      true
+    end
+
+    def name
+      :mock
+    end
+
+    def available?
+      true
+    end
+
+    def grab time, image_path
+    end
+
+    def available_formats
+      ['png', 'tiff', 'bmp', 'mjpeg']
+    end
+
+    def to_s
+      "Mock 1.0"
+    end
+  end
+end

data/lib/capturer.rb

@@ -2,8 +2,6 @@
 # Capturer Baseclass
 #
 
-require 'vcs'
-
 module VCSRuby
   class Capturer
     $formats = { :png => 'png', :bmp => 'bmp', :tiff => 'tif', :mjpeg => 'jpg', :jpeg => 'jpg', :jpg => 'jpg' }
@@ -13,8 +11,6 @@ module VCSRuby
     end
 
     def self.initialize_capturers video
-      capturers = []
-
       puts "Available capturers: #{available_capturers.map{ |c| c.to_s }.join(', ')}" if Tools.verbose?
     end
 

data/lib/command.rb

@@ -47,4 +47,4 @@ private
       return nil
     end
   end
- end
+end

data/lib/configuration.rb

@@ -22,6 +22,7 @@ module VCSRuby
     def initialize
       default_config_file = File.expand_path("defaults.yml", File.dirname(__FILE__))
       @config = ::YAML::load_file(default_config_file)
+      @verbose = false
 
       local_config_files = ['~/.vcs.rb.yml']
       local_config_files.select{ |f| File.exists?(f) }.each do |local_config_file|
@@ -39,10 +40,10 @@ module VCSRuby
       profiles = [File.expand_path("#{profile}.yml", File.dirname(__FILE__)), "~/#{profile}.yml"]
 
       found = false
-      profiles.each do |profile|
-        if File.exists?(profile)
+      profiles.each do |p|
+        if File.exists?(p)
           puts "Profile loaded: #{profile}" if verbose?
-          config = YAML::load_file(profile)
+          config = YAML::load_file(p)
           @config = @config.deep_merge(config)
           found = true
         end
@@ -147,4 +148,4 @@ module VCSRuby
       !!@config['filter']['softshadow']
     end
   end
- end
+end

data/lib/contact_sheet.rb

@@ -6,8 +6,6 @@ require 'fileutils'
 require 'tmpdir'
 require 'yaml'
 
-require 'vcs'
-
 module VCSRuby
   class ContactSheet
     attr_accessor :signature, :title, :highlight
@@ -254,7 +252,7 @@ private
         convert << file_path
       end
       file_path
-     end
+    end
 
     def create_title montage
       file_path = File::join(@tempdir, 'title.png')

data/lib/font.rb

@@ -37,7 +37,7 @@ module VCSRuby
 
     def font_by_name name
       if name =~ /\./
-        key, font = @@fonts.select{ |key, f| f.glyphs =~ /#{name}\z/ }.first
+        _, font = @@fonts.select{ |k, f| f.glyphs =~ /#{name}\z/ }.first
         return font
       else
         @@fonts[name]

data/lib/libAV/libav.rb

@@ -39,7 +39,7 @@ module VCSRuby
 
     def detect_version
       info = @avconv.execute('-version')
-      match = /avconv ([\d|.|-|:]*)/.match(info)
+      match = /avconv ([\d|\.|\-|:]*)/.match(info)
       if match
         @version = match[1]
       end

data/lib/libAV/libav_video_stream.rb

@@ -54,7 +54,7 @@ module VCSRuby
 
       colon = ":"
       if @raw['display_aspect_ratio'].include? colon
-        w,h = @raw['display_aspect_ratio'].split(colon)
+        w,h = @raw['display_aspect_ratio'].split(colon).map { |n| n.to_i }
         Rational(w,h)
       else
         @raw['display_aspect_ratio'].to_f

data/lib/stream.rb

@@ -2,8 +2,6 @@
 # Represents a stream in a video
 #
 
-require 'vcs'
-
 module VCSRuby
   class Stream
     def initialize stream

data/lib/time_index.rb

@@ -47,16 +47,12 @@ module VCSRuby
     end
 
     def try_parse_as_number
-      temp = @to_parse.to_i
+      temp = @to_parse.to_f
       if temp.to_s == @to_parse
         @total_seconds += temp
       end
     end
 
-    def total_seconds
-      @total_seconds
-    end
-
     def hours
       (@total_seconds.abs / 3600).to_i
     end

data/lib/tools.rb

@@ -1,5 +1,5 @@
 #
-# Dependencies
+# Various Tool Functions
 #
 
 module VCSRuby
@@ -25,7 +25,7 @@ module VCSRuby
     MagickVersion = Struct.new(:major, :minor, :revision)
     def self.magick_version
       output = %x[convert -version]
-      m = output.match /(\d+)\.(\d+)\.(\d+)(-(\d+))?/
+      m = output.match(/(\d+)\.(\d+)\.(\d+)(-(\d+))?/)
       MagickVersion.new(m[1].to_i, m[2].to_i, m[3].to_i)
     end
 

data/lib/vcs.rb

@@ -24,3 +24,4 @@ require 'MPlayer/mplayer'
 require 'MPlayer/mplayer_audio_stream'
 require 'MPlayer/mplayer_video_stream'
 require 'MPlayer/mplayer_meta_info'
+require 'MockCap/mock_capturer'

data/lib/version.info

@@ -1 +1 @@
-1.1.10
+1.1.11

data/lib/video.rb

@@ -2,8 +2,6 @@
 # Represents the video file
 #
 
-require 'vcs'
-
 module VCSRuby
   class Video
     attr_reader :config
@@ -77,7 +75,9 @@ private
 
     def capturer
       result = nil
-      if Configuration.instance.capturer == :any
+      if Configuration.instance.capturer == :mock
+        result = MockCapturer.new(self)
+      elsif Configuration.instance.capturer == :any
         result = available_capturers.first
       else
         result = available_capturers.select{ |c| c.name == Configuration.instance.capturer }.first
@@ -90,4 +90,4 @@ private
       return result
     end
   end
-end
+end

data/test/command_test.rb

@@ -0,0 +1,13 @@
+require 'minitest'
+require 'vcs'
+
+class CommandTest < Minitest::Test
+  def test_command
+    command = VCSRuby::Command.new 'test_find', 'find'
+
+    assert_equal 'test_find', command.name
+    assert command.available?, 'Command find not found'
+
+    command.execute '--help'
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,5 @@
+# file: test/test_helper.rb
+require 'minitest/autorun'
+require 'minitest/reporters'
+
+Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new

data/test/time_index_test.rb

@@ -0,0 +1,80 @@
+require 'minitest'
+require 'vcs'
+
+class TimeIndexTest < Minitest::Test
+  def test_simple_initialisation
+    time = VCSRuby::TimeIndex.new 60
+
+    assert_equal 60, time.total_seconds
+  end
+
+  def test_valid_ffmpeg_parse
+    time = VCSRuby::TimeIndex.new '00:59:59'
+
+    assert_equal 3599, time.total_seconds
+  end
+
+  def test_valid_comma_ffmpeg_parse
+    time = VCSRuby::TimeIndex.new '01:09:59.13'
+
+    assert_equal 4199.13, time.total_seconds
+    assert_equal 1, time.hours
+    assert_equal 9, time.minutes
+    assert_equal 59, time.seconds.to_i
+  end
+
+  def test_invalid_ffmpeg_parse
+    time = VCSRuby::TimeIndex.new '59:59'
+
+    assert_equal 0, time.total_seconds
+  end
+
+  def test_valid_vcs_parse
+    time = VCSRuby::TimeIndex.new '5m'
+
+    assert_equal 300, time.total_seconds
+  end
+
+  def test_complex_vcs_parse
+    time = VCSRuby::TimeIndex.new '1h 5m 17s'
+
+    assert_equal 3917, time.total_seconds
+    assert_equal 1, time.hours
+    assert_equal 5, time.minutes
+    assert_equal 17, time.seconds
+  end
+
+  def test_invalid_string_parse
+    time = VCSRuby::TimeIndex.new 'invalid'
+
+    assert_equal 0, time.total_seconds
+  end
+
+  def test_valid_string_parse
+    time = VCSRuby::TimeIndex.new '55.55'
+
+    assert_equal 55.55, time.total_seconds
+  end
+
+  def test_multiply
+    time = VCSRuby::TimeIndex.new '1m 13s'
+    five = time * 5
+
+    assert_equal "0h06m05s", five.to_s
+  end
+
+  def test_addition
+    time1 = VCSRuby::TimeIndex.new '1m 13s'
+    time2 = VCSRuby::TimeIndex.new 3600
+    total = time1 + time2
+
+    assert_equal "1:01:13", total.to_timestamp
+  end
+
+  def test_valid_substraction
+    time = VCSRuby::TimeIndex.new '3h 17m'
+    total = time - 20000
+
+    assert_equal "-2h16m20s", total.to_s
+  end
+end

data/test/video_test.rb

@@ -0,0 +1,14 @@
+require 'minitest'
+require 'vcs'
+
+class VideoTest < Minitest::Test
+  def setup
+    VCSRuby::Configuration.instance.capturer = :mock
+  end
+
+  def test_video_basic_setup
+    video = VCSRuby::Video.new 'mock.mpg'
+    assert_equal :mock, video.capturer_name
+    assert video.valid?
+  end
+end

metadata

@@ -1,80 +1,73 @@
 --- !ruby/object:Gem::Specification
 name: vcs_ruby
 version: !ruby/object:Gem::Version
-  version: 1.1.10
-  prerelease: 
+  version: 1.1.11
 platform: ruby
 authors:
 - Thomas Bruderer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-13 00:00:00.000000000 Z
+date: 2017-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '11.0'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 11.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '11.0'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 11.0.0
 description: Creates a contact sheet, a preview, of a video, usable as library or
@@ -86,60 +79,68 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/frame.rb
-- lib/video.rb
-- lib/MPlayer/mplayer_video_stream.rb
+- bin/vcs.rb
+- lib/FFmpeg/ffmpeg.rb
+- lib/FFmpeg/ffmpeg_audio_stream.rb
+- lib/FFmpeg/ffmpeg_meta_info.rb
+- lib/FFmpeg/ffmpeg_video_stream.rb
 - lib/MPlayer/mplayer.rb
 - lib/MPlayer/mplayer_audio_stream.rb
 - lib/MPlayer/mplayer_meta_info.rb
+- lib/MPlayer/mplayer_video_stream.rb
+- lib/MockCap/mock_capturer.rb
+- lib/black.yml
+- lib/capturer.rb
+- lib/command.rb
+- lib/configuration.rb
+- lib/contact_sheet.rb
+- lib/defaults.yml
+- lib/font.rb
+- lib/frame.rb
+- lib/libAV/libav.rb
 - lib/libAV/libav_audio_stream.rb
 - lib/libAV/libav_meta_info.rb
 - lib/libAV/libav_video_stream.rb
-- lib/libAV/libav.rb
-- lib/time_index.rb
-- lib/font.rb
+- lib/oldstyle.yml
 - lib/stream.rb
+- lib/time_index.rb
 - lib/tools.rb
-- lib/contact_sheet.rb
+- lib/vcs.rb
+- lib/version.info
 - lib/version.rb
+- lib/video.rb
 - lib/white.yml
-- lib/capturer.rb
-- lib/FFmpeg/ffmpeg_meta_info.rb
-- lib/FFmpeg/ffmpeg_video_stream.rb
-- lib/FFmpeg/ffmpeg.rb
-- lib/FFmpeg/ffmpeg_audio_stream.rb
-- lib/version.info
-- lib/vcs.rb
-- lib/command.rb
-- lib/black.yml
-- lib/configuration.rb
-- lib/oldstyle.yml
-- lib/defaults.yml
-- bin/vcs.rb
+- test/command_test.rb
+- test/test_helper.rb
+- test/time_index_test.rb
+- test/video_test.rb
 homepage: https://github.com/FreeApophis/vcs.rb
 licenses:
 - GPL3
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.6
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
 - libav or ffmpeg or mplayer
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.6.10
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Generates contact sheets of videos
-test_files: []
+test_files:
+- test/video_test.rb
+- test/command_test.rb
+- test/time_index_test.rb
+- test/test_helper.rb