cielo24-cli 0.0.4 → 0.0.5

data/bin/cielo24cli

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+
+require 'cielo24'
+require_relative '../lib/cielo24_cli/application'
+include Cielo24Cli
+
+begin
+  Application.start(ARGV)
+rescue ArgumentError => e
+  puts 'ERROR: ' + e.message
+  exit(1)
+rescue Cielo24::WebError => e
+  puts 'ERROR: ' + e.message
+  exit(1)
+end

data/lib/cielo24_cli.rb

@@ -0,0 +1,4 @@
+require 'cielo24_cli/application'
+
+module Cielo24CLI
+end

data/lib/{cielo24_command → cielo24_cli}/application.rb

@@ -1,404 +1,392 @@
-module Cielo24Command
-
-  require 'thor'
-  require 'cielo24'
-
-  class Application < Thor
-
-    include Cielo24
-
-    ENV["THOR_COLUMNS"] = "300" # Increases the maximum allowed length of a console line, otherwise descriptions/help gets truncated (...)
-
-    # ALWAYS REQUIRED:
-    username_option = [:u, :required => false, :desc => "cielo24 username", :type => :string, :banner => "username", :hide => true]
-    password_option = [:p, :required => false, :desc => "cielo24 password", :banner => "password", :hide => true]
-    securekey_option = [:k, :required => false, :desc => "The API Secure Key", :banner => "securekey", :hide => true]
-    api_token_option = [:N, :required => false, :desc => "The API token of the current session", :banner => "token", :hide => true]
-    server_url_option =[:s, :required => false, :desc => "cielo24 server URL [https://api.cielo24.com]", :banner => "server_url", :hide => true, :default => "http://api.cielo24.com"]
-    # JOB CONTROL:
-    job_id_option = [:j, :required => true, :desc => "Job Id", :banner => "jobid"]
-    media_url_option = [:m, :required => false, :desc => "Media URL", :banner => "mediaurl"]
-    media_file_option = [:M, :required => false, :desc => "Local media file", :banner => "filepath"]
-    # OTHER OPTIONS:
-    header_option = [:H, :required => false, :desc => "Use headers", :default => false, :type => :boolean]
-    fidelity_option = [:f, :required => false, :desc => "Fidelity " + Fidelity.all, :banner => "fidelity", :default => Fidelity.PREMIUM]
-    priority_option = [:P, :required => false, :desc => "Priority " + Priority.all, :banner => "priority", :default => Priority.STANDARD]
-    source_language_option = [:l, :required => false, :desc => "Source language " + Language.all, :banner => "source", :default => Language.English]
-    target_language_option = [:t, :required => false, :desc => "Target language " + Language.all, :banner => "target", :default => Language.English]
-    job_name_option = [:n, :required => false, :desc => "Job name", :banner => "jobname"]
-    job_options_option = [:J, :required => false, :desc => "Job option (list key:value pairs after -J)", :banner => 'key:value', :type => :hash, :default => {}]
-    caption_options_option = [:O, :required => false, :desc => "Caption/transcript options (list key:value pairs after -O)", :banner => 'key:value', :type => :hash, :default => {}]
-    turn_around_hours_option = [:T, :required => false, :desc => "Turn around hours", :banner => "hours"]
-    callback_url_option = [:C, :required => false, :desc => "Callback URL", :banner => "callback"]
-    caption_format_option = [:c, :required => false, :desc => "Caption format " + CaptionFormat.all, :banner => "format", :default => CaptionFormat.SRT]
-    elementlist_version_option = [:e, :required => false, :desc => "ElementList Version", :banner => "version"]
-    force_new_option = [:F, :required => false, :desc => "Force new key", :default => false]
-    new_password_option = [:d, :required => true, :desc => "New password", :banner => "newpass"]
-    verbose_option = [:v, :require => false, :desc => "Verbose mode", :hide => true, :default => false, :type => :boolean]
-
-    class_option *server_url_option # Server URL can be specified for any action
-    class_option *verbose_option # Verbose mode can be specified for any action
-
-    desc "login", 'Performs a login action'
-    option :u, :required => true, :desc => "cielo24 username", :type => :string, :banner => "username"
-    option :p, :required => false, :desc => "cielo24 password", :banner => "password"
-    option :k, :required => false, :desc => "The API Secure Key", :banner => "securekey"
-    option *header_option
-    def login
-      puts "Performing a login action..."
-      actions = initialize_actions
-      token = actions.login(options[:u], options[:p], options[:k], options[:h])
-      print_url()
-      puts "API token: " + token
-    end
-
-    desc "logout", 'Performs a logout action'
-    option :N, :required => true, :desc => "The API token of the current session", :banner => "token"
-    def logout
-      puts "Performing a logout action..."
-      actions = initialize_actions
-      actions.logout(options[:N])
-      print_url()
-      puts "Logged out successfully"
-    end
-
-    desc "create", 'Creates a job'
-    option *fidelity_option
-    option *priority_option
-    option *source_language_option
-    option *target_language_option
-    option *media_url_option
-    option *media_file_option
-    option *job_name_option
-    option *job_options_option
-    option *turn_around_hours_option
-    option *callback_url_option
-    # always required (hidden)
-    option *username_option
-    option *password_option
-    option *securekey_option
-    option *api_token_option
-    def create
-
-      if options[:m].nil? and options[:M].nil?
-        puts "Media URL or local file path must be supplied"
-        exit(1)
-      end
-
-      puts "Creating job..."
-      actions = initialize_actions
-      token = get_token(actions)
-      mash = actions.create_job(token, options[:n], options[:l])
-      puts "Job ID: " + mash.JobId
-      puts "Task ID: " + mash.TaskId
-      print_url()
-
-      puts "Adding media..."
-      if !options[:m].nil?
-        task_id = actions.add_media_to_job_url(token, mash.JobId, options[:m])
-      elsif !options[:M].nil?
-        file = File.new(File.absolute_path(options[:M]), "r")
-        task_id = actions.add_media_to_job_file(token, mash.JobId, file)
-      end
-      puts "Task ID: " + task_id
-      print_url()
-
-      puts "Performing transcription..."
-
-      # Parse option hash
-      jobopts = PerformTranscriptionOptions.new
-      jobopts.populate_from_hash(options[:J])
-
-      task_id = actions.perform_transcription(token, mash.JobId, options[:f], options[:P], options[:C], options[:T], options[:t], jobopts)
-      puts "Task ID: " + task_id
-      print_url()
-    end
-
-    desc "delete", 'Delete a job'
-    option *job_id_option
-    # always required (hidden)
-    option *username_option
-    option *password_option
-    option *securekey_option
-    option *api_token_option
-    def delete
-      puts "Deleting job..."
-      actions = initialize_actions
-      token = get_token(actions)
-      task_id = actions.delete_job(token, options[:j])
-      puts "Task ID: " + task_id
-      print_url()
-    end
-
-    desc "authorize", 'Authorize a job'
-    option *job_id_option
-    # always required (hidden)
-    option *username_option
-    option *password_option
-    option *securekey_option
-    option *api_token_option
-    def authorize
-      puts "Authorizing job..."
-      actions = initialize_actions
-      token = get_token(actions)
-      actions.authorize_job(token, options[:j])
-      print_url()
-      puts "Authorized successfully"
-    end
-
-    desc "add_media_to_job", 'Add media to job'
-    option *job_id_option
-    option *media_url_option
-    option *media_file_option
-    # always required (hidden)
-    option *username_option
-    option *password_option
-    option *securekey_option
-    option *api_token_option
-    def add_media_to_job
-      puts "Adding media to job..."
-      actions = initialize_actions
-      token = get_token(actions)
-      if !options[:m].nil?
-        task_id = actions.add_media_to_job_url(token, options[:j], options[:m])
-      elsif !options[:M].nil?
-        file = File.new(File.absolute_path(options[:M]), "r")
-        task_id = actions.add_media_to_job_file(token, options[:j], file)
-      else
-        raise ArgumentError.new("Media URL or local file path must be supplied")
-      end
-      puts "Task ID: " + task_id
-      print_url()
-    end
-
-    desc "add_embedded_media_to_job", 'Add embedded media to job'
-    option *job_id_option
-    option :m, :required => true, :desc => "Media URL", :banner => "mediaurl"
-    # always required (hidden)
-    option *username_option
-    option *password_option
-    option *securekey_option
-    option *api_token_option
-    def add_embedded_media_to_job
-      puts "Adding embedded media to job..."
-      actions = initialize_actions
-      token = get_token(actions)
-      task_id = actions.add_media_to_job_embedded(token, options[:j], options[:m])
-      puts "Task ID: " + task_id
-      print_url()
-    end
-
-    desc "list", 'Lists current jobs'
-    # always required (hidden)
-    option *username_option
-    option *password_option
-    option *securekey_option
-    option *api_token_option
-    def list
-      puts "Retrieving list..."
-      actions = initialize_actions
-      token = get_token(actions)
-      mash = actions.get_job_list(token)
-      print_url()
-      puts JSON.pretty_generate(JSON.parse(mash.to_json(nil)))
-    end
-
-    desc "list_elementlists", 'List ElementLists'
-    option *job_id_option
-    # always required (hidden)
-    option *username_option
-    option *password_option
-    option *securekey_option
-    option *api_token_option
-    def list_elementlists
-      puts "Listing Element Lists..."
-      actions = initialize_actions
-      token = get_token(actions)
-      array = actions.get_list_of_element_lists(token, options[:j])
-      print_url()
-      puts JSON.pretty_generate(array)
-    end
-
-    desc "get_caption", 'Get Caption'
-    option *job_id_option
-    option *caption_format_option
-    option *elementlist_version_option
-    option *caption_options_option
-    # always required (hidden)
-    option *username_option
-    option *password_option
-    option *securekey_option
-    option *api_token_option
-    def get_caption
-      puts "Getting caption..."
-      actions = initialize_actions
-      token = get_token(actions)
-
-      # Parse options
-      caption_opts = CaptionOptions.new
-      caption_opts.populate_from_hash(options[:O])
-
-      caption = actions.get_caption(token, options[:j], options[:c], caption_opts)
-      print_url()
-      puts caption
-    end
-
-    desc "get_transcript", 'Get Transcript'
-    option *job_id_option
-    option *elementlist_version_option
-    option *caption_options_option
-    # always required (hidden)
-    option *username_option
-    option *password_option
-    option *securekey_option
-    option *api_token_option
-    def get_transcript
-      puts "Getting transcript..."
-      actions = initialize_actions
-      token = get_token(actions)
-
-      # Parse options
-      transcription_opts = TranscriptionOptions.new
-      transcription_opts.populate_from_hash(options[:O])
-
-      transcript = actions.get_transcript(token, options[:j], transcription_opts)
-      print_url()
-      puts transcript
-    end
-
-    desc "get_elementlist", 'Get ElementList for JobId'
-    option *job_id_option
-    option *elementlist_version_option
-    # always required (hidden)
-    option *username_option
-    option *password_option
-    option *securekey_option
-    option *api_token_option
-    def get_elementlist
-      puts "Getting ELement List..."
-      actions = initialize_actions
-      token = get_token(actions)
-      mash = actions.get_element_list(token, options[:j], options[:e])
-      print_url()
-      puts JSON.pretty_generate(JSON.parse(mash.to_json(nil)))
-    end
-
-    desc "get_media", 'Get Media'
-    option *job_id_option
-    # always required (hidden)
-    option *username_option
-    option *password_option
-    option *securekey_option
-    option *api_token_option
-    def get_media
-      puts "Getting media..."
-      actions = initialize_actions
-      token = get_token(actions)
-      url = actions.get_media(token, options[:j])
-      print_url()
-      puts url
-    end
-
-    desc "generate_api_key", 'Generate API Secure Key'
-    option *force_new_option
-    # always required (hidden)
-    option *username_option
-    option *password_option
-    option *securekey_option
-    option *api_token_option
-    def generate_api_key
-      puts "Generating API key..."
-      actions = initialize_actions
-      token = get_token(actions)
-      key = actions.generate_api_key(token, options[:u], options[:F])
-      print_url()
-      puts "API Secure Key: " + key
-    end
-
-    desc "remove_api_key", 'Remove API Secure Key'
-    option :api_key, :aliases => 'k', :required => true, :desc => "The API Key to remove"
-    # always required (hidden)
-    option *username_option
-    option *password_option
-    option *securekey_option
-    option *api_token_option
-    def remove_api_key
-      puts "Removing API key..."
-      actions = initialize_actions
-      token = get_token(actions)
-      actions.remove_api_key(token, options[:k])
-      print_url()
-      puts "The key was successfully removed."
-    end
-
-    desc "update_password", 'Update Password'
-    option *new_password_option
-    # always required (hidden)
-    option *username_option
-    option *password_option
-    option *securekey_option
-    option *api_token_option
-    def update_password
-      puts "Updating password..."
-      actions = initialize_actions
-      token = get_token(actions)
-      actions.update_password(token, options[:d])
-      print_url()
-      puts "Password was updated successfully."
-    end
-
-    desc "job_info", 'Get Job Info'
-    option *job_id_option
-    # always required (hidden)
-    option *username_option
-    option *password_option
-    option *securekey_option
-    option *api_token_option
-    def job_info
-      puts "Getting Job Info..."
-      actions = initialize_actions
-      token = get_token(actions)
-      mash = actions.get_job_info(token, options[:j])
-      print_url()
-      puts JSON.pretty_generate(JSON.parse(mash.to_json(nil)))
-    end
-
-    # Method override, so that an "always required" message can be printed out before everything else
-    def help(arg=nil, arg2=nil)
-      super(arg, arg2)
-      puts "\nAlways required options:"
-      puts "  -u=username          \# cielo24 username"
-      puts "  [-s=serverurl]       \# cielo24 server URL"
-      puts "                       \# Default: https://api.cielo24.com"
-      puts "\n  ++Either one of the following:"
-      puts "  --------------------------------------------"
-      puts "  -p=password          \# cielo24 password"
-      puts "  -k=securekey         \# The API Secure Key"
-      puts "  -N=token             \# The API token of the current session"
-      puts "  --------------------------------------------"
-    end
-
-    no_commands{
-      def private_login(actions, username, password, securekey)
-        raise ArgumentError.new("Username was not supplied.") if username.nil?
-        return actions.login(username, password, securekey, true)
-      end
-
-      def initialize_actions
-        actions = Actions.new
-        actions.base_url = options[:s] if !options[:s].nil?
-        return actions
-      end
-
-      def get_token(actions)
-        return (options[:N].nil?) ? private_login(actions, options[:u], options[:p], options[:k]) : options[:N]
-      end
-
-      def print_url
-        if(options[:v])
-          puts WebUtils.LAST_URL
-        end
-      end
-    }
-  end
+module Cielo24Cli
+
+  require 'thor'
+  require 'cielo24'
+
+  class Application < Thor
+
+    include Cielo24
+
+    ENV['THOR_COLUMNS'] = '300' # Increases the maximum allowed length of a console line, otherwise descriptions/help gets truncated (...)
+
+    # ALWAYS REQUIRED:
+    username_option = [:u, :required => false, :desc => 'cielo24 username', :type => :string, :banner => 'username', :hide => true]
+    password_option = [:p, :required => false, :desc => 'cielo24 password', :banner => 'password', :hide => true]
+    securekey_option = [:k, :required => false, :desc => 'The API Secure Key', :banner => 'securekey', :hide => true]
+    api_token_option = [:N, :required => false, :desc => 'The API token of the current session', :banner => 'token', :hide => true]
+    server_url_option =[:s, :required => false, :desc => 'cielo24 server URL [https://api.cielo24.com]', :banner => 'server_url', :hide => true, :default => 'http://api.cielo24.com']
+    # JOB CONTROL:
+    job_id_option = [:j, :required => true, :desc => 'Job Id', :banner => 'jobid']
+    media_url_option = [:m, :required => false, :desc => 'Media URL', :banner => 'mediaurl']
+    media_file_option = [:M, :required => false, :desc => 'Local media file', :banner => 'filepath']
+    # OTHER OPTIONS:
+    header_option = [:H, :required => false, :desc => 'Use headers', :default => false, :type => :boolean]
+    fidelity_option = [:f, :required => false, :desc => 'Fidelity ' + Fidelity.all.join(', '), :banner => 'fidelity', :default => Fidelity::PREMIUM]
+    priority_option = [:P, :required => false, :desc => 'Priority ' + Priority.all.join(', '), :banner => 'priority', :default => Priority::STANDARD]
+    source_language_option = [:l, :required => false, :desc => 'Source language ' + Language.all.join(', '), :banner => 'source', :default => Language::ENGLISH]
+    target_language_option = [:t, :required => false, :desc => 'Target language ' + Language.all.join(', '), :banner => 'target', :default => Language::ENGLISH]
+    job_name_option = [:n, :required => false, :desc => 'Job name', :banner => 'jobname']
+    job_options_option = [:J, :required => false, :desc => 'Job option (list key:value pairs after -J)', :banner => 'key:value', :type => :hash, :default => {}]
+    caption_options_option = [:O, :required => false, :desc => 'Caption/transcript options (list key:value pairs after -O)', :banner => 'key:value', :type => :hash, :default => {}]
+    turn_around_hours_option = [:T, :required => false, :desc => 'Turn around hours', :banner => 'hours']
+    callback_url_option = [:C, :required => false, :desc => 'Callback URL', :banner => 'callback']
+    caption_format_option = [:c, :required => false, :desc => 'Caption format ' + CaptionFormat.all.join(', '), :banner => 'format', :default => CaptionFormat::SRT]
+    elementlist_version_option = [:e, :required => false, :desc => 'ElementList Version', :banner => 'version']
+    force_new_option = [:F, :required => false, :desc => 'Force new key', :default => false]
+    new_password_option = [:d, :required => true, :desc => 'New password', :banner => 'newpass']
+    verbose_option = [:v, :require => false, :desc => 'Verbose mode', :hide => true, :default => false, :type => :boolean]
+
+    class_option *server_url_option # Server URL can be specified for any action
+    class_option *verbose_option # Verbose mode can be specified for any action
+
+    desc 'login', 'Performs a login action'
+    option :u, :required => true, :desc => 'cielo24 username', :type => :string, :banner => 'username'
+    option :p, :required => false, :desc => 'cielo24 password', :banner => 'password'
+    option :k, :required => false, :desc => 'The API Secure Key', :banner => 'securekey'
+    option *header_option
+    def login
+      puts 'Performing a login action...'
+      actions = initialize_actions
+      token = actions.login(options[:u], options[:p], options[:k], options[:h])
+      puts 'API token: ' + token
+    end
+
+    desc 'logout', 'Performs a logout action'
+    option :N, :required => true, :desc => 'The API token of the current session', :banner => 'token'
+    def logout
+      puts 'Performing a logout action...'
+      actions = initialize_actions
+      actions.logout(options[:N])
+      puts 'Logged out successfully'
+    end
+
+    desc 'create', 'Creates a job'
+    option *fidelity_option
+    option *priority_option
+    option *source_language_option
+    option *target_language_option
+    option *media_url_option
+    option *media_file_option
+    option *job_name_option
+    option *job_options_option
+    option *turn_around_hours_option
+    option *callback_url_option
+    # always required (hidden)
+    option *username_option
+    option *password_option
+    option *securekey_option
+    option *api_token_option
+    def create
+
+      if options[:m].nil? and options[:M].nil?
+        puts 'Media URL or local file path must be supplied'
+        exit(1)
+      end
+
+      puts 'Creating job...'
+      actions = initialize_actions
+      token = get_token(actions)
+      mash = actions.create_job(token, options[:n], options[:l])
+      puts 'Job ID: ' + mash.JobId
+      puts 'Task ID: ' + mash.TaskId
+
+      puts 'Adding media...'
+      if !options[:m].nil?
+        task_id = actions.add_media_to_job_url(token, mash.JobId, options[:m])
+      elsif !options[:M].nil?
+        file = File.new(File.absolute_path(options[:M]), 'r')
+        task_id = actions.add_media_to_job_file(token, mash.JobId, file)
+      end
+      puts 'Task ID: ' + task_id
+
+      puts 'Performing transcription...'
+
+      # Parse option hash
+      jobopts = PerformTranscriptionOptions.new
+      jobopts.populate_from_hash(options[:J])
+
+      task_id = actions.perform_transcription(token, mash.JobId, options[:f], options[:P], options[:C], options[:T], options[:t], jobopts)
+      puts 'Task ID: ' + task_id
+    end
+
+    desc 'delete', 'Delete a job'
+    option *job_id_option
+    # always required (hidden)
+    option *username_option
+    option *password_option
+    option *securekey_option
+    option *api_token_option
+    def delete
+      puts 'Deleting job...'
+      actions = initialize_actions
+      token = get_token(actions)
+      task_id = actions.delete_job(token, options[:j])
+      puts 'Task ID: ' + task_id
+    end
+
+    desc 'authorize', 'Authorize a job'
+    option *job_id_option
+    # always required (hidden)
+    option *username_option
+    option *password_option
+    option *securekey_option
+    option *api_token_option
+    def authorize
+      puts 'Authorizing job...'
+      actions = initialize_actions
+      token = get_token(actions)
+      actions.authorize_job(token, options[:j])
+      puts 'Authorized successfully'
+    end
+
+    desc 'add_media_to_job', 'Add media to job'
+    option *job_id_option
+    option *media_url_option
+    option *media_file_option
+    # always required (hidden)
+    option *username_option
+    option *password_option
+    option *securekey_option
+    option *api_token_option
+    def add_media_to_job
+      puts 'Adding media to job...'
+      actions = initialize_actions
+      token = get_token(actions)
+      if !options[:m].nil?
+        task_id = actions.add_media_to_job_url(token, options[:j], options[:m])
+      elsif !options[:M].nil?
+        file = File.new(File.absolute_path(options[:M]), 'r')
+        task_id = actions.add_media_to_job_file(token, options[:j], file)
+      else
+        raise ArgumentError.new('Media URL or local file path must be supplied')
+      end
+      puts 'Task ID: ' + task_id
+    end
+
+    desc 'add_embedded_media_to_job', 'Add embedded media to job'
+    option *job_id_option
+    option :m, :required => true, :desc => 'Media URL', :banner => 'mediaurl'
+    # always required (hidden)
+    option *username_option
+    option *password_option
+    option *securekey_option
+    option *api_token_option
+    def add_embedded_media_to_job
+      puts 'Adding embedded media to job...'
+      actions = initialize_actions
+      token = get_token(actions)
+      task_id = actions.add_media_to_job_embedded(token, options[:j], options[:m])
+      puts 'Task ID: ' + task_id
+    end
+
+    desc 'list', 'Lists current jobs'
+    # always required (hidden)
+    option *username_option
+    option *password_option
+    option *securekey_option
+    option *api_token_option
+    def list
+      puts 'Retrieving list...'
+      actions = initialize_actions
+      token = get_token(actions)
+      mash = actions.get_job_list(token)
+      puts JSON.pretty_generate(JSON.parse(mash.to_json(nil)))
+    end
+
+    desc 'list_elementlists', 'List ElementLists'
+    option *job_id_option
+    # always required (hidden)
+    option *username_option
+    option *password_option
+    option *securekey_option
+    option *api_token_option
+    def list_elementlists
+      puts 'Listing Element Lists...'
+      actions = initialize_actions
+      token = get_token(actions)
+      array = actions.get_list_of_element_lists(token, options[:j])
+      puts JSON.pretty_generate(array)
+    end
+
+    desc 'get_caption', 'Get Caption'
+    option *job_id_option
+    option *caption_format_option
+    option *elementlist_version_option
+    option *caption_options_option
+    # always required (hidden)
+    option *username_option
+    option *password_option
+    option *securekey_option
+    option *api_token_option
+    def get_caption
+      puts 'Getting caption...'
+      actions = initialize_actions
+      token = get_token(actions)
+
+      # Parse options
+      caption_opts = CaptionOptions.new
+      caption_opts.populate_from_hash(options[:O])
+
+      caption = actions.get_caption(token, options[:j], options[:c], caption_opts)
+      puts caption
+    end
+
+    desc 'get_transcript', 'Get Transcript'
+    option *job_id_option
+    option *elementlist_version_option
+    option *caption_options_option
+    # always required (hidden)
+    option *username_option
+    option *password_option
+    option *securekey_option
+    option *api_token_option
+    def get_transcript
+      puts 'Getting transcript...'
+      actions = initialize_actions
+      token = get_token(actions)
+
+      # Parse options
+      transcription_opts = TranscriptOptions.new
+      transcription_opts.populate_from_hash(options[:O])
+
+      transcript = actions.get_transcript(token, options[:j], transcription_opts)
+      puts transcript
+    end
+
+    desc 'get_elementlist', 'Get ElementList for JobId'
+    option *job_id_option
+    option *elementlist_version_option
+    # always required (hidden)
+    option *username_option
+    option *password_option
+    option *securekey_option
+    option *api_token_option
+    def get_elementlist
+      puts 'Getting ElementList...'
+      actions = initialize_actions
+      token = get_token(actions)
+      mash = actions.get_element_list(token, options[:j], options[:e])
+      puts JSON.pretty_generate(JSON.parse(mash.to_json(nil)))
+    end
+
+    desc 'get_media', 'Get Media'
+    option *job_id_option
+    # always required (hidden)
+    option *username_option
+    option *password_option
+    option *securekey_option
+    option *api_token_option
+    def get_media
+      puts 'Getting media...'
+      actions = initialize_actions
+      token = get_token(actions)
+      url = actions.get_media(token, options[:j])
+      puts url
+    end
+
+    desc 'generate_api_key', 'Generate API Secure Key'
+    option *force_new_option
+    # always required (hidden)
+    option *username_option
+    option *password_option
+    option *securekey_option
+    option *api_token_option
+    def generate_api_key
+      puts 'Generating API key...'
+      actions = initialize_actions
+      token = get_token(actions)
+      key = actions.generate_api_key(token, options[:u], options[:F])
+      puts 'API Secure Key: ' + key
+    end
+
+    desc 'remove_api_key', 'Remove API Secure Key'
+    option :api_key, :aliases => 'k', :required => true, :desc => 'The API Key to remove'
+    # always required (hidden)
+    option *username_option
+    option *password_option
+    option *securekey_option
+    option *api_token_option
+    def remove_api_key
+      puts 'Removing API key...'
+      actions = initialize_actions
+      token = get_token(actions)
+      actions.remove_api_key(token, options[:k])
+      puts 'The key was successfully removed.'
+    end
+
+    desc 'update_password', 'Update Password'
+    option *new_password_option
+    # always required (hidden)
+    option *username_option
+    option *password_option
+    option *securekey_option
+    option *api_token_option
+    def update_password
+      puts 'Updating password...'
+      actions = initialize_actions
+      token = get_token(actions)
+      actions.update_password(token, options[:d])
+      puts 'Password was updated successfully.'
+    end
+
+    desc 'job_info', 'Get Job Info'
+    option *job_id_option
+    # always required (hidden)
+    option *username_option
+    option *password_option
+    option *securekey_option
+    option *api_token_option
+    def job_info
+      puts 'Getting Job Info...'
+      actions = initialize_actions
+      token = get_token(actions)
+      mash = actions.get_job_info(token, options[:j])
+      puts JSON.pretty_generate(JSON.parse(mash.to_json(nil)))
+    end
+
+    # Method override, so that an 'always required' message can be printed out before everything else
+    def help(arg=nil, arg2=nil)
+      super(arg, arg2)
+      puts "\nAlways required options:"
+      puts "  -u=username          \# cielo24 username"
+      puts "  [-s=serverurl]       \# cielo24 server URL"
+      puts "                       \# Default: https://api.cielo24.com"
+      puts "\n  ++Either one of the following:"
+      puts "  --------------------------------------------"
+      puts "  -p=password          \# cielo24 password"
+      puts "  -k=securekey         \# The API Secure Key"
+      puts "  -N=token             \# The API token of the current session"
+      puts "  --------------------------------------------"
+    end
+
+    no_commands{
+      def private_login(actions, username, password, securekey)
+        raise ArgumentError.new('Username was not supplied.') if username.nil?
+        return actions.login(username, password, securekey, true)
+      end
+
+      def initialize_actions
+        actions = Actions.new
+        actions.base_url = options[:s] unless options[:s].nil?
+        setup_logger()
+        return actions
+      end
+
+      def get_token(actions)
+        return (options[:N].nil?) ? private_login(actions, options[:u], options[:p], options[:k]) : options[:N]
+      end
+
+      def setup_logger
+        if options[:v]
+          # Custom logger formatter
+          WebUtils::LOGGER.formatter = proc { |severity, datetime, progname, msg|
+            msg + "\n"
+          }
+        else
+          # Disable logger
+          WebUtils::LOGGER.level = Logger::ERROR
+        end
+      end
+    }
+  end
 end

data/lib/cielo24_cli/version.rb

@@ -0,0 +1,3 @@
+module Cielo24CLI
+  VERSION = '0.0.5'
+end

metadata

@@ -1,105 +1,115 @@
 --- !ruby/object:Gem::Specification
 name: cielo24-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
+  prerelease: 
 platform: ruby
 authors:
 - cielo24
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-06 00:00:00.000000000 Z
+date: 2015-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 1.10.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 1.10.6
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 10.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 10.4.2
 - !ruby/object:Gem::Dependency
   name: cielo24
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.15
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.19.1
 description: Command line interface that allows you to make REST API calls using cielo24
   gem.
 email:
 - support@cielo24.com
 executables:
-- cielo24
+- cielo24cli
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/cielo24_command/application.rb
-- lib/cielo24_command/version.rb
-- lib/cielo24_command.rb
-- bin/cielo24
+- lib/cielo24_cli/application.rb
+- lib/cielo24_cli/version.rb
+- lib/cielo24_cli.rb
+- bin/cielo24cli
 homepage: http://cielo24.com
 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: 2.0.14
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Command line interface to cielo24 gem.
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 9e0bab47a823806a72dea22ad42794ed0ca6a112
-  data.tar.gz: dddaf0934796ce2aa71f2172c67b8380ad9cad40
-SHA512:
-  metadata.gz: 2cfc990796e37c1d9596c3cd61c1f828f6b0542292d0a67af358e9d2515cdb6d56da9289d7627c3b566c184e8e7feeda398c324088c879326d8bab5f898f9903
-  data.tar.gz: f13d9ce4393fcc77005c018c5483dec6355f6e12f2169dd3546b614e6b6df4428926ee1a7d92537822dd65f76a26128a8e9ae279ff39929e796e6b40b2c8a436

data/bin/cielo24

@@ -1,15 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'cielo24'
-require_relative "../lib/cielo24_command/application"
-include Cielo24Command
-
-begin
-  Application.start(ARGV)
-rescue ArgumentError => e
-  puts "ERROR: " + e.message
-  exit(1)
-rescue Cielo24::WebError => e
-  puts "ERROR: " + e.message
-  exit(1)
-end

data/lib/cielo24_command.rb

@@ -1,4 +0,0 @@
-require "cielo24_command/version"
-
-module Cielo24Command
-end

data/lib/cielo24_command/version.rb

@@ -1,3 +0,0 @@
-module Cielo24Command
-  VERSION = "0.0.4"
-end