mkv2m4v 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 832cb0b3f03825bf52e67c997df03c4692200723
-  data.tar.gz: 0d8aa074c5318d0f27a2da44aff6f22a92233909
+  metadata.gz: a9a02e4e57fb5988822557f0b373eee08a97305e
+  data.tar.gz: c967e78ab6f3608a2b86ae8f231f3d2ec6a0eb68
 SHA512:
-  metadata.gz: b37c0a193a17d80c48557cb7a511071ab31ce048fab9416b0c265dabae9717923cdf3ffe621e87f6637a79428bb5fca22455e9816d2e4e63df6104e21c152853
-  data.tar.gz: 106bd331235935fe791d7736beba7c11484bb07ab5efc3c96f4750f96abc59730521a9899fdedd86bd5e2929079cf47f92c2bda2efa4e33f7fb1db989ad4740f
+  metadata.gz: 9e07d02159eedf36585c9a5befba5f0fea49c2f598de0060681030c231d0e35c73ec3ba2166502e946932a4590fdec864d010f12958613661a4a4ee66bda597d
+  data.tar.gz: af1df65b2e9aad67e28dc3ff73b392c818c8a3291ffd5a16fe3388a57ba02030ba0d6e890d4a89c9ba4d5913b3e1daacbcf119da7fe23c146bc8ff6deadf3037

data/README.md

@@ -34,6 +34,13 @@ should install automatically. If not, you should manually install `ffmpeg`:_
 $ brew install ffmpeg --with-tools
 ```
 
+If you have any trouble after installing the mkdv2m4v gem, you can test the
+dependencies using the `--check` argument:
+
+```bash
+$ mkv2m4v --check
+```
+
 ## Usage
 
 ```bash

data/lib/mkv2m4v.rb

@@ -1,6 +1,7 @@
 require "mkv2m4v/version"
 require "mkv2m4v/file"
 require "trollop"
+require "colorize"
 
 module Mkv2m4v
   class Command
@@ -25,20 +26,50 @@ module Mkv2m4v
     end
 
     def parse_options
-      @options = Trollop::options do
+      parser = Trollop::Parser.new do
         version Mkv2m4v::VersionDescription
         banner [Mkv2m4v::Description, Mkv2m4v::Usage].join("\n")
-        opt :info, "Print media info only"
-        opt :lang, "Preferred languages, comma separated", :type => :string, :default => "English"
-        opt :dir, "Destination directory (default: same dir as source mkv)", :type => :string
+        opt :info,  "Print media info only"
+        opt :lang,  "Preferred languages, comma separated", :type => :string, :default => "English"
+        opt :dir,   "Destination directory (default: same dir as source mkv)", :type => :string
+        opt :check, "Check dependencies"
       end
+      @options = Trollop::with_standard_exception_handling(parser) { parser.parse ARGV }
       parse_languages
       @filenames = ARGV
+
+
+      check_dependencies_and_exit if @options[:check]
+      parser.educate if @filenames.empty?
     end
 
     def parse_languages
       @options[:languages] =
         @options[:lang].split(/\s*,\s*/).map { |lang| Iso639[lang] }.compact
     end
+
+    def check_dependencies_and_exit
+      results = []
+      results << check_dependency("mediainfo",  "--Version", "media-info", :exit_status => 255)
+      results << check_dependency("MP4Box",     "-version",  "gpac")
+      results << check_dependency("mkvextract", "--version", "mkvtoolnix", :requirements => "version >= 6 required")
+      results << check_dependency("ffmpeg",     "-version",  "ffmpeg --with-tools")
+      exit results.count(false)
+    end
+
+    def check_dependency(command, version_arg, brew_arg, options = {})
+      requirements = options.delete(:requirements)
+      exit_status  = options.delete(:exit_status)
+
+      puts "Checking #{command}...".magenta
+      success = system(command, version_arg) || $?.exitstatus == exit_status
+      if success
+        print "  ...Installed. ".green
+        puts requirements.to_s.yellow.on_black
+      else
+        $stderr.puts "Missing #{command}. Please `brew install #{brew_arg}`".white.on_red
+      end
+      success
+    end
   end
 end

data/lib/mkv2m4v/version.rb

@@ -1,5 +1,5 @@
 module Mkv2m4v
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 
   VersionDescription = "mkv2m4v #{VERSION} (c) 2012-2014 Ryan McGeary"
   Description = <<EOS

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mkv2m4v
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Ryan McGeary
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-11 00:00:00.000000000 Z
+date: 2014-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop