zencoder-cli 0.1.2 → 0.1.3

data/lib/zencoder-cli/cli.rb

@@ -1,11 +1,13 @@
 Zencoder::CLI::Plugin.load!
 
+head = "#{"-" * (14 + Zencoder::CLI::GEM_VERSION.length)}
+Zencoder CLI v#{Zencoder::CLI::GEM_VERSION}
+#{"-" * (14 + Zencoder::CLI::GEM_VERSION.length)}"
+
 global_options = Trollop::options do
   version "Zencoder #{Zencoder::CLI::GEM_VERSION}"
   banner <<-EOS
-#{"-" * (14 + Zencoder::CLI::GEM_VERSION.length)}
-Zencoder CLI v#{Zencoder::CLI::GEM_VERSION}
-#{"-" * (14 + Zencoder::CLI::GEM_VERSION.length)}
+#{head}
 
 == Usage
 
@@ -39,9 +41,23 @@ args = ARGV
 flat_commands = Zencoder::CLI::Command.commands.values.inject({}){|memo,group| memo.merge!(group) }
 command_options = Trollop::options do
   banner <<-EOS
+#{head}
+#{
+  if flat_commands[command][:help]
+    "\n"+flat_commands[command][:help]+"\n"
+  end
+}
 == Usage
 
-zencoder [global-options] #{command} [options]
+zencoder [global-options] #{command}#{" [args]" if flat_commands[command][:arguments]} [options]
+#{
+  if flat_commands[command][:arguments]
+    "\n== Arguments\n\n"+
+    (1..flat_commands[command][:arguments].size).to_a.map{|i|
+      "#{i}: #{flat_commands[command][:arguments][i-1].to_s}"
+    }.join("\n")
+  end
+}
 
 == Command Options
 EOS

data/lib/zencoder-cli/commands/jobs.rb

@@ -39,11 +39,16 @@ module Zencoder::CLI::Command
 
 
   class Job < Base
-    provides "job",  "job"          => { :description => "Show job details by ID", :help => "" },
-                     "job:open"     => "Opens the job in the dashboard",
-                     "job:resubmit" => "Resubmit a job by ID",
-                     "job:cancel"   => "Cancels a job by ID",
-                     "job:delete"   => "Deletes a job by ID"
+    provides "job",  "job"          => { :description => "Show job details by ID",
+                                         :arguments => ["job_id"] },
+                     "job:open"     => { :description => "Opens the job in the dashboard",
+                                         :arguments => ["job_id"] },
+                     "job:resubmit" => { :description => "Resubmit a job by ID",
+                                         :arguments => ["job_id"] },
+                     "job:cancel"   => { :description => "Cancels a job by ID",
+                                         :arguments => ["job_id"] },
+                     "job:delete"   => { :description => "Deletes a job by ID",
+                                         :arguments => ["job_id"] }
     class << self
 
       def run(args, global_options, command_options)
@@ -146,8 +151,9 @@ module Zencoder::CLI::Command
 
       def extract_job_id(args)
         job_id = args.shift
+        method_name = caller.first[/`(.*)'$/, 1]
         if !job_id.to_s.strip[/^\d+$/]
-          puts "You must specify the job to show. Try `zencoder jobs:show --help` for more information."
+          puts "You must specify the job to show. Try `zencoder job#{":"+method_name unless method_name == "run"} --help` for more information."
           exit 1
         end
         job_id

data/lib/zencoder-cli/version.rb

@@ -1,5 +1,5 @@
 module Zencoder
   module CLI
-    GEM_VERSION = '0.1.2'
+    GEM_VERSION = '0.1.3'
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zencoder-cli
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Brandon Arbini