viddl 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5ef695a66a63b6bf813c4ac3e9c2b09bf1352f7
-  data.tar.gz: 416f77293151ec5e371cff6565d5ae4d20829320
+  metadata.gz: 6b07f12926474b14cea4f3d36255ccfcd0d9b12b
+  data.tar.gz: 2058b3dc1af7197158eacdddffbf88e979383c0e
 SHA512:
-  metadata.gz: adc667e5bb6c177f82ce737548936e320871807f6e9af733e448f1cbadf8cb506671363f43b70cc4f02b4363d21d8821fa874bf383b268816f45543f72a75279
-  data.tar.gz: 18dc4a555419f405a2d7e251a36eebe85c5623ec47215af5533b5ba145b89fa0468fdce229166df59df98eba0bef62a35ac106f44657bb6b2452da588022982c
+  metadata.gz: 99e34cc08878f9e6c6193925bb6456481fb28ec07689c608f0b0e6f66e5d9c9fd75da9f5f267b16f23d0cd2ec78a206465751c54456e097b8ad825c7e4412bc2
+  data.tar.gz: 0d498f7807d838375aecf08408b329ba61704846d364a39008b22c320aa19ec8c338f5006e1ce18717d63b5f3a5b1c6d1101b1cec0f3523c98273b91cbbf74ad

data/README.md

@@ -96,7 +96,8 @@ options = {
     height: 40
   },
   width: 640,
-  height: 480
+  height: 480,
+  output_path: "assets/video"
 }
 
 video = Viddl::Video.download("https://www.youtube.com/watch?v=6g4dkBF5anU")

data/bin/viddl

@@ -67,6 +67,12 @@ opts = OptionParser.new do |opts|
 
   opts.on_tail("--help", "Show this message") { help(opts) }
 
+  # file
+
+  opts.on("-oPATH", "--output-path=PATH", "Output path") do |path|
+    options[:output_path] = path
+  end
+
 end
 opts.parse!
 

data/lib/viddl.rb

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

data/lib/viddl/video/clip.rb

@@ -23,6 +23,7 @@ module Viddl
       # @option options [Integer, String] :width The desired width to resize to
       # @option options [Integer, String] :height The desired height to resize to
       # @option options [Hash] :crop The desired crop parameters (:x, :y, :width, :height)
+      # @option options [Pathname, String] :output_path Path where clip will be written
       # @return [Clip]
       def self.process(path, options = {})
         clip = new(path)
@@ -44,14 +45,15 @@ module Viddl
       # @option options [Integer, String] :width The desired width to resize to
       # @option options [Integer, String] :height The desired height to resize to
       # @option options [Hash] :crop The desired crop parameters (:x, :y, :width, :height)
+      # @option options [Pathname, String] :output_path Path where clip will be written
       # @return [Boolean]
       def process(options = {})
         command = command_line(options)
         Kernel.system(command)
       end
 
-      # Path of the created clip
-      # @return [Pathname]
+      # Path of the created clip. Is nil until file exists
+      # @return [Pathname, nil]
       def path
         if !@path.nil? && File.exists?(@path)
           @path
@@ -69,6 +71,7 @@ module Viddl
       # @option options [Integer, String] :width The desired width to resize to
       # @option options [Integer, String] :height The desired height to resize to
       # @option options [Hash] :crop The desired crop parameters (:x, :y, :width, :height)
+      # @option options [Pathname, String] :output_path Path where clip will be written
       # @return [String]
       def command_line(options = {})
         if options.values.compact.empty?
@@ -118,18 +121,24 @@ module Viddl
       # @option options [Integer, String] :width The desired width to resize to
       # @option options [Integer, String] :height The desired height to resize to
       # @option options [Hash] :crop The desired crop parameters (:x, :y, :width, :height)
+      # @option options [Pathname, String] :output_path Path where clip will be written
       # @return [String]
       def populate_output_path(options = {})
         base = @source_path.scan(/#{Download::TEMPDIR}\/(.*)/).flatten.first
         result = base
         if !options.values.flatten.compact.empty?
           name, ext = *base.split(".")
-          tokens = ""
-          MODULES.each do |mod|
-            token = mod.filename_token(options)
-            tokens += "-#{token}" unless token.nil?
+          result = if options[:output_path].nil? || File.directory?(options[:output_path])
+            tokens = ""
+            MODULES.each do |mod|
+              token = mod.filename_token(options)
+              tokens += "-#{token}" unless token.nil?
+            end
+            path = "#{options[:output_path]}/" unless options[:output_path].nil?
+            "#{path}#{name}#{tokens}.#{ext}"
+          elsif !options[:output_path].nil?
+            "#{options[:output_path]}.#{ext}"
           end
-          result = "#{name}#{tokens}.#{ext}"
         end
         @path = Pathname.new(result)
       end

data/lib/viddl/video/instance.rb

@@ -27,6 +27,7 @@ module Viddl
       # @option options [Integer, String] :width The desired width to resize to
       # @option options [Integer, String] :height The desired height to resize to
       # @option options [Hash] :crop The desired crop parameters (:x, :y, :width, :height)
+      # @option options [Pathname, String] :output_path path where clip will be written. Can be directory or filename
       # @return [Array<Clip>]
       def create_clip(options = {})
         source_filenames.map do |filename|

data/spec/video/clip_spec.rb

@@ -335,6 +335,35 @@ describe Viddl::Video::Clip do
 
     end
 
+    context "with output path" do
+
+      context "with valid directory" do
+
+        it "includes directory" do
+          expect(File).to(receive(:directory?).and_return(true))
+          options = {
+            output_path: "this/isadir"
+          }
+          path = @clip.send(:populate_output_path, options)
+          expect(path.to_s).to(eq("this/isadir/6g4dkBF5anU.mkv"))
+        end
+
+      end
+
+      context "with path/filename" do
+
+        it "includes path/filename" do
+          expect(File).to(receive(:directory?).and_return(false))
+          options = {
+            output_path: "thisis/afile"
+          }
+          path = @clip.send(:populate_output_path, options)
+          expect(path.to_s).to(eq("thisis/afile.mkv"))
+        end
+
+      end
+    end
+
     context "crop options" do
 
       context "valid" do

metadata

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