vtools 0.0.3 → 0.1.0

data/README.md

@@ -19,7 +19,7 @@ Please read changelog to check ffmpeg versions compatibility (vtools understands
 Before start, daemon should be configured correctly, to have valid access to the storage.
 Mandatory methods are: **connect**, **recv** and **send**.
 
-``` ruby
+```ruby
 #--file library.rb--#
 # encoding: binary
 
@@ -103,7 +103,7 @@ To launch daemon - is enough to require library with storage setup:
 
 By default the `logger` gem is used. But there is possibility to set custom logger, that is compatible with the default logger.
 
-``` ruby
+```ruby
 VTools.logger = CustomLoger.new($stdout)
 ```
 
@@ -112,7 +112,7 @@ VTools.logger = CustomLoger.new($stdout)
 Path generator is used by the thumnailer, converter or both to generate necessary dir tree logic for the media.
 It accepts file name and should return relative path (excluding file name itself)
 
-``` ruby
+```ruby
 # path generator (used to )
 VTools.path_generator do |file_name|
   # ..
@@ -123,7 +123,7 @@ end
 
 **Network calls** (TCP GET request, that will return message body content, ignoring response headers)
 
-``` ruby
+```ruby
 
 # http calls
 VTools.network_call "site.com/some/uri"

data/Rakefile

@@ -8,13 +8,12 @@ require "vtools/version"
 spec = Gem::Specification.new do |s|
   s.name                    = "vtools"
   s.summary                 = "Daemon tools to operate the video (get info, encode & generate thumbnails)."
-  s.description             = "Daemon tools to operate the video (get info, encode & generate thumbnails)."
-  s.extensions              = 'extconf.rb'
+  s.description             = "FFMPEG & FFMPEGTHUMBNAILER based video processor. Permits to generate thumbs and encode/edit video. Can be started as daemon."
   s.version                 = VTools::VERSION.join('.')
-  s.requirements            = ['ffmpeg v >= 1.8', 'ffmpegthumbnailer v >= 2', 'gem Daemons v >= 1.1.4']
+  s.requirements            = ['ffmpeg v >= 0.5', 'ffmpegthumbnailer v >= 2', 'gem Daemons v >= 1.1.4']
   s.author                  = "tofir"
   s.email                   = "v.tofir@gmail.com"
-  s.homepage                = "http://tofir.comuv.com"
+  s.homepage                = "https://github.com/tofir/vtools"
   s.platform                = Gem::Platform::RUBY
   s.required_ruby_version   = ">=1.9"
   s.files                   = Dir['**/**']

data/Vtools.komodoproject

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Komodo Project File - DO NOT EDIT -->
+<project id="dce3e17b-c7b8-448c-9806-1c687a505039" kpf_version="5" name="Hephaestus.komodoproject">
+<preference-set idref="dce3e17b-c7b8-448c-9806-1c687a505039">
+  <string relative="path" id="import_dirname"></string>
+  <string id="import_exclude_matches">*.*~;*.bak;*.tmp;CVS;.#*;*.pyo;*.pyc;.svn;*%*;tmp*.html;.DS_Store;.git;*.komodo*;*.kpf</string>
+  <string id="import_include_matches"></string>
+  <boolean id="import_live">1</boolean>
+  <boolean id="import_recursive">1</boolean>
+  <string id="import_type">useFolders</string>
+</preference-set>
+</project>

data/Vtools.project

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Komodo Project File - DO NOT EDIT -->
+<project id="dce3e17b-c7b8-448c-9806-1c687a505039" kpf_version="4" name="VTools">
+<preference-set idref="dce3e17b-c7b8-448c-9806-1c687a505039">
+  <string id="import_exclude_matches">*.*~;*.bak;*.tmp;CVS;.#*;*.pyo;*.pyc;.svn;*%*;tmp*.html;.DS_Store;.git;*.komodo*;*.project;*.kpf;</string>
+  <string id="import_include_matches"></string>
+  <boolean id="import_live">1</boolean>
+  <boolean id="import_recursive">1</boolean>
+  <string id="import_type">useFolders</string>
+  <string relative="path" id="rubyExtraPaths">lib</string>
+</preference-set>
+</project>

data/doc/CONFIG.md

@@ -12,24 +12,24 @@ To make VTools parse config file it should be given to it with -c option:
     :ffmpeg_binary:     'ffmpeg'
     :thumb_binary:      'ffmpegthumbnailer'
     :library:           ['lib.rb']
-   
+
     #harvester
     :max_jobs:          5
     :harvester_timer:   3  # timeout between job requests
     :temp_dir:          "/tmp"
-   
+
     #converter
     :validate_duration: false
     :video_storage:     "/home/projects/video_storage"
-   
+
     #thumbnailer
     :thumb_storage:     "/home/projects/thumb_storage"
-   
+
     #predefined video qualities
     :video_set:
         # SET_NAME    -vcodec     -acodec    -s WDTxHGT      -vb       -ab    -ar      -ac  EXT    POSTFIX   [-vpre]
         :x264_180p: [ 'libx264',  'libfaac',  '240x180',    '96k',    '64k',  22050,    2,  'mp4', '_180',   'normal'   ]
-   
+
     # predefined thumbnailer setup
     :thumb_set:
         # SET_NAME   -s   -q count start%

data/doc/HOOKS.md

@@ -17,7 +17,7 @@ Multiple actions can be attached for a single hook.
 * thumb_success (video, thumbs_array)
 * thumb_error (video, errors)
 
-``` ruby
+```ruby
 # multiple hooks setup
 VTools::Handler.collection do
   set :in_convert do |video|

data/doc/LIB_EXAMPLE.md

@@ -7,43 +7,56 @@ $ vtools start -- -r library
 $ vtools start -- -r library.rb
 
 ```ruby
-# -*- encoding: binary -*-
+# encoding: binary
+
 
 # path generator
-VTools.path_generator do |file_name|
+VTools.path_generator("video") do |file_name|
 
-  storage_path = VTools::CONFIG[:PWD] + "/../test_storage"
   first = file_name[0...2]
   second = file_name[2...4]
-  # create all parent dirs (storage... path .. ) ???
-  if (error = `mkdir -p #{storage_path}/#{first}/#{second}`).empty?
-    "#{storage_path}/#{first}/#{second}"
+  # create all parent dirs (storage... path .. )
+  error = `mkdir -p #{VTools::CONFIG[:video_storage]}/#{first}/#{second}`
+  if error.empty?
+    "#{first}/#{second}"
   else
     raise Exception, "Can't create storage dirs (#{error})"
   end
 end
 
-# storage setup
+
+# setup storage:
 VTools::Storage.setup do
 
+  # connection setup
   connect_action do
-    @mq = MQ.new
-    print "----------- connected to the MQ -------\n"
+    require "zmq"
+    @mq = ZMQ::Context.new(1)
+
+    @pull = @mq.socket(ZMQ::PULL)
+    @push = @mq.socket(ZMQ::PUSH)
+
+    # connect to the mq fibers
+    @pull.bind("tcp://*:4440");
+    @push.connect("tcp://*:5555");
   end
 
-  # recieve data for processing
+  # message reciever
+  # should return JSON encoded string
+  # see complete storage setup reference for details
   recv_action do
-    job = @mq.recv
-    setup = "{\"set\" : \"flv_240p\", \"acodec\" : \"#{job}\" }"
-    "{\"action\" : \"#{action}\", \"file\" : \"#{file}\", \"setup\" : #{setup} }"
+    @pull.recv
   end
 
+  # message sender
+  # receives hash: { :data => execution_result, :action => executed_action }
+  # execution_result can be video object or array with thumbnails
   send_action do |result|
-    @mq.send "video.success #{result[:action]} "
-    print "----------------> 'terminated' MQ sent (#{result[:data].to_json}) - action #{result[:action]}\n"
+    @push.send "#{result[:action]} #{result[:data].name}"
   end
 end
 
+
 # hooks
 VTools::Handler.collection do
 

data/extconf.rb

@@ -0,0 +1,10 @@
+# -*- encoding: binary -*-
+
+require 'mkmf'
+
+if find_executable("ffmpeg") || find_executable("ffmpegthumbnailer")
+  create_makefile("VTools")
+else
+  stars = "#{"*" * 10}"
+  puts "", stars, "No ffmpeg / ffmpegthumbnailer support available.", stars
+end

data/lib/vtools/config.rb

@@ -6,25 +6,28 @@ module VTools
   CONFIG = {
 
     # system environment
-    :PWD              => Dir.getwd,
-    :library          => [],
-    :logging          => nil,
-    :log_file         => nil,
-    :config_file      => nil,
-    :ffmpeg_binary    => '/usr/bin/ffmpeg',
-    :thumb_binary     => '/usr/bin/ffmpegthumbnailer',
+    :PWD                  => Dir.getwd,
+    :library              => [],
+    :logging              => nil,
+    :log_file             => nil,
+    :config_file          => nil,
+    :ffmpeg_binary        => '/usr/bin/ffmpeg',
+    :thumb_binary         => '/usr/bin/ffmpegthumbnailer',
 
     # harvester
-    :max_jobs         => 5,
-    :store_jobs       => 10,
-    :harvester_timer  => 3,
-    :temp_dir         => '',
+    :max_jobs             => 5,
+    :store_jobs           => 10,
+    :harvester_timer      => 3,
+    :temp_dir             => '',
 
     # converter
-    :video_storage    => nil,
-    :validate_duration => nil,
+    :video_storage        => '',
+    :video_path_generator => nil,
+    :validate_duration    => nil,
+
     # thumbnailer
-    :thumb_storage    => nil,
+    :thumb_storage        => '',
+    :thumb_path_generator => nil,
 
     # predefined video qualities
     :video_set => {
@@ -61,7 +64,7 @@ module VTools
       :w600 => [600, 10, 5, 0],
     }
   }
-  
+
   # parse external config file
   def CONFIG.load!
     begin
@@ -72,7 +75,7 @@ module VTools
       raise ConfigError, "Invalid config data #{e}"
     end if self[:config_file]
   end
-  
+
   # merge config data
   def CONFIG.append! data
     direct = [:ffmpeg_binary, :thumb_binary, :max_jobs, :store_jobs,

data/lib/vtools/convert_options.rb

@@ -94,14 +94,14 @@ module VTools
       hash[:t] = hash[:duration] if hash[:duration]
 
       dimmensions = hash[:resolution] ||
-        ("#{hash[:width]}x#{hash[:height]}" if hash[:width] && hash[:height]) ||
+        ("#{hash[:width].to_i}x#{hash[:height].to_i}" if hash[:width] && hash[:height]) ||
         hash[:s]
 
       if dimmensions
         # recreate dimmensions dimmensions
         if hash[:preserve_aspect]
           width, height = recalculate dimmensions
-          dimmensions = "#{width}x#{height}"
+          dimmensions = "#{width.to_i}x#{height.to_i}"
         end
 
         hash[:s] = dimmensions
@@ -114,7 +114,7 @@ module VTools
     def recalculate dimm
       width, height = dimm.split("x").map(&:to_f)
 
-      return [width, height] unless self[:aspect]
+      return [width, height].map(&:to_i) unless self[:aspect]
 
       # width main:
       if self[:aspect] > 1

data/lib/vtools/errors.rb

@@ -3,19 +3,23 @@
 # VTools exceptions
 module VTools
 
+  # basic error
+  class Error < Exception
+  end
+
   # confuguration error
-  class ConfigError < ArgumentError
+  class ConfigError < Error
   end
 
   # specified file does not exist
-  class FileError < Errno::ENOENT
+  class FileError < Error
   end
 
   # invalid video format
-  class FormatError < IOError
+  class FormatError < Error
   end
 
   # invalid video format
-  class ProcessError < IOError
+  class ProcessError < Error
   end
 end # VTools

data/lib/vtools/shared_methods.rb

@@ -8,7 +8,7 @@ module VTools
     module Common
 
       @@logger = nil
-  
+
       # custom logger
       def logger= logger
         @@logger = logger
@@ -16,7 +16,7 @@ module VTools
 
       # logger mechanics
       def log level, message = ""
-  
+
         if CONFIG[:logging]
           unless @@logger
             output = CONFIG[:log_file] || STDOUT
@@ -28,7 +28,7 @@ module VTools
           @@logger.send(level, message) if @@logger
         end
       end
-      
+
       # converts json to the ruby object
       # returns nil on invalid JSON
       def json_to_obj json_str
@@ -78,18 +78,28 @@ module VTools
 
       # function to create correct subdirectories to the file
       def generate_path file_name, scope = "video"
-        storage = CONFIG[:"#{scope}_storage"]
-        return instance_exec(file_name, &storage) if storage.is_a? Proc
-        (!storage || storage.empty? ? CONFIG[:PWD] : storage).to_s.strip.gsub(%r#/$#, '')
+        generator = CONFIG[:"#{scope}_path_generator"]
+        begin
+          generator = instance_exec(file_name, &generator).to_s if generator.is_a? Proc
+        rescue => e
+          generator = nil
+          raise ConfigError, "Path generator error (#{e})"
+        end
+
+        storage = CONFIG[:"#{scope}_storage"].to_s
+        storage += "/" unless storage.empty?
+        storage += generator || ""
+
+        (!storage || storage.empty? ? CONFIG[:PWD] : storage).to_s.strip.gsub(%r#/+#, '/').gsub(%r#/$#, '')
       end
 
       # path generator setter
       def path_generator scope = nil, &block
         if scope
           scope = "thumb" unless scope == "video"
-          CONFIG[:"#{scope}_storage"] = block
+          CONFIG[:"#{scope}_path_generator"] = block
         else
-          CONFIG[:thumb_storage] = CONFIG[:video_storage] = block
+          CONFIG[:thumb_path_generator] = CONFIG[:video_path_generator] = block
         end if block_given?
       end
 

data/lib/vtools/thumbs_options.rb

@@ -42,7 +42,7 @@ module VTools
 
       params.join " "
     end
-    
+
     # options parser
     def parse! options
 

data/lib/vtools/version.rb

@@ -2,5 +2,5 @@
 
 # current version
 module VTools
-  VERSION = [ 0, 0, 3 ]
+  VERSION = [ 0, 1, 0 ]
 end

data/lib/vtools/video.rb

@@ -3,7 +3,7 @@
 module VTools
 
   # Video instance
-  class Video 
+  class Video
 
     attr_reader :path, :name, :duration, :start, :bitrate,
                 :video_stream, :video_codec, :video_bitrate, :colorspace, :frame_rate,

data/spec/convert_options_spec.rb

@@ -155,7 +155,7 @@ describe VTools::ConvertOptions do
       @options.method(:perform).call values
       values[:s].should be nil
     end
-  end  
+  end
 
   context "#parse!" do
 
@@ -205,7 +205,7 @@ describe VTools::ConvertOptions do
       expect {@options.method(:parse!).call(123) }.to raise_error VTools::ConfigError
       expect {@options.method(:parse!).call("nonexistent") }.to raise_error VTools::ConfigError
     end
-  end  
+  end
 
   context "#recalculate" do
 
@@ -271,7 +271,7 @@ describe VTools::ConvertOptions do
         height.should == result[1]
       end
     end
-  end  
+  end
 
   context "#initialize" do
     it "valid calls methods" do

data/spec/converter_spec.rb

@@ -78,7 +78,7 @@ describe VTools::Converter do
 
       @converter.run
     end
-    
+
     context "fails encoding" do
 
       it "--no time received" do

data/spec/errors_spec.rb

@@ -8,32 +8,40 @@ require "errors"
 
 describe VTools do
 
+  # specs
+  context "#VToolsError" do
+
+    it "valid exception tree" do
+      expect { raise VTools::Error }.to raise_error Exception
+    end
+  end
+
   # specs
   context "#ConfigError" do
 
     it "valid exception tree" do
-      expect { raise VTools::ConfigError }.to raise_error ArgumentError
+      expect { raise VTools::ConfigError }.to raise_error VTools::Error
     end
   end
 
   context "#FileError" do
 
     it "valid exception tree" do
-      expect { raise VTools::FileError }.to raise_error Errno::ENOENT
+      expect { raise VTools::FileError }.to raise_error VTools::Error
     end
   end
 
   context "#FormatError" do
 
     it "valid exception tree" do
-      expect { raise VTools::FormatError }.to raise_error IOError
+      expect { raise VTools::FormatError }.to raise_error VTools::Error
     end
   end
 
   context "#ProcessError" do
 
     it "valid exception tree" do
-      expect { raise VTools::ProcessError }.to raise_error IOError
+      expect { raise VTools::ProcessError }.to raise_error VTools::Error
     end
   end
 end

data/spec/handler_spec.rb

@@ -25,7 +25,7 @@ describe VTools::Handler do
         :action_one => [ block ], :action_two => [ other_block ]
       }
     end
-    
+
     it "skips set when no block given" do
       @handler.set :action_one
       @handler.set :action_one

data/spec/job_spec.rb

@@ -68,7 +68,7 @@ describe VTools::Job do
   context "#validate" do
 
     it "accepts options" do
-      
+
       ["convert", "thumbs", "info"].each do |action|
         conf = config.dup
         conf.action = action
@@ -84,7 +84,7 @@ describe VTools::Job do
         expect { @job.validate(conf) }.to raise_error VTools::ConfigError, message_rx
       end
 
-      
+
       ["convert", "thumbs", "info"].each do |action|
         # empty config
         conf = OpenStruct.new({})

data/spec/options_spec.rb

@@ -5,21 +5,21 @@ describe VTools::Options do
 
   # hooks
   before :all do
-    
+
   end
 
   # around to test inside the methods
 
   before do
-    
+
   end
 
   after do
-    
+
   end
 
   after :all do
-    
+
   end
 
   # specs

data/spec/shared_methods_spec.rb

@@ -57,7 +57,7 @@ describe VTools::SharedMethods do
 
         @class.logger = tester
         tester.should_not_receive :send
-        
+
         @class.log :test, "test"
       end
 
@@ -148,7 +148,7 @@ describe VTools::SharedMethods do
 
       let(:sock) { double nil }
       let(:tcp_request) { "GET / HTTP/1.0\r\n\r\n" }
-      
+
       def validate_request body
         sock.should_receive(:print).with( tcp_request ).once
         sock.should_receive(:read).once.and_return "headers\r\n\r\n#{body}"
@@ -209,8 +209,24 @@ describe VTools::SharedMethods do
           "test/path"
         end
 
-        VTools::CONFIG[:video_storage] = prc
-        @class.generate_path("test.filename", "video").should == "test/path"
+        VTools::CONFIG[:video_storage] = '/root/'
+        VTools::CONFIG[:video_path_generator] = prc
+        @class.generate_path("test.filename", "video").should == "/root/test/path"
+
+        VTools::CONFIG[:thumb_storage] = 'root'
+        VTools::CONFIG[:thumb_path_generator] = prc
+        @class.generate_path("test.filename", "thumb").should == "root/test/path"
+      end
+
+      it "raises exception on invalid block" do
+        prc = proc do
+          CONFIG[:thumb_storage]
+        end
+
+        VTools::CONFIG[:video_path_generator] = prc
+        expect do
+          @class.generate_path("test.filename", "video").should == "/root/test/path"
+        end.to raise_error VTools::ConfigError, /Path generator error/
       end
     end
 
@@ -219,42 +235,45 @@ describe VTools::SharedMethods do
       before do
         VTools::CONFIG[:video_storage] = nil
         VTools::CONFIG[:thumb_storage] = nil
+        VTools::CONFIG[:thumb_path_generator] = nil
+        VTools::CONFIG[:video_path_generator] = nil
       end
 
       let(:block) { proc { nil } }
 
       it "appends generator to thumbs" do
         @class.path_generator "thumb", &block
-        VTools::CONFIG[:thumb_storage].should == block
+        VTools::CONFIG[:thumb_path_generator].should == block
+        VTools::CONFIG[:video_path_generator].should be nil
       end
 
       it "appends generator to thumbs (invalid placeholedr given)" do
         @class.path_generator "invalid", &block
-        VTools::CONFIG[:thumb_storage].should == block
-        VTools::CONFIG[:video_storage].should be nil
+        VTools::CONFIG[:thumb_path_generator].should == block
+        VTools::CONFIG[:video_path_generator].should be nil
       end
 
       it "appends generator to video" do
         @class.path_generator "video", &block
-        VTools::CONFIG[:video_storage].should == block
-        VTools::CONFIG[:thumb_storage].should be nil
+        VTools::CONFIG[:video_path_generator].should == block
+        VTools::CONFIG[:thumb_path_generator].should be nil
       end
 
       it "appends generator to both (default)" do
         @class.path_generator &block
-        VTools::CONFIG[:video_storage].should == block
-        VTools::CONFIG[:thumb_storage].should == block
+        VTools::CONFIG[:video_path_generator].should == block
+        VTools::CONFIG[:thumb_path_generator].should == block
       end
 
       it "skips generator appending" do
         @class.path_generator
-        VTools::CONFIG[:video_storage].should be nil
-        VTools::CONFIG[:thumb_storage].should be nil
+        VTools::CONFIG[:video_path_generator].should be nil
+        VTools::CONFIG[:thumb_path_generator].should be nil
       end
     end
 
     context "#fix_encoding" do
-      
+
       it "fixes encoding" do
         path = "#{File.realpath(File.dirname(__FILE__))}/fixtures/outputs/"
         source = File.open("#{path}file_with_iso-8859-1.txt", "r").read

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 # -*- encoding: binary -*-
- 
+
 ["..", "../../lib", "../../lib/vtools"].each do |path|
   dir = File.expand_path(path, __FILE__)
   $:.unshift dir if dir and not $:.include?(dir)

data/spec/storage_spec.rb

@@ -99,7 +99,7 @@ describe VTools::Storage do
   context "#fails" do
     it "raises error with valid message" do
       expect do
-        VTools::Storage.method(:fails).call("test_method") 
+        VTools::Storage.method(:fails).call("test_method")
       end.to raise_error NotImplementedError, "VTools::Storage#test_method_action must be set"
     end
   end

data/spec/thumbnailer_spec.rb

@@ -66,7 +66,7 @@ describe VTools::Thumbnailer do
     end
 
     it "creates thumb with postfix and offset" do
-      
+
       @options = {:thumb_count => 1, :thumb_start_point => 3, :postfix => "test.postfix"}
       prepare_thumbnailer
 

data/spec/thumbs_options_spec.rb

@@ -91,7 +91,7 @@ describe VTools::ThumbsOptions do
     it "converts valid data" do
       values = { :quality => 5, :width => 600, :time => 123 }
       @options.method(:perform).call values
-      
+
       values[:q].should == values[:quality]
       values[:s].should == values[:width]
       values[:t].should == values[:t]

data/vtools.gemspec

@@ -7,21 +7,22 @@ Gem::Specification.new do |s|
 
   s.name                    = "vtools"
   s.summary                 = "Daemon tools to operate the video (get info, encode & generate thumbnails)."
-  s.description             = "Daemon tools to operate the video (get info, encode & generate thumbnails)."
+  s.description             = "FFMPEG & FFMPEGTHUMBNAILER based video processor. Permits to generate thumbs and encode/edit video. Can be started as daemon."
 
-  s.requirements            = ['ffmpeg v >= 1.8', 'ffmpegthumbnailer v >= 2', 'gem Daemons v >= 1.1.4']
+  s.requirements            = ['ffmpeg v >= 0.5', 'ffmpegthumbnailer v >= 2', 'gem Daemons v >= 1.1.4']
 
   s.files                   = Dir['**/**']
   s.test_files              = Dir["spec/*_spec.rb"]
   s.executables             = ["vtools"]
+  s.extensions              = ["extconf.rb"]
 
   s.version                 = VTools::VERSION.join('.')
   s.author                  = "tofir"
   s.email                   = "v.tofir@gmail.com"
-  s.homepage                = "http://tofir.comuv.com"
+  s.homepage                = "https://github.com/tofir/vtools"
   s.platform                = Gem::Platform::RUBY
   s.required_ruby_version   = ">=1.9"
-  
+
   s.add_dependency              'daemons', '>= 1.1.4'
   s.add_dependency              'json'
   s.add_development_dependency  'rspec'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vtools
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-24 00:00:00.000000000Z
+date: 2011-12-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons
-  requirement: &79494300 !ruby/object:Gem::Requirement
+  requirement: &82591300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *79494300
+  version_requirements: *82591300
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &79494110 !ruby/object:Gem::Requirement
+  requirement: &82591110 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *79494110
+  version_requirements: *82591110
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &79493880 !ruby/object:Gem::Requirement
+  requirement: &82590880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,60 +43,65 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *79493880
-description: Daemon tools to operate the video (get info, encode & generate thumbnails).
+  version_requirements: *82590880
+description: FFMPEG & FFMPEGTHUMBNAILER based video processor. Permits to generate
+  thumbs and encode/edit video. Can be started as daemon.
 email: v.tofir@gmail.com
 executables:
 - vtools
-extensions: []
+extensions:
+- extconf.rb
 extra_rdoc_files: []
 files:
+- extconf.rb
+- vtools.gemspec
+- Rakefile
+- vtools-0.1.0.gem
+- INSTALL
+- doc/HOOKS.md
+- doc/LIB_EXAMPLE.md
+- doc/CONFIG.md
 - bin/vtools
 - README.md
-- Rakefile
-- lib/vtools.rb
-- lib/vtools/video.rb
-- lib/vtools/harvester.rb
+- Vtools.komodoproject
 - lib/vtools/storage.rb
-- lib/vtools/converter.rb
-- lib/vtools/version.rb
+- lib/vtools/options.rb
 - lib/vtools/errors.rb
-- lib/vtools/job.rb
 - lib/vtools/convert_options.rb
+- lib/vtools/version.rb
+- lib/vtools/video.rb
 - lib/vtools/thumbnailer.rb
 - lib/vtools/shared_methods.rb
-- lib/vtools/handler.rb
+- lib/vtools/converter.rb
+- lib/vtools/harvester.rb
 - lib/vtools/config.rb
-- lib/vtools/options.rb
 - lib/vtools/thumbs_options.rb
-- INSTALL
-- spec/job_spec.rb
-- spec/convert_options_spec.rb
-- spec/fixtures/outputs/file_with_start_value.txt
-- spec/fixtures/outputs/file_with_surround_sound.txt
-- spec/fixtures/outputs/file_with_iso-8859-1.txt
-- spec/fixtures/outputs/file_with_no_audio.txt
-- spec/fixtures/outputs/file_with_non_supported_audio.txt
-- spec/config_spec.rb
+- lib/vtools/job.rb
+- lib/vtools/handler.rb
+- lib/vtools.rb
+- setup.rb
+- Vtools.project
+- LICENSE
+- spec/thumbs_options_spec.rb
+- spec/handler_spec.rb
+- spec/shared_methods_spec.rb
 - spec/harvester_spec.rb
+- spec/video_spec.rb
 - spec/storage_spec.rb
 - spec/errors_spec.rb
-- spec/handler_spec.rb
-- spec/converter_spec.rb
-- spec/video_spec.rb
-- spec/spec_helper.rb
+- spec/convert_options_spec.rb
+- spec/config_spec.rb
+- spec/job_spec.rb
 - spec/thumbnailer_spec.rb
+- spec/fixtures/outputs/file_with_start_value.txt
+- spec/fixtures/outputs/file_with_non_supported_audio.txt
+- spec/fixtures/outputs/file_with_no_audio.txt
+- spec/fixtures/outputs/file_with_surround_sound.txt
+- spec/fixtures/outputs/file_with_iso-8859-1.txt
 - spec/options_spec.rb
-- spec/shared_methods_spec.rb
-- spec/thumbs_options_spec.rb
-- doc/HOOKS.md
-- doc/LIB_EXAMPLE.md
-- doc/CONFIG.md
-- LICENSE
-- vtools-0.0.2.gem
-- setup.rb
-- vtools.gemspec
-homepage: http://tofir.comuv.com
+- spec/spec_helper.rb
+- spec/converter_spec.rb
+homepage: https://github.com/tofir/vtools
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -115,25 +120,25 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- ffmpeg v >= 1.8
+- ffmpeg v >= 0.5
 - ffmpegthumbnailer v >= 2
 - gem Daemons v >= 1.1.4
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: Daemon tools to operate the video (get info, encode & generate thumbnails).
 test_files:
-- spec/job_spec.rb
-- spec/convert_options_spec.rb
-- spec/config_spec.rb
+- spec/thumbs_options_spec.rb
+- spec/handler_spec.rb
+- spec/shared_methods_spec.rb
 - spec/harvester_spec.rb
+- spec/video_spec.rb
 - spec/storage_spec.rb
 - spec/errors_spec.rb
-- spec/handler_spec.rb
-- spec/converter_spec.rb
-- spec/video_spec.rb
+- spec/convert_options_spec.rb
+- spec/config_spec.rb
+- spec/job_spec.rb
 - spec/thumbnailer_spec.rb
 - spec/options_spec.rb
-- spec/shared_methods_spec.rb
-- spec/thumbs_options_spec.rb
+- spec/converter_spec.rb