videoinfo 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d9f23008adc1a077641356b4fde1287788ab376
-  data.tar.gz: 511ba79416ab3b21e1a953c03d0f608574a156b5
+  metadata.gz: 6a711fc7dead1f2ce7f276adf40cdafaabdc330f
+  data.tar.gz: 44dbe1068c42866e9aec65f845a5badb8b3a818c
 SHA512:
-  metadata.gz: d2c7f16d606e4518facbd133a9692e0b6bde23011e13014ec04ec987dba5c95d15f0f0309bc954b2d53aa20ec363fe41711c0283af1c4e5eac13d25ea1c212ce
-  data.tar.gz: bada7f288cacddc5db52c5cdb51bd97b9588944ae83f6fbcbb0baffcd41310da006db0f25fef50e9817cce437c4ccb7bd038fad55d89ca75fd837d86e4b065ee
+  metadata.gz: 34c86fd64c085cca95dbcd04a3a0544c04ee6ea63de48ae24d74faa38e29079454d59bbd34b3cad9907421e54efe8e389a781c09249893d5b5f1cce46586bc88
+  data.tar.gz: 2529d50d3acd66ecdd76056fd085a54ccedc159fe2aabbe1b3f08fb10bdadda0487b3389b5174f3750edd587f8b69ec0cffe6a4aa4d63982bebe16af3d048fea

data/CHANGELOG.md

@@ -1,4 +1,7 @@
 ## CHANGELOG
 
+#### Version 0.3.0 (August 8, 2014)
+ * More flexible CLI when using custom image hosts
+
 #### Version 0.2.0 (August 8, 2014)
  * Initial release

data/lib/videoinfo/cli.rb

@@ -3,20 +3,17 @@ require 'optparse'
 module Videoinfo
   class CLI
 
+    ENV_IMAGE_HOST = 'VIDEOINFO_IMAGE_HOST'
+
     # Analyze a video from command line arguments and print the result to STDOUT.
     def self.run(args)
       Videoinfo.interactive = true
+      image_host            = ENV[ENV_IMAGE_HOST] || Videoinfo.image_host.class.to_s.split('::').last
       screenshots           = 2
       option_parser         = OptionParser.new do |opts|
         opts.banner = 'Usage: videoinfo [options] "MOVIENAME" file'
-        opts.on('-i', '--image-host=IMAGEHOST', "The ImageHost to use for uploading screenshots. Default: #{Videoinfo.image_host.class.to_s.split('::').last}") do |host|
-          begin
-            Videoinfo.image_host = Videoinfo::ImageHosts.const_get(host).new
-          rescue
-            hosts = Videoinfo::ImageHosts.constants.map(&:to_s).join(', ')
-            STDERR.puts "ERROR: '#{host}' is an unknown image host. Available hosts: #{hosts}"
-            exit 1
-          end
+        opts.on('-i', '--image-host=IMAGEHOST', "The ImageHost to use for uploading screenshots. Default: #{image_host}") do |host|
+          image_host = host
         end
         opts.on('-s', '--screenshots=SCREENSHOTS', "The number of screenshots to create, max 7. Default: #{screenshots}") do |ss|
           screenshots = ss.to_i
@@ -34,6 +31,14 @@ module Videoinfo
         end
       end
 
+      begin
+        Videoinfo.image_host = Videoinfo::ImageHosts.const_get(image_host).new
+      rescue
+        hosts = Videoinfo::ImageHosts.constants.map(&:to_s).join(', ')
+        STDERR.puts "ERROR: '#{image_host}' is an unknown image host. Available hosts: #{hosts}"
+        exit 1
+      end
+
       name, file = option_parser.parse!(args)
       if name.to_s == '' || file.to_s == ''
         STDERR.puts option_parser

data/lib/videoinfo/version.rb

@@ -1,3 +1,3 @@
 module Videoinfo
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: videoinfo
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Ryan Johns