vtools 1.0.1 → 1.0.2

data/Rakefile

@@ -1,28 +1,33 @@
 # -*- encoding: binary -*-
 
-require 'rake/gempackagetask'
+require "rake/gempackagetask"
 
-$LOAD_PATH.unshift 'lib'
+$LOAD_PATH.unshift "lib"
 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             = "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 >= 0.5', '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                = "https://github.com/tofir/vtools"
   s.platform                = Gem::Platform::RUBY
   s.required_ruby_version   = ">=1.9"
-  s.files                   = Dir['**/**']
-  s.executables             = ["vtools"]
-  s.test_files              = Dir["spec/*_spec.rb"]
 
-  s.add_dependency              'daemons', '>= 1.1.4'
-  s.add_dependency              'json'
-  s.add_development_dependency  'rspec'
+  s.add_dependency              "daemons", ">= 1.1.4"
+  s.add_dependency              "json"
+  s.add_development_dependency  "rspec"
 end
 
 Rake::GemPackageTask.new(spec).define

data/doc/CONFIG.md

@@ -2,12 +2,11 @@
 
 To make VTools parse config file it should be given to it with -c option:
 
-  $ vtools start -- -c config.json
+    $ vtools start -- -c config.json
 
 
 ## Format
 
-
     #system
     :ffmpeg_binary:     'ffmpeg'
     :thumb_binary:      'ffmpegthumbnailer'
@@ -20,10 +19,10 @@ To make VTools parse config file it should be given to it with -c option:
 
     #converter
     :validate_duration: false
-    :video_storage:     "/home/projects/video_storage"
+    :video_storage:     "/home/projects/storage/video"
 
     #thumbnailer
-    :thumb_storage:     "/home/projects/thumb_storage"
+    :thumb_storage:     "/home/projects/storage/thumb"
 
     #predefined video qualities
     :video_set:

data/doc/LIB_EXAMPLE.md

@@ -2,9 +2,8 @@
 
 Library can be required via `-r` option
 
-$ vtools start -- -r library
-
-$ vtools start -- -r library.rb
+    $ vtools start -- -r library
+    $ vtools start -- -r library.rb
 
 ```ruby
 # encoding: binary
@@ -12,16 +11,7 @@ $ vtools start -- -r library.rb
 
 # path generator
 VTools.path_generator("video") do |file_name|
-
-  first = file_name[0...2]
-  second = file_name[2...4]
-  # 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
+  "#{file_name[0...2]}/#{file_name[2...4]}"
 end
 
 
@@ -52,7 +42,12 @@ VTools::Storage.setup do
   # receives hash: { :data => execution_result, :action => executed_action }
   # execution_result can be video object or array with thumbnails
   send_action do |result|
-    @push.send "#{result[:action]} #{result[:data].name}" if result[:action] =~ /convert|info/
+    case result[:action]
+    when /convert|info/ # video instance here
+      @push.send "#{result[:action]} #{result[:data].name}"
+    when /thumbs/ # array with thumbs here
+      @push.send "#{result[:action]} #{result[:data]}"
+    end
   end
 end
 

data/lib/vtools/shared_methods.rb

@@ -93,7 +93,7 @@ module VTools
 
         # generate path
         begin
-          FileUtils.mkdir_p path, :mode => 775
+          FileUtils.mkdir_p path, :mode => 0755
         rescue => e
           raise FileError, "Path generator error: #{e}"
         end unless File.exists?(path)

data/lib/vtools/version.rb

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

data/spec/shared_methods_spec.rb

@@ -258,10 +258,11 @@ describe VTools::SharedMethods do
           end
 
           it "successfull" do
-            FileUtils.should_receive(:mkdir_p).and_return(nil)
+            VTools::CONFIG[:video_path_generator] = proc { "test/path" }
+            FileUtils.should_receive(:mkdir_p).with("/root/test/path", :mode => 0755).and_return(nil)
 
             expect do
-              @class.generate_path("test.filename").should == "/root"
+              @class.generate_path("test.filename").should == "/root/test/path"
             end.to_not raise_error
           end
 

data/vtools.gemspec

@@ -1,6 +1,6 @@
 # -*- encoding: binary -*-
 
-$LOAD_PATH.unshift 'lib'
+$LOAD_PATH.unshift "lib"
 require "vtools/version"
 
 Gem::Specification.new do |s|
@@ -9,21 +9,21 @@ Gem::Specification.new do |s|
   s.summary                 = "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 >= 0.5', '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.files                   = Dir["**/**"]
   s.test_files              = Dir["spec/*_spec.rb"]
   s.executables             = ["vtools"]
   s.extensions              = ["extconf.rb"]
 
-  s.version                 = VTools::VERSION.join('.')
+  s.version                 = VTools::VERSION.join(".")
   s.author                  = "tofir"
   s.email                   = "v.tofir@gmail.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'
+  s.add_dependency              "daemons", ">= 1.1.4"
+  s.add_dependency              "json"
+  s.add_development_dependency  "rspec"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vtools
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-14 00:00:00.000000000Z
+date: 2011-12-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons
-  requirement: &71995340 !ruby/object:Gem::Requirement
+  requirement: &71224370 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *71995340
+  version_requirements: *71224370
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &71995150 !ruby/object:Gem::Requirement
+  requirement: &71224070 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *71995150
+  version_requirements: *71224070
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &71994920 !ruby/object:Gem::Requirement
+  requirement: &71223700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *71994920
+  version_requirements: *71223700
 description: FFMPEG & FFMPEGTHUMBNAILER based video processor. Permits to generate
   thumbs and encode/edit video. Can be started as daemon.
 email: v.tofir@gmail.com
@@ -59,7 +59,6 @@ files:
 - extconf.rb
 - vtools.gemspec
 - setup.rb
-- VTools.project
 - Rakefile
 - README.md
 - INSTALL
@@ -124,7 +123,7 @@ requirements:
 - ffmpegthumbnailer v >= 2
 - gem Daemons v >= 1.1.4
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Daemon tools to operate the video (get info, encode & generate thumbnails).

data/VTools.project

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Komodo Project File - DO NOT EDIT -->
-<project id="6ff03cf6-d94f-4f90-922c-9d8632791140" kpf_version="4" name="VTools">
-<preference-set idref="6ff03cf6-d94f-4f90-922c-9d8632791140">
-  <string id="import_exclude_matches">*.*~;*.bak;*.tmp;CVS;.#*;*.pyo;*.pyc;.svn;*%*;tmp*.html;.DS_Store;*.project</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>