viddl 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2474d0bc504bb605725febe654e803ab51baa57
-  data.tar.gz: 4bbd1e2bbbe269122691b9b383417af3b13c77b7
+  metadata.gz: affcaf293c945b5477ebc9f744076b4c5486045e
+  data.tar.gz: 9d76fb34d7753d40a946c4270da37cd1ccbbcacd
 SHA512:
-  metadata.gz: 97afe601385b8684e41a328536145936d932d6313278c05b27d45ecbd71270955221a3abba8ffaf98c6a7d61c8043724215830ae2deed07584c1e610e708f7b3
-  data.tar.gz: 523e05c2da825af75243e9489ff7358ee8d1aa965060a0da179f3fadaa1988bf9bce1384a9664515be30866930270331de692540ce3443086e9d126a9a0eff96
+  metadata.gz: 3d848ff07b6999ad231bfd95cac4253d4d35d306274123b2961a60e11eaf64807d678581c2be2a9b8dc0cfa42e8b18dacabdee857a497e1d6cde9deb1e59f4b1
+  data.tar.gz: a51ca3083636af978521ba5d975bf0ae2c74e4c6ca2445f8b3045b1d304d00d8224c6d0128cdd45071f07be04e36d63d08af3d9d8850f2340fe0937ba2527ef8

data/lib/viddl.rb

@@ -17,6 +17,6 @@ module Viddl
 
   extend self
 
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 
 end

data/lib/viddl/video/clip.rb

@@ -74,10 +74,10 @@ module Viddl
       # @option options [Pathname, String] :output_path Path where clip will be written
       # @return [String]
       def command_line(options = {})
-        if options.values.compact.empty?
+        if options.empty? || options.keys == [:output_path]
           # when there are no clip options, the source file can just be copied
-          # over to the output file location without using ffmpeg
-          populate_output_path
+          # over to the output file path without using ffmpeg
+          populate_output_path(options)
           "cp #{@source_path} #{@path.to_s}"
         else
           formatted_opts = options_formatted(options)
@@ -109,8 +109,11 @@ module Viddl
         # @option options [Hash] :crop The desired crop parameters (:x, :y, :width, :height)
       # @return [Hash]
       def options_formatted(options = {})
+        options.delete_if { |k, v| v.nil? }
         mod_options = MODULES.map { |mod| mod.options_formatted(options) }
-        mod_options.inject(:merge)
+        formatted_options = mod_options.inject(:merge)
+        formatted_options[:output_path] = options[:output_path]
+        formatted_options
       end
 
       # Set the clip path
@@ -124,20 +127,21 @@ module Viddl
       # @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?
+        base = Pathname.new(@source_path).basename.to_s
+        if options.empty?
+          result = base
+        else
           name, ext = *base.split(".")
-          result = if options[:output_path].nil? || File.directory?(options[:output_path])
+          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}"
+            result = options[:output_path].nil? ? "" : "#{options[:output_path].to_s}/"
+            result += "#{name}#{tokens}.#{ext}"
           elsif !options[:output_path].nil?
-            "#{options[:output_path]}.#{ext}"
+            result = "#{options[:output_path].to_s}.#{ext}"
           end
         end
         @path = Pathname.new(result)

metadata

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