cmess 0.2.4 → 0.3.0

data/bin/cinderella

@@ -6,40 +6,33 @@
 # cinderella -- Handle double encoded characters                              #
 #   [A component of cmess, the encoding tool-box]                             #
 #                                                                             #
-# Copyright (C) 2007 University of Cologne,                                   #
-#                    Albertus-Magnus-Platz,                                   #
-#                    50923 Cologne, Germany                                   #
+# Copyright (C) 2007-2011 University of Cologne,                              #
+#                         Albertus-Magnus-Platz,                              #
+#                         50923 Cologne, Germany                              #
 #                                                                             #
 # Authors:                                                                    #
 #     Jens Wille <jens.wille@uni-koeln.de>                                    #
 #                                                                             #
 # cmess is free software; you can redistribute it and/or modify it under the  #
-# terms of the GNU General Public License as published by the Free Software   #
-# Foundation; either version 3 of the License, or (at your option) any later  #
-# version.                                                                    #
+# terms of the GNU Affero General Public License as published by the Free     #
+# Software Foundation; either version 3 of the License, or (at your option)   #
+# any later version.                                                          #
 #                                                                             #
 # cmess is distributed in the hope that it will be useful, but WITHOUT ANY    #
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS   #
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more       #
-# details.                                                                    #
+# FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for     #
+# more details.                                                               #
 #                                                                             #
-# You should have received a copy of the GNU General Public License along     #
-# with cmess. If not, see <http://www.gnu.org/licenses/>.                     #
+# You should have received a copy of the GNU Affero General Public License    #
+# along with cmess. If not, see <http://www.gnu.org/licenses/>.               #
 #                                                                             #
 ###############################################################################
 #++
 
-require 'optparse'
-require 'yaml'
-
-$: << File.join(File.dirname(__FILE__), '..', 'lib')
-
 require 'cmess/cinderella'
-require 'cmess/cli'
-
 include CMess::CLI
 
-PROGNAME = File.basename($0)
+progname = File.basename($0)
 
 options = {
   :input           => STDIN,
@@ -52,82 +45,82 @@ options = {
   :repair          => false
 }
 
-OptionParser.new(nil, 40) { |opts|
+parse_options { |opts|
   opts.banner = "Usage: #{$0} [options] [FILE...]"
 
   opts.separator ''
   opts.separator 'Options:'
 
-  opts.on('-i', '--input FILE', "Input file to read from [Default: STDIN]") { |f|
-    options[:input] = open_file_or_std(f)
+  opts.on('-i', '--input FILE', 'Input file to read from [Default: STDIN]') { |input|
+    options[:input] = open_file_or_std(input)
     options[:input_set] = true
   }
 
   opts.separator ''
 
-  opts.on('-p', '--pot FILE', "The good into the pot...") { |f|
-    options[:pot] = open_file_or_std(f, 'w')
+  opts.on('-p', '--pot FILE', 'The good into the pot...') { |pot|
+    options[:pot] = open_file_or_std(pot, 'w')
   }
 
-  opts.on('-c', '--crop FILE', "...the bad into the crop") { |f|
-    options[:crop] = open_file_or_std(f, 'w')
+  opts.on('-c', '--crop FILE', '...the bad into the crop') { |crop|
+    options[:crop] = open_file_or_std(crop, 'w')
   }
 
   opts.separator ''
 
-  opts.on('-o', '--output [FILE]', "Write both good and bad lines to FILE or", "default [Default: STDOUT] (Particularly", "useful in combination with the '-r' option)") { |f|
-    options[:output] = open_file_or_std(f, 'w') if f
-
-    options[:pot]  = options[:output]
-    options[:crop] = options[:output]
+  opts.on('-o', '--output [FILE]', 'Write both good and bad lines to FILE or', 'default [Default: STDOUT] (Particularly', "useful in combination with the '-r' option)") { |output|
+    options[:output] = open_file_or_std(output, 'w') if output
+    options[:pot] = options[:crop] = options[:output]
   }
 
   opts.separator ''
 
-  opts.on('-I', '--in-place FILE', "Modify file in-place; sets '-i' and '-o'", "(Only really useful in combination with", "the '-r' option)") { |f|
-    options[:input], options[:output] = open_file_in_place(f)
+  opts.on('-I', '--in-place FILE', "Modify file in-place; sets '-i' and '-o'", '(Only really useful in combination with', "the '-r' option)") { |file|
+    options[:input], options[:output] = open_file_in_place(file)
     options[:input_set] = true
 
-    options[:pot]  = options[:output]
-    options[:crop] = options[:output]
+    options[:pot] = options[:crop] = options[:output]
   }
 
   opts.separator ''
 
-  opts.on('-e', '--source-encoding ENCODING', "Source encoding (from) [REQUIRED]") { |e|
-    options[:source_encoding] = e
+  opts.on('-e', '--source-encoding ENCODING', 'Source encoding (from) [REQUIRED]') { |encoding|
+    options[:source_encoding] = encoding
   }
 
-  opts.on('-t', '--target-encoding ENCODING', "Target encoding (to); see '-l' for a list", "of available encodings [Default: #{options[:target_encoding]}]") { |e|
-    options[:target_encoding] = e
+  opts.on('-t', '--target-encoding ENCODING', "Target encoding (to); see '-l' for a list", "of available encodings [Default: #{options[:target_encoding]}]") { |encoding|
+    options[:target_encoding] = encoding
   }
 
   opts.separator ''
 
-  opts.on('-T', '--addtl-target-encodings DIRECTORY', "Directory providing additional char files", "for target encoding") { |d|
-    ensure_directory(d)
-
-    options[:csets] |= [File.expand_path(d)]
+  opts.on('-T', '--addtl-target-encodings DIRECTORY', 'Directory providing additional char files', 'for target encoding') { |directory|
+    ensure_directory(directory)
+    options[:csets] |= [File.expand_path(directory)]
   }
 
   opts.separator ''
 
-  opts.on('-l', '--list-encodings', "Display a list of available target encodings", "and exit; see '-T' on how to add your own") {
-    csets = options[:csets].inject({}) { |hash, cset|
+  opts.on('-l', '--list-encodings', 'Display a list of available target encodings', "and exit; see '-T' on how to add your own") {
+    csets = {}
+
+    options[:csets].each { |cset|
       encodings = Dir[File.join(cset, '*.yaml')].sort.map { |yaml|
         File.basename(yaml, '.yaml') unless File.symlink?(yaml)
       }.compact
 
-      hash[cset] = encodings unless encodings.empty?
-      hash
+      csets[cset] = encodings unless encodings.empty?
     }
 
     if csets.empty?
-      puts "No target encodings available for #{PROGNAME}"
+      puts "No target encodings available for #{progname}"
     else
-      puts "Available target encodings for #{PROGNAME}:"
+      puts "Available target encodings for #{progname}:"
+
       csets.each { |cset, encodings|
+        puts
         puts "[#{cset}]"
+
         encodings.each { |encoding|
           puts "  - #{encoding}"
         }
@@ -139,52 +132,42 @@ OptionParser.new(nil, 40) { |opts|
 
   opts.separator ''
 
-  opts.on('-r', '--repair', "Try to repair corrupted characters") {
+  opts.on('-r', '--repair', 'Try to repair corrupted characters') {
     options[:repair] = true
   }
 
   opts.separator ''
   opts.separator 'Generic options:'
 
-  opts.on('-h', '--help', "Print this help message and exit") {
+  opts.on('-h', '--help', 'Print this help message and exit') {
     puts opts
     exit
   }
 
-  opts.on('--version', "Print program version and exit") {
-    puts "#{PROGNAME} v#{CMess::Cinderella::VERSION} (part of cmess v#{CMess::VERSION})"
+  opts.on('--version', 'Print program version and exit') {
+    puts "#{progname} v#{CMess::Cinderella::VERSION} (part of cmess v#{CMess::VERSION})"
     exit
   }
 
   opts.separator ''
   opts.separator "If '-p' or '-c' is omitted, and '-o' is not given either, that particular output"
-  opts.separator "is ignored. When FILE is -, either STDIN or STDOUT is used (as appropriate)."
-}.parse!
+  opts.separator 'is ignored. When FILE is -, either STDIN or STDOUT is used (as appropriate).'
+}
 
 cli do
   options[:target_encoding].call if options[:target_encoding].respond_to?(:call)
 
-  abort "No source encoding given! (Use the '-e' switch to do so; see '--help' for more information)" \
-    unless options[:source_encoding]
+  abort "No source encoding given! (Use the '-e' switch to do so; see '--help' for more information)" unless options[:source_encoding]
 
   yaml_file = "#{options[:target_encoding].downcase}.yaml"
-  char_file = options[:csets].inject(nil) { |path, cset|
+  char_file = options[:csets].find { |cset|
     path = File.join(cset, yaml_file)
     break path if File.readable?(path)
   }
 
-  abort "Char file not found for target encoding: #{options[:target_encoding]}" \
-    unless char_file
+  abort "Char file not found for target encoding: #{options[:target_encoding]}" unless char_file
 
   trailing_args_as_input(options)
 
-  CMess::Cinderella.pick(
-    options[:input],
-    options[:pot],
-    options[:crop],
-    options[:source_encoding],
-    options[:target_encoding],
-    YAML.load_file(char_file),
-    options[:repair]
-  )
+  CMess::Cinderella.pick(options.merge(:chars => YAML.load_file(char_file)))
 end

data/bin/decode_entities

@@ -6,40 +6,32 @@
 # decode_entities -- Decode HTML entities                                     #
 #   [A component of cmess, the encoding tool-box]                             #
 #                                                                             #
-# Copyright (C) 2007 University of Cologne,                                   #
-#                    Albertus-Magnus-Platz,                                   #
-#                    50923 Cologne, Germany                                   #
+# Copyright (C) 2007-2011 University of Cologne,                              #
+#                         Albertus-Magnus-Platz,                              #
+#                         50923 Cologne, Germany                              #
 #                                                                             #
 # Authors:                                                                    #
 #     Jens Wille <jens.wille@uni-koeln.de>                                    #
 #                                                                             #
 # cmess is free software; you can redistribute it and/or modify it under the  #
-# terms of the GNU General Public License as published by the Free Software   #
-# Foundation; either version 3 of the License, or (at your option) any later  #
-# version.                                                                    #
+# terms of the GNU Affero General Public License as published by the Free     #
+# Software Foundation; either version 3 of the License, or (at your option)   #
+# any later version.                                                          #
 #                                                                             #
 # cmess is distributed in the hope that it will be useful, but WITHOUT ANY    #
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS   #
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more       #
-# details.                                                                    #
+# FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for     #
+# more details.                                                               #
 #                                                                             #
-# You should have received a copy of the GNU General Public License along     #
-# with cmess. If not, see <http://www.gnu.org/licenses/>.                     #
+# You should have received a copy of the GNU Affero General Public License    #
+# along with cmess. If not, see <http://www.gnu.org/licenses/>.               #
 #                                                                             #
 ###############################################################################
 #++
 
-require 'optparse'
-
-$: << File.join(File.dirname(__FILE__), '..', 'lib')
-
 require 'cmess/decode_entities'
-require 'cmess/cli'
-
 include CMess::CLI
 
-PROGNAME = File.basename($0)
-
 options = {
   :input           => STDIN,
   :output          => STDOUT,
@@ -48,59 +40,59 @@ options = {
   :flavour         => CMess::DecodeEntities::DEFAULT_FLAVOUR
 }
 
-OptionParser.new { |opts|
+parse_options { |opts|
   opts.banner = "Usage: #{$0} [options] [FILE...]"
 
   opts.separator ''
   opts.separator 'Options:'
 
-  opts.on('-i', '--input FILE', "Input file to read from [Default: STDIN]") { |f|
-    options[:input] = open_file_or_std(f)
+  opts.on('-i', '--input FILE', 'Input file to read from [Default: STDIN]') { |input|
+    options[:input] = open_file_or_std(input)
     options[:input_set] = true
   }
 
-  opts.on('-o', '--output FILE', "Output file to write to [Default: STDOUT]") { |f|
-    options[:output] = open_file_or_std(f, 'w')
+  opts.on('-o', '--output FILE', 'Output file to write to [Default: STDOUT]') { |output|
+    options[:output] = open_file_or_std(output, 'w')
   }
 
-  opts.on('-I', '--in-place FILE', "Modify file in-place; sets '-i' and '-o'") { |f|
-    options[:input], options[:output] = open_file_in_place(f)
+  opts.on('-I', '--in-place FILE', "Modify file in-place; sets '-i' and '-o'") { |file|
+    options[:input], options[:output] = open_file_in_place(file)
     options[:input_set] = true
   }
 
   opts.separator ''
 
-  opts.on('-e', '--source-encoding ENCODING', "Encoding of input file [Default: #{options[:source_encoding].upcase}]") { |e|
-    options[:source_encoding] = e.downcase
+  opts.on('-e', '--source-encoding ENCODING', "Encoding of input file [Default: #{options[:source_encoding].upcase}]") { |encoding|
+    options[:source_encoding] = encoding.downcase
   }
 
-  opts.on('-t', '--target-encoding ENCODING', "Desired encoding for output file [Default: <source_encoding>]") { |e|
-    options[:target_encoding] = e.downcase
+  opts.on('-t', '--target-encoding ENCODING', 'Desired encoding for output file [Default: <source_encoding>]') { |encoding|
+    options[:target_encoding] = encoding.downcase
   }
 
   opts.separator ''
 
   opts.on('-f', '--flavour FLAVOUR', "Flavour to use for the HTMLEntities decoder [Default: #{options[:flavour]}]",
-                                     "(Available flavours are: #{HTMLEntities::FLAVORS.join(', ')})") { |f|
-    options[:flavour] = f
+                                     "(Available flavours are: #{HTMLEntities::FLAVORS.join(', ')})") { |flavour|
+    options[:flavour] = flavour
   }
 
   opts.separator ''
   opts.separator 'Generic options:'
 
-  opts.on('-h', '--help', "Print this help message and exit") {
+  opts.on('-h', '--help', 'Print this help message and exit') {
     puts opts
     exit
   }
 
-  opts.on('--version', "Print program version and exit") {
-    puts "#{PROGNAME} v#{CMess::DecodeEntities::VERSION} (part of cmess v#{CMess::VERSION})"
+  opts.on('--version', 'Print program version and exit') {
+    puts "#{File.basename($0)} v#{CMess::DecodeEntities::VERSION} (part of cmess v#{CMess::VERSION})"
     exit
   }
 
   opts.separator ''
-  opts.separator "When FILE is -, either STDIN or STDOUT is used (as appropriate)."
-}.parse!
+  opts.separator 'When FILE is -, either STDIN or STDOUT is used (as appropriate).'
+}
 
 cli do
   trailing_args_as_input(options)

data/bin/guess_encoding

@@ -6,7 +6,7 @@
 # guess_encoding -- Assist with guessing the encoding of some input at hand   #
 #   [A component of cmess, the encoding tool-box]                             #
 #                                                                             #
-# Copyright (C) 2007-2010 University of Cologne,                              #
+# Copyright (C) 2007-2011 University of Cologne,                              #
 #                         Albertus-Magnus-Platz,                              #
 #                         50923 Cologne, Germany                              #
 #                                                                             #
@@ -14,38 +14,24 @@
 #     Jens Wille <jens.wille@uni-koeln.de>                                    #
 #                                                                             #
 # cmess is free software; you can redistribute it and/or modify it under the  #
-# terms of the GNU General Public License as published by the Free Software   #
-# Foundation; either version 3 of the License, or (at your option) any later  #
-# version.                                                                    #
+# terms of the GNU Affero General Public License as published by the Free     #
+# Software Foundation; either version 3 of the License, or (at your option)   #
+# any later version.                                                          #
 #                                                                             #
 # cmess is distributed in the hope that it will be useful, but WITHOUT ANY    #
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS   #
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more       #
-# details.                                                                    #
+# FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for     #
+# more details.                                                               #
 #                                                                             #
-# You should have received a copy of the GNU General Public License along     #
-# with cmess. If not, see <http://www.gnu.org/licenses/>.                     #
+# You should have received a copy of the GNU Affero General Public License    #
+# along with cmess. If not, see <http://www.gnu.org/licenses/>.               #
 #                                                                             #
 ###############################################################################
 #++
 
-require 'optparse'
-
-require 'rubygems'
-require 'nuggets/string/word_wrap'
-
-$: << File.join(File.dirname(__FILE__), '..', 'lib')
-
 require 'cmess/guess_encoding'
-require 'cmess/cli'
-
 include CMess::CLI
 
-PROGNAME = File.basename($0)
-
-# short-cut
-CGE = CMess::GuessEncoding
-
 options = {
   :input                => STDIN,
   :line                 => 1,
@@ -56,140 +42,136 @@ options = {
   :chunk_size           => nil,
   :ignore_bom           => false,
   :charcodes            => nil,
-  :decimal              => false,
-  :octal                => false
+  :base                 => 16
 }
 
-OptionParser.new(nil, 40) { |opts|
+parse_options { |opts|
   opts.banner = "Usage: #{$0} [options] [FILE...]"
 
   opts.separator ''
   opts.separator 'Options:'
 
-  opts.on('-i', '--input FILE', "Input file to read from [Default: STDIN]") { |f|
-    options[:input] = open_file_or_std(f)
+  opts.on('-i', '--input FILE', 'Input file to read from [Default: STDIN]') { |input|
+    options[:input] = open_file_or_std(input)
     options[:input_set] = true
   }
 
   opts.separator ''
   opts.separator '  * Automatic guessing'
-  opts.separator ''
 
-  opts.on('-c', '--chunk-size SIZE', Integer, "Size of chunks input will be read in until a valid encoding", "has been found; by default the whole file will be read") { |s|
-    options[:chunk_size] = s
+  opts.on('-c', '--chunk-size SIZE', Integer, 'Size of chunks input will be read in until a valid encoding', 'has been found; by default the whole file will be read') { |size|
+    options[:chunk_size] = size
   }
 
   opts.separator ''
 
-  opts.on('-b', '--ignore-bom', "Ignore detected BOM (if any)", "(see below for a list of supported encodings)") {
+  opts.on('-b', '--ignore-bom', 'Ignore detected BOM (if any); see below for a list of', 'supported encodings') {
     options[:ignore_bom] = true
   }
 
   opts.separator ''
   opts.separator '  * Manual guessing'
-  opts.separator ''
 
-  opts.on('-m', '--manual', "Present variously encoded input for manual encoding guessing") {
+  opts.on('-m', '--manual', 'Present variously encoded input for manual encoding guessing') {
     options[:manual] = true
   }
 
   opts.separator ''
 
-  opts.on('-l', '--line LINE', "Line number of input file to use for testing [Default: #{options[:line]}]") { |l|
-    options[:line] = l.to_i
+  opts.on('-l', '--line LINE', Integer, "Line number of input file to use for testing [Default: #{options[:line]}]") { |line|
+    options[:line] = line
 
     unless options[:line] > 0
-      options[:input].read  # prevent 'Broken pipe' error
-      abort "Line number must be greater then 0!"
+      options[:input].read # prevent 'Broken pipe' error
+      abort 'Line number must be greater then 0!'
     end
   }
 
   opts.separator ''
 
-  opts.on('-e', '--encodings ENCODINGS...', "List of encodings to try >instead of< default (see below)") { |e|
+  opts.on('-e', '--encodings ENCODINGS...', 'List of encodings to try >instead of< default (see below)') { |encodings|
     options[:encodings] ||= []
-    options[:encodings] += e.split(SPLIT_ARG_LIST_RE)
+    options[:encodings] += arg_list(encodings)
   }
 
-  opts.on('-a', '--additional-encodings ENCODINGS...', "List of encodings to try >in addition to< default (see below)") { |e|
-    options[:additional_encodings] += e.split(SPLIT_ARG_LIST_RE)
+  opts.on('-a', '--additional-encodings ENCODINGS...', 'List of encodings to try >in addition to< default (see below)') { |encodings|
+    options[:additional_encodings] += arg_list(encodings)
   }
 
   opts.separator ''
 
-  opts.on('-t', '--target-encoding ENCODING', "Target encoding of your system [Default: #{options[:target_encoding]}]") { |e|
-    options[:target_encoding] = e
+  opts.on('-t', '--target-encoding ENCODING', "Target encoding of your system [Default: #{options[:target_encoding]}]") { |encoding|
+    options[:target_encoding] = encoding
   }
 
   opts.separator ''
 
   opts.on('-L', '--list-encodings', 'Print a list of all available encodings on your system and exit') {
-    puts CGE::Encoding.all_encodings
+    puts CMess::GuessEncoding::Encoding.all_encodings
     exit
   }
 
   opts.separator ''
   opts.separator '  * Charcodes'
-  opts.separator ''
 
-  opts.on('-C', '--charcodes CHARCODES', "Specify a list of character codes (in hexadecimal by default)", "for manual guessing. (Options '-e', '-a', and '-t' apply here", "as well; see under \"Manual guessing\" for details.)") { |c|
-    options[:charcodes] = c.split(SPLIT_ARG_LIST_RE)
+  opts.on('-C', '--charcodes CHARCODES', 'Specify a list of character codes (in hexadecimal by default)', "for manual guessing. (Options '-e', '-a', and '-t' apply here", 'as well; see "Manual guessing" for details.)') { |charcodes|
+    options[:charcodes] = arg_list(charcodes)
   }
 
   opts.separator ''
 
-  opts.on('-D', '--decimal', "Charcodes are in decimal") {
-    options[:decimal] = true
+  opts.on('-D', '--decimal', 'Charcodes are in decimal') {
+    options[:base] = 10
   }
 
-  opts.on('-O', '--octal', "Charcodes are in octal") {
-    options[:octal] = true
+  opts.on('-O', '--octal', 'Charcodes are in octal') {
+    options[:base] = 8
   }
 
   opts.separator ''
   opts.separator 'Generic options:'
 
-  opts.on('-h', '--help', "Print this help message and exit") {
+  opts.on('-h', '--help', 'Print this help message and exit') {
     puts opts
     exit
   }
 
-  opts.on('--version', "Print program version and exit") {
-    puts "#{PROGNAME} v#{CGE::VERSION} (part of cmess v#{CMess::VERSION})"
+  opts.on('--version', 'Print program version and exit') {
+    puts "#{File.basename($0)} v#{CMess::GuessEncoding::VERSION} (part of cmess v#{CMess::VERSION})"
     exit
   }
 
   opts.separator ''
   opts.separator 'Supported encodings for automatic guessing (will be tried in that order):'
-  CGE::Automatic.supported_encodings.join(', ').word_wrap(110, true).each { |l|
-    opts.separator l
+  CMess::GuessEncoding::Automatic.supported_encodings.join(', ').word_wrap(110, true).each { |list|
+    opts.separator list
   }
 
   opts.separator ''
   opts.separator 'Supported encodings for BOM detection (will be tried in that order):'
-  CGE::Automatic.supported_boms.join(', ').word_wrap(110, true).each { |l|
-    opts.separator l
+  CMess::GuessEncoding::Automatic.supported_boms.join(', ').word_wrap(110, true).each { |list|
+    opts.separator list
   }
 
   opts.separator ''
   opts.separator 'Default encodings for manual guessing:'
-  CGE::Manual::ENCODINGS.join(', ').word_wrap(110, true).each { |l|
-    opts.separator l
+  CMess::GuessEncoding::Manual::ENCODINGS.join(', ').word_wrap(110, true).each { |list|
+    opts.separator list
   }
 
   opts.separator ''
   opts.separator 'Likely candidates for additional testing:'
-  CGE::Manual::CANDIDATES.join(', ').word_wrap(110, true).each { |l|
-    opts.separator l
+  CMess::GuessEncoding::Manual::CANDIDATES.join(', ').word_wrap(110, true).each { |list|
+    opts.separator list
   }
 
   opts.separator ''
-  opts.separator 'NOTE: To select all encodings available on your system (see \'-L\'), specify __ALL__.'
+  opts.separator "NOTE: To select all encodings available on your system (see '-L'), specify __ALL__."
   opts.separator '      To select the likely candidates named above, specify __COMMON__.'
 
   opts.separator ''
-  opts.separator "When FILE is -, STDIN is used."
-}.parse!
+  opts.separator 'When FILE is -, STDIN is used.'
+}
 
 cli do
   trailing_args_as_input(options)
@@ -198,27 +180,17 @@ cli do
     options[:target_encoding].call if options[:target_encoding].respond_to?(:call)
 
     if charcodes = options[:charcodes]
-      base  = options[:octal] ? 8 : options[:decimal] ? 10 : 16
-      input = charcodes.map { |c| c.to_i(base).chr }.join
+      input = charcodes.map { |charcode| charcode.to_i(options[:base]).chr }.join
     else
-      # reset line counter
-      $. = 0
-
-      input = options[:input].each { |line|
-        break line if $. == options[:line]
-      }
+      $. = 0 # reset line counter
+      input = options[:input].each { |line| break line if $. == options[:line] }
 
       abort "Input was empty!" if $..zero?
       abort "Line not found -- input has only #{$.} line#{'s' if $. != 1}" unless input.is_a?(String)
     end
 
-    CGE::Manual.display(
-      input,
-      options[:target_encoding],
-      options[:encodings],
-      options[:additional_encodings]
-    )
-  else  # automatic
-    puts CGE::Automatic.guess(options[:input], options[:chunk_size], options[:ignore_bom])
+    CMess::GuessEncoding.manual(options.merge(:input => input))
+  else
+    puts CMess::GuessEncoding.automatic(options[:input], options[:chunk_size], options[:ignore_bom])
   end
 end