wistia-uploader 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/bin/wistia-uploader

@@ -11,8 +11,8 @@ require_relative '../lib/wistia-uploader'
 options = {}
 
 # Required and config-loadable option sets.
-required = Set.new [:api_password, :project_id, :media_file]
-loadable = Set.new([:contact_id]) + required
+required = Set.new [:api_password, :media_file]
+loadable = Set.new([:contact_id, :project_id]) + required
 
 OptionParser.new do |opts|
   opts.banner = "Usage: wistia-uploader [options]"
@@ -31,8 +31,12 @@ OptionParser.new do |opts|
 
   opts.separator "General options:"
 
-  opts.on("-v", "--[no-]verbose", "Verbose output") do |v|
-    options[:verbose] = v
+  opts.on("-q", "--quiet", "Silence output") do |q|
+    options[:quiet] = q
+  end
+
+  opts.on("-j", "--json", "Output JSON") do |j|
+    options[:json] = j
   end
 
   opts.separator ""
@@ -42,10 +46,6 @@ OptionParser.new do |opts|
     options[:api_password] = api_password
   end
 
-  opts.on("-p", "--project-id PROJECT_ID", "The hashed id of the Wistia project to", "upload to.") do |project_id|
-    options[:project_id] = project_id
-  end
-
   opts.on("-f", "--media-file MEDIA_FILE", "The local path of the media file to be", "uploaded.") do |media_file|
     options[:media_file] = media_file
   end
@@ -53,6 +53,10 @@ OptionParser.new do |opts|
   opts.separator ""
   opts.separator "Optional:"
 
+  opts.on("-p", "--project-id PROJECT_ID", "The hashed id of the Wistia project to", "upload to.") do |project_id|
+    options[:project_id] = project_id
+  end
+
   opts.on("-n", "--media-name MEDIA_NAME", "Set the display name of the media in the", "Wistia project. If unspecified, this will", "default to the filename.") do |media_name|
     options[:media_name] = media_name
   end
@@ -68,21 +72,25 @@ OptionParser.new do |opts|
 
 end.parse!
 
+# If there's anything left in ARGV after options parsing, assume it's a path
+# to a media file.
+if ARGV[0]
+  options[:media_file] = ARGV[0]
+end
+
 # Load defaults from ~/.wistia.conf, if present. Only valid loadable options
 # not already specified on the CLI will be initialized in this manner.
 if File.exists? File.expand_path("~/.wistia.conf")
-  puts "Found ~/.wistia.conf, loading defaults!" if options[:verbose]
+  puts "Found ~/.wistia.conf, loading defaults!" if !options[:quiet]
   File.open(File.expand_path("~/.wistia.conf")) do |conf|
     conf.readlines.reject{|l|l.strip.start_with?('#')}.each do |line|
       k, v = line.split("=").map { |i| i.strip }
       next if (k.empty? || v.empty?)
       if (loadable.include?(k.to_sym) && !options.include?(k.to_sym))
-        puts "  #{k}='#{v}'" if options[:verbose]
         options[k.to_sym] = v
       end
     end
   end
-  puts "" if options[:verbose]
 end
 
 # Ensure that we have all required parameters.
@@ -99,20 +107,32 @@ unless options.keys.to_set.superset?(required)
 end
 
 # Ok, time to upload!
-$stdout.write("Uploading '#{options[:media_file]}' to Wistia...") if options[:verbose]
+$stdout.write("Uploading '#{options[:media_file]}' ...") if !options[:quiet]
 $stdout.flush
 begin
+  unless File.exists? options[:media_file]
+    puts "ERROR: The file '#{options[:media_file]}' doesn't seem to exist."
+  end
+
   result = WistiaUploader.upload_media(
     options[:api_password], options[:project_id],
     options[:media_file], options[:media_name], options[:contact_id])
-  puts " Done!" if options[:verbose]
+  puts " Done!" if !options[:quiet]
+
+  data = JSON.parse(result)
 
   # Pretty-print the resultant media details.
-  if options[:verbose]
-    data = JSON.parse(result)
+  if !options[:quiet]
     puts "Media (id:#{data['id']}) successfully created."
+    puts "  bytes: #{data['filesize']}"
     puts "  md5: #{data['md5']}"
   end
+
+  # Spit out the JSON data returned from wistia.
+  if options[:json]
+    puts data
+  end
 rescue
   puts "ERROR! Upload failed. Msg: #{$!}"
+  puts "\t" + $!.backtrace.join("\n\t")
 end

data/lib/wistia-uploader.rb

@@ -17,6 +17,9 @@ class WistiaUploader
   def self.post_file_to_wistia(path, data, file, timeout=nil)
     uri = URI(UPLOAD_URL + path)
 
+    # Sanitize the params hash.
+    data.reject! { |k,v| (v == nil) || v.empty? }
+
     http = Net::HTTP.new(uri.host, uri.port)
     http.use_ssl = true if (uri.scheme == 'https')
 

data/wistia-uploader.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "wistia-uploader"
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jason Lawrence"]
-  s.date = "2012-09-26"
+  s.date = "2012-10-10"
   s.description = "A simple CLI uploader for Wistia users."
   s.email = "jason@wistia.com"
   s.executables = ["wistia-uploader"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wistia-uploader
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-26 00:00:00.000000000 Z
+date: 2012-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -143,7 +143,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2139810491125213326
+      hash: -704925937519016139
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: