movie_merge 0.0.4 → 0.0.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 23576023b74ea072e816515f15761ca8d30edd26
+  data.tar.gz: cd57a130eafc0b8c39f831ae16d239188938237e
+SHA512:
+  metadata.gz: 82cd9aa9289f22b9aa2cd902e2542a91edf12656a50df19ef7d4f49596301a388330bc9ae2475b9282348bff758422c0dde140d6e2ef87f69ed5d4dc6375a7e0
+  data.tar.gz: 09b70d21dde93eca7948052aa9dd29cf3c59c0d1e3fa055311ac9a4ef26e66b0b376bb55a031a407fb8fa7314199cc5d42250fd058c52a4fc52162a8758a7c39

data/README.md

@@ -1,6 +1,6 @@
 # MovieMerge
 
-Joins multiple video files together using the `cat` command and ffmpeg.
+Joins multiple video files together using the `cat` command and ffmpeg. Currently only `avi` files are supported.
 
 ```
 moviemerge INPUT-1 .. INPUT-N
@@ -10,4 +10,5 @@ Options (all are optional):
   -t, [--target=TARGET]
   -d, [--dry-run]
   -h, [--help]
-```
+  -v, [--version]
+```

data/bin/moviemerge

@@ -3,5 +3,5 @@
 lib = File.expand_path('../../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'movie_merge'
-ARGV.unshift("join")
+ARGV.unshift('join')
 MovieMerge::Cli.start

data/lib/movie_merge/cli.rb

@@ -1,7 +1,8 @@
 require "thor"
+require "shellwords"
 
 module MovieMerge
-	class Cli < ::Thor
+  class Cli < ::Thor
     include Thor::Actions
 
     desc "INPUT-1 .. INPUT-N", "Combines multiple video files into a single video file."
@@ -46,12 +47,13 @@ module MovieMerge
       file_type = file_types.first
 
       # Build the target and temp file names.
-      target = options[:target] || "moviemerged-x#{sources.size}.#{file_type}"
-      temp   = ".#{target}"
+      tname  = "moviemerged-x#{sources.size}.#{file_type}"
+      target = options[:target] || tname
+      temp   = ".#{tname}"
 
       # Ensure each of the input files actually exist.
       sources.each do |source|
-        source_exists = File.exists?(File.join(cwd, source))
+        source_exists = File.exists?(source)
         return say("Source file not found; cannot continue (#{source})", :red) unless source_exists
       end
 
@@ -65,7 +67,7 @@ module MovieMerge
 
       # Concatenate the input files and output to a temp file.
       say("Concatenating files.", :green)
-      `cat #{sources.join(' ')} > #{temp}`
+      `cat #{sources.map { |s| Shellwords.escape(s) }.join(' ')} > #{Shellwords.escape(temp)}`
 
       unless $?.success?
         `rm -f #{temp}`
@@ -74,7 +76,7 @@ module MovieMerge
 
       # Reindex the temp file using ffmpeg.
       say("Reindexing combined output at framerate of #{framerate}.", :green)
-      `ffmpeg -i #{temp} -r #{framerate} -sameq #{target} 2>&1`
+      `ffmpeg -i #{Shellwords.escape(temp)} -r #{framerate} -qscale 0 #{Shellwords.escape(target)} 2>&1`
 
       unless $?.success?
         `rm -f #{temp}`
@@ -83,7 +85,7 @@ module MovieMerge
 
       # Remove the temp file.
       say("Cleaning up temp files.", :green)
-      `rm -f #{temp}`
+      `rm -f #{Shellwords.escape(temp)}`
       say("Unable to remove temp file: #{temp}", :red) unless $?.success?
 
       # Done!

data/lib/movie_merge/version.rb

@@ -1,3 +1,3 @@
 module MovieMerge
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: movie_merge
 version: !ruby/object:Gem::Version
-  version: 0.0.4
-  prerelease: 
+  version: 0.0.5
 platform: ruby
 authors:
 - Mike Fulcher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-08 00:00:00.000000000 Z
+date: 2013-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -48,26 +45,25 @@ files:
 - movie_merge.gemspec
 homepage: https://github.com/6twenty/movie_merge
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Automates joining multiple video files using the `cat` command and ffmpeg.
 test_files: []