viddl 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6c38487a2d7d5f254f6a2c578ee593a19869e92
-  data.tar.gz: 7a23f5b3d8a6e3bb71c66c60db05f22dcb142e9b
+  metadata.gz: a5ef695a66a63b6bf813c4ac3e9c2b09bf1352f7
+  data.tar.gz: 416f77293151ec5e371cff6565d5ae4d20829320
 SHA512:
-  metadata.gz: c394b34c44d1181ae5595f03ae5c66651154494b6e16c19537955bd412625d7ea46f578c5e0bb33bb4ffbdbae10c82a4737962124ca8ef3e4c3eabf903755b47
-  data.tar.gz: 0b07f0783b4028f740d320d14bc09419415b30727807c347d0dbb8a22602d74666d93c64390921623873a514768d1fc55e09ac5aba68afe42226a6d7ce6af313
+  metadata.gz: adc667e5bb6c177f82ce737548936e320871807f6e9af733e448f1cbadf8cb506671363f43b70cc4f02b4363d21d8821fa874bf383b268816f45543f72a75279
+  data.tar.gz: 18dc4a555419f405a2d7e251a36eebe85c5623ec47215af5533b5ba145b89fa0468fdce229166df59df98eba0bef62a35ac106f44657bb6b2452da588022982c

data/README.md

@@ -6,7 +6,17 @@ Use Viddl to quickly download, cut, crop and resize videos
 
 Viddl can be used at the [command line](#command-line) or in [Ruby](#ruby)
 
-It requires that both [youtube-dl](https://github.com/rg3/youtube-dl) and [ffmpeg](https://ffmpeg.org) are installed before using.
+## Installation
+
+Viddl requires that both [youtube-dl](https://github.com/rg3/youtube-dl) and [ffmpeg](https://ffmpeg.org) are installed before using.
+
+Install Viddl using gem
+
+`gem install viddl`
+
+or using Bundler by adding the following to your Gemfile
+
+`gem "viddl"`
 
 ## Usage
 

data/lib/viddl.rb

@@ -17,6 +17,6 @@ module Viddl
 
   extend self
 
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 
 end

data/lib/viddl/system.rb

@@ -7,9 +7,7 @@ module Viddl
     # Validate that the system has all of its dependencies
     # @return [Boolean]
     def validate
-      validate_ffmpeg
-      validate_youtube_dl
-      true
+      validate_ffmpeg && validate_youtube_dl
     end
 
     private
@@ -31,6 +29,7 @@ module Viddl
       if result.nil?
         raise("Viddl requires that youtube-dl be installed https://github.com/rg3/youtube-dl")
       end
+      true
     end
 
   end

data/lib/viddl/video/clip.rb

@@ -1,3 +1,5 @@
+require "pathname"
+
 require "viddl/video/clip/audio"
 require "viddl/video/clip/crop"
 require "viddl/video/clip/cut"
@@ -48,6 +50,14 @@ module Viddl
         Kernel.system(command)
       end
 
+      # Path of the created clip
+      # @return [Pathname]
+      def path
+        if !@path.nil? && File.exists?(@path)
+          @path
+        end
+      end
+
       private
 
       # Command line to create a clip from the source file and given options
@@ -64,7 +74,8 @@ module Viddl
         if options.values.compact.empty?
           # when there are no clip options, the source file can just be copied
           # over to the output file location without using ffmpeg
-          "cp #{@source_path} #{output_path}"
+          populate_output_path
+          "cp #{@source_path} #{@path.to_s}"
         else
           formatted_opts = options_formatted(options)
 
@@ -79,7 +90,8 @@ module Viddl
             module_arg_string += " -vf '#{module_filters.join(",")}'"
           end
 
-          "ffmpeg -i #{@source_path} #{module_arg_string} #{output_path(formatted_opts)}"
+          populate_output_path(formatted_opts)
+          "ffmpeg -i #{@source_path} #{module_arg_string} #{@path.to_s}"
         end
       end
 
@@ -98,7 +110,7 @@ module Viddl
         mod_options.inject(:merge)
       end
 
-      # Path of the created clip
+      # Set the clip path
       # @param [Hash] options
       # @option options [Boolean] :audio Whether to include audio
       # @option options [Numeric] :start Time in the source file where the clip starts
@@ -107,7 +119,7 @@ module Viddl
       # @option options [Integer, String] :height The desired height to resize to
       # @option options [Hash] :crop The desired crop parameters (:x, :y, :width, :height)
       # @return [String]
-      def output_path(options = {})
+      def populate_output_path(options = {})
         base = @source_path.scan(/#{Download::TEMPDIR}\/(.*)/).flatten.first
         result = base
         if !options.values.flatten.compact.empty?
@@ -119,7 +131,7 @@ module Viddl
           end
           result = "#{name}#{tokens}.#{ext}"
         end
-        result
+        @path = Pathname.new(result)
       end
 
     end

data/lib/viddl/video/download.rb

@@ -1,11 +1,13 @@
+require "tmpdir"
+
 module Viddl
 
   module Video
 
     class Download
 
-      # download is stored to /tmp before processing
-      TEMPDIR = "/tmp"
+      # download is stored to temp dir before processing
+      TEMPDIR = Dir.tmpdir
       # download format is forced to mp4 to optimize for quickness
       FORMAT_ARG = "-f 'best[ext=mp4]'"
 

data/spec/helper.rb

@@ -2,7 +2,3 @@ $:.unshift(File.join("..", "lib"))
 
 require "rspec"
 require "viddl"
-
-#RSpec.configure do |c|
-#  c.mock_with :rspec
-#end

data/spec/video/clip_spec.rb

@@ -3,7 +3,7 @@ require "helper"
 describe Viddl::Video::Clip do
 
   before(:each) do
-    @source_file = "/tmp/6g4dkBF5anU.mkv"
+    @source_file = "#{Viddl::Video::Download::TEMPDIR}/6g4dkBF5anU.mkv"
     @clip = Viddl::Video::Clip.new(@source_file)
   end
 
@@ -297,13 +297,40 @@ describe Viddl::Video::Clip do
 
   end
 
-  context "#output_path" do
+  context "#path" do
+
+    context "when file doesn't exist" do
+
+      it "returns nil" do
+        @clip.send(:populate_output_path)
+        path = @clip.path
+        expect(path).to(be_nil)
+      end
+
+    end
+
+    context "when file exists" do
+
+      it "returns nil" do
+        expect(File).to(receive(:exists?).and_return(true))
+        @clip.send(:populate_output_path)
+        path = @clip.path
+        expect(path).to_not(be_nil)
+        expect(path).to(be_kind_of(Pathname))
+        expect(path.to_s).to(eq("6g4dkBF5anU.mkv"))
+      end
+
+    end
+
+  end
+
+  context "#populate_output_path" do
 
     context "with no options" do
 
       it "matches source path file name" do
-        path = @clip.send(:output_path)
-        expect(path).to(eq("6g4dkBF5anU.mkv"))
+        path = @clip.send(:populate_output_path)
+        expect(path.to_s).to(eq("6g4dkBF5anU.mkv"))
       end
 
     end
@@ -321,8 +348,8 @@ describe Viddl::Video::Clip do
               height: 230
             }
           }
-          path = @clip.send(:output_path, options)
-          expect(path).to(eq("6g4dkBF5anU-cx200cy210cw220ch230.mkv"))
+          path = @clip.send(:populate_output_path, options)
+          expect(path.to_s).to(eq("6g4dkBF5anU-cx200cy210cw220ch230.mkv"))
         end
 
       end
@@ -337,8 +364,8 @@ describe Viddl::Video::Clip do
           options = {
             width: 640
           }
-          path = @clip.send(:output_path, options)
-          expect(path).to(eq("6g4dkBF5anU-w640.mkv"))
+          path = @clip.send(:populate_output_path, options)
+          expect(path.to_s).to(eq("6g4dkBF5anU-w640.mkv"))
         end
 
       end
@@ -349,8 +376,8 @@ describe Viddl::Video::Clip do
           options = {
             height: 480
           }
-          path = @clip.send(:output_path, options)
-          expect(path).to(eq("6g4dkBF5anU-h480.mkv"))
+          path = @clip.send(:populate_output_path, options)
+          expect(path.to_s).to(eq("6g4dkBF5anU-h480.mkv"))
         end
 
       end
@@ -362,8 +389,8 @@ describe Viddl::Video::Clip do
             width: 1280,
             height: 720
           }
-          path = @clip.send(:output_path, options)
-          expect(path).to(eq("6g4dkBF5anU-w1280h720.mkv"))
+          path = @clip.send(:populate_output_path, options)
+          expect(path.to_s).to(eq("6g4dkBF5anU-w1280h720.mkv"))
         end
 
       end
@@ -376,8 +403,8 @@ describe Viddl::Video::Clip do
         options = {
           audio: false
         }
-        path = @clip.send(:output_path, options)
-        expect(path).to(eq("6g4dkBF5anU-noaudio.mkv"))
+        path = @clip.send(:populate_output_path, options)
+        expect(path.to_s).to(eq("6g4dkBF5anU-noaudio.mkv"))
       end
 
     end
@@ -391,8 +418,8 @@ describe Viddl::Video::Clip do
             audio: true,
             start: 10
           }
-          path = @clip.send(:output_path, options)
-          expect(path).to(eq("6g4dkBF5anU-s10.mkv"))
+          path = @clip.send(:populate_output_path, options)
+          expect(path.to_s).to(eq("6g4dkBF5anU-s10.mkv"))
         end
 
       end
@@ -404,8 +431,8 @@ describe Viddl::Video::Clip do
             audio: true,
             duration: 1.5
           }
-          path = @clip.send(:output_path, options)
-          expect(path).to(eq("6g4dkBF5anU-d1.5.mkv"))
+          path = @clip.send(:populate_output_path, options)
+          expect(path.to_s).to(eq("6g4dkBF5anU-d1.5.mkv"))
         end
 
       end
@@ -418,8 +445,8 @@ describe Viddl::Video::Clip do
             duration: 12,
             start: 6
           }
-          path = @clip.send(:output_path, options)
-          expect(path).to(eq("6g4dkBF5anU-s6d12.mkv"))
+          path = @clip.send(:populate_output_path, options)
+          expect(path.to_s).to(eq("6g4dkBF5anU-s6d12.mkv"))
         end
 
       end

data/spec/video/instance_spec.rb

@@ -45,7 +45,7 @@ describe Viddl::Video::Instance do
 
     before(:each) do
       @download = Viddl::Video::Download.new(@video)
-      expect(@video).to(receive(:source_filenames).and_return(["/tmp/#{@video_id}.mkv"]))
+      expect(@video).to(receive(:source_filenames).and_return(["#{Viddl::Video::Download::TEMPDIR}/#{@video_id}.mkv"]))
     end
 
     context "with no options" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: viddl
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Ari Russo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-05 00:00:00.000000000 Z
+date: 2017-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake