lib/sym/app/cli.rb in sym-2.0.2 vs lib/sym/app/cli.rb in sym-2.0.3

@@ -7,11 +7,10 @@
 require 'sym/application'
 require 'sym/errors'
 require 'sym/app/commands'
 require 'sym/app/keychain'
 require 'sym/app/private_key/handler'
-require 'sym/app/nlp/constants'
 require 'highline'
 
 require_relative 'output/file'
 require_relative 'output/file'
 require_relative 'output/stdout'
@@ -122,11 +121,11 @@
       def parse(arguments)
         Slop.parse(arguments) do |o|
           o.banner = "Sym (#{Sym::VERSION}) – encrypt/decrypt data with a private key\n".bold.white
           o.separator 'Usage:'.yellow
           o.separator '   # Generate a new key:'.dark
-          o.separator '   sym -g '.green.bold + '[ -c ] [ -p ] [ -x keychain ] [ -o keyfile | -q | ]  '.green
+          o.separator '   sym -g '.green.bold + '[ -p ] [ -x keychain ] [ -o keyfile | -q | ]  '.green
           o.separator ''
           o.separator '   # Encrypt/Decrypt '.dark
           o.separator '   sym [ -d | -e ] '.green.bold + '[ -f <file> | -s <string> ] '.green
           o.separator '        [ -k key | -K keyfile | -x keychain | -i ] '.green
           o.separator '        [ -o <output file> ] '.green
@@ -140,50 +139,45 @@
           o.bool '-e', '--encrypt', '           encrypt mode'
           o.bool '-d', '--decrypt', '           decrypt mode'
           o.bool '-t', '--edit',    '           decrypt, open an encr. file in an $EDITOR'
 
           o.separator ' '
-          o.separator 'Create a private key:'.yellow
+          o.separator 'Create a new private key:'.yellow
 
           o.bool '-g', '--generate', '           generate a new private key'
           o.bool '-p', '--password', '           encrypt the key with a password'
-          o.bool '-c', '--copy',     '           copy the new key to the clipboard'
 
           if Sym::App.is_osx?
             o.string '-x', '--keychain', '[key-name] '.blue + 'add to (or read from) the OS-X Keychain'
           end
 
-          o.separator ' '
-          o.separator 'Password Caching:'.yellow
-
           o.integer '-M', '--password-timeout', '[timeout]'.blue + '  when passwords expire (in seconds)'
-          o.bool '-P', '--no-password-cache', '           disables key password caching'
+          o.bool    '-P', '--no-password-cache', '           disables caching of key passwords'
 
           o.separator ' '
-          o.separator 'Provide a private key:'.yellow
-          o.bool '-i', '--interactive', '           Paste or type the key interactively'
-          o.string '-k', '--private-key', '[key]   '.blue + '   private key as a string'
-          o.string '-K', '--keyfile', '[key-file]'.blue + ' private key from a file'
+          o.separator 'Read existing private key from:'.yellow
+          o.bool      '-i', '--interactive', '           Paste or type the key interactively'
+          o.string    '-k', '--private-key', '[key]   '.blue + '   private key as a string'
+          o.string    '-K', '--keyfile', '[key-file]'.blue + ' private key from a file'
           o.separator ' '
-          o.separator 'Data:'.yellow
+          o.separator 'Data to Encrypt/Decrypt:'.yellow
           o.string '-s', '--string', '[string]'.blue + '   specify a string to encrypt/decrypt'
           o.string '-f', '--file', '[file]  '.blue + '   filename to read from'
           o.string '-o', '--output', '[file]  '.blue + '   filename to write to'
           o.separator ' '
           o.separator 'Flags:'.yellow
-          if Sym::App.is_osx?
-            o.string '--keychain-del', '[key-name] '.blue + 'delete keychain entry with that name'
-          end
           o.bool '-b', '--backup', '           create a backup file in the edit mode'
           o.bool '-v', '--verbose', '           show additional information'
           o.bool '-T', '--trace', '           print a backtrace of any errors'
           o.bool '-q', '--quiet', '           silence all output'
           o.bool '-V', '--version', '           print library version'
           o.bool '-N', '--no-color', '           disable color output'
           o.separator ' '
+          o.separator 'Utility:'.yellow
+          o.string '-a', '--bash-completion',    '[file]'.blue + '     append shell completion to a file'
+          o.separator ' '
           o.separator 'Help & Examples:'.yellow
           o.bool '-E', '--examples', '           show several examples'
-          o.bool '-L', '--language', '           natural language examples'
           o.bool '-h', '--help', '           show help'
 
         end
       end
     end