vtools 1.0.0 → 1.0.1

data/lib/vtools.rb

@@ -13,6 +13,7 @@ module VTools
   require 'ostruct'
   require 'open3'
   require 'logger'
+  require "fileutils"
 
   require 'vtools/version'
   require 'vtools/errors'

data/lib/vtools/converter.rb

@@ -46,9 +46,7 @@ module VTools
               time = 0.0
             end
             progress = time / @video.duration
-
-            # callbacks
-            Hook.exec :in_convert, @video, progress
+            Hook.exec :in_convert, @video, progress # callbacks
           end
         end
       end

data/lib/vtools/shared_methods.rb

@@ -1,7 +1,6 @@
 # -*- encoding: binary -*-
 
 module VTools
-
   # shared methods
   module SharedMethods
     # both static & instance bindings
@@ -83,14 +82,22 @@ module VTools
           generator = instance_exec(file_name, &generator).to_s if generator.is_a? Proc
         rescue => e
           generator = nil
-          raise ConfigError, "Path generator error (#{e})"
+          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#/$#, '')
+        path = (!storage || storage.empty? ? CONFIG[:PWD] : storage).to_s.strip.gsub(%r#/+#, '/').gsub(%r#/$#, '')
+
+        # generate path
+        begin
+          FileUtils.mkdir_p path, :mode => 775
+        rescue => e
+          raise FileError, "Path generator error: #{e}"
+        end unless File.exists?(path)
+        path
       end
 
       # path generator setter

data/lib/vtools/thumbnailer.rb

@@ -41,7 +41,6 @@ module VTools
           # save thumb if no error
           if (error = lines).empty?
             thumbs << thumb = {:path => file, :offset => time_offset(seconds)}
-
             Hook.exec :in_thumb, @video, thumb # callbacks
           else
             errors << "#{error} (#{file})"

data/lib/vtools/version.rb

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

data/spec/shared_methods_spec.rb

@@ -140,7 +140,7 @@ describe VTools::SharedMethods do
         VTools::CONFIG[:test_index] = "test.value"
 
         @class.config(:test_index).should == "test.value"
-        @class.config(:nonexistent_index).should be nil
+        @class.config(:nonexistent_index).should_not be
       end
     end
 
@@ -182,93 +182,135 @@ describe VTools::SharedMethods do
       end
     end
 
-    context "#generate_path" do
+    context "paths generator" do
 
-      it "returns valid string" do
-        VTools::CONFIG[:video_storage] = "test/path/"
-        VTools::CONFIG[:thumb_storage] = "/thumb/path"
+      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
 
-        @class.generate_path("test.filename").should == "test/path"
-        @class.generate_path("test.filename", "thumb").should == "/thumb/path"
+      context "#generate_path" do
 
-        VTools::CONFIG[:thumb_storage] = ''
+        before do
+          File.stub(:exists?).and_return(true)
+          VTools::CONFIG[:PWD] = ""
+        end
 
-        VTools::CONFIG[:PWD] = "test/pwd"
-        @class.generate_path("test.filename", "thumb").should == "test/pwd"
+        context "using string path from" do
+          it "config storage" do
+            VTools::CONFIG[:video_storage] = "test/path/"
+            VTools::CONFIG[:thumb_storage] = "/thumb/path"
 
-        VTools::CONFIG[:PWD] = nil
-        VTools::CONFIG[:thumb_storage] = nil
+            @class.generate_path("test.filename").should == "test/path"
+            @class.generate_path("test.filename", "thumb").should == "/thumb/path"
+          end
 
-        @class.generate_path("test.filename", "thumb").should == ""
-      end
+          it "CONFIG[:PWD]" do
 
-      it "executes block" do
-        prc = proc do |file|
-          file.should == "test.filename"
-          self.class.should == Tested
-          "test/path"
+            VTools::CONFIG[:thumb_storage] = ''
+            VTools::CONFIG[:PWD] = "test/pwd"
+            @class.generate_path("test.filename", "thumb").should == "test/pwd"
+            @class.generate_path("test.filename").should == "test/pwd"
+          end
+
+          it "empty set" do
+            @class.generate_path("test.filename").should == ""
+          end
         end
 
-        VTools::CONFIG[:video_storage] = '/root/'
-        VTools::CONFIG[:video_path_generator] = prc
-        @class.generate_path("test.filename", "video").should == "/root/test/path"
+        context "using callback" do
+
+          let(:failed_prc) { proc { CONFIG[:thumb_storage] } }
+          let(:prc) {
+            proc do |file|
+              file.should == "test.filename"
+              self.class.should == Tested
+              "test/path"
+            end
+          }
+
+
+          it "executes block" do
+            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
+            VTools::CONFIG[:video_path_generator] = failed_prc
+            expect do
+              @class.generate_path("test.filename", "video")
+            end.to raise_error VTools::ConfigError, /Path generator error/
+          end
+        end
 
-        VTools::CONFIG[:thumb_storage] = 'root'
-        VTools::CONFIG[:thumb_path_generator] = prc
-        @class.generate_path("test.filename", "thumb").should == "root/test/path"
-      end
+        context "creates path" do
 
-      it "raises exception on invalid block" do
-        prc = proc do
-          CONFIG[:thumb_storage]
-        end
+          before do
+            File.stub(:exists?).and_return(false)
+            VTools::CONFIG[:video_storage] = "/root/"
+          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
+          it "successfull" do
+            FileUtils.should_receive(:mkdir_p).and_return(nil)
 
-    context "#path_generator" do
+            expect do
+              @class.generate_path("test.filename").should == "/root"
+            end.to_not raise_error
+          end
 
-      before do
-        VTools::CONFIG[:video_storage] = nil
-        VTools::CONFIG[:thumb_storage] = nil
-        VTools::CONFIG[:thumb_path_generator] = nil
-        VTools::CONFIG[:video_path_generator] = nil
+          it "with error" do
+            FileUtils.should_receive(:mkdir_p).and_return do
+              raise Errno::EACCES, "Permission denied"
+            end
+
+            expect do
+              @class.generate_path("test.filename")
+            end.to raise_error VTools::FileError, /Path generator error: /
+          end
+        end
       end
 
-      let(:block) { proc { nil } }
+      context "#path_generator appended to" do
 
-      it "appends generator to thumbs" do
-        @class.path_generator "thumb", &block
-        VTools::CONFIG[:thumb_path_generator].should == block
-        VTools::CONFIG[:video_path_generator].should be nil
-      end
+          let(:block_stub) { proc {nil} }
 
-      it "appends generator to thumbs (invalid placeholedr given)" do
-        @class.path_generator "invalid", &block
-        VTools::CONFIG[:thumb_path_generator].should == block
-        VTools::CONFIG[:video_path_generator].should be nil
-      end
+        it "thumbs only" do
+          @class.path_generator "thumbs path", &block_stub
+          VTools::CONFIG[:thumb_path_generator].should == block_stub
+          VTools::CONFIG[:video_path_generator].should_not be
+        end
 
-      it "appends generator to video" do
-        @class.path_generator "video", &block
-        VTools::CONFIG[:video_path_generator].should == block
-        VTools::CONFIG[:thumb_path_generator].should be nil
-      end
+        it "thumbs path only (invalid placeholedr given)" do
+          @class.path_generator "invalid", &block_stub
+          VTools::CONFIG[:thumb_path_generator].should == block_stub
+          VTools::CONFIG[:video_path_generator].should_not be
+        end
 
-      it "appends generator to both (default)" do
-        @class.path_generator &block
-        VTools::CONFIG[:video_path_generator].should == block
-        VTools::CONFIG[:thumb_path_generator].should == block
-      end
+        it "video path" do
+          @class.path_generator "video", &block_stub
+          VTools::CONFIG[:video_path_generator].should == block_stub
+          VTools::CONFIG[:thumb_path_generator].should_not be
+        end
+
+        it "both paths (default)" do
+          @class.path_generator &block_stub
+          [:video_path_generator, :thumb_path_generator].each do |index|
+            VTools::CONFIG[index].should == block_stub
+          end
+        end
 
-      it "skips generator appending" do
-        @class.path_generator
-        VTools::CONFIG[:video_path_generator].should be nil
-        VTools::CONFIG[:thumb_path_generator].should be nil
+        it "nothing" do
+          @class.path_generator
+          VTools::CONFIG[:video_path_generator].should_not be
+          VTools::CONFIG[:thumb_path_generator].should_not be
+        end
       end
     end
 

data/spec/spec_helper.rb

@@ -10,7 +10,6 @@ require "rspec"
 require "stringio"
 
 # helpers utilities
-#
 module Helpers
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vtools
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons
-  requirement: &79436730 !ruby/object:Gem::Requirement
+  requirement: &71995340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *79436730
+  version_requirements: *71995340
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &79436540 !ruby/object:Gem::Requirement
+  requirement: &71995150 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *79436540
+  version_requirements: *71995150
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &79436310 !ruby/object:Gem::Requirement
+  requirement: &71994920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *79436310
+  version_requirements: *71994920
 description: FFMPEG & FFMPEGTHUMBNAILER based video processor. Permits to generate
   thumbs and encode/edit video. Can be started as daemon.
 email: v.tofir@gmail.com