cmess 0.0.4.157 → 0.0.5.182

data/ChangeLog

@@ -1,5 +1,14 @@
 = Revision history for cmess
 
+== 0.0.5 [2008-01-21]
+
+* Made automatic guessing the default for guess_encoding
+* Allow to specify input file as argument
+
+== 0.0.4 [2007-12-18]
+
+* Added BOM detection
+
 == 0.0.3 [2007-12-12]
 
 * Added automatic encoding detection to GuessEncoding. Idea and original

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to cmess version 0.0.4
+This documentation refers to cmess version 0.0.5
 
 
 == DESCRIPTION

data/bin/cinderella

@@ -56,13 +56,14 @@ options = {
 }
 
 OptionParser.new(nil, 40) { |opts|
-  opts.banner = "Usage: #{$0} [options]"
+  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)
+    options[:input_set] = true
   }
 
   opts.separator ''
@@ -88,6 +89,7 @@ OptionParser.new(nil, 40) { |opts|
 
   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)
+    options[:input_set] = true
 
     options[:pot]  = options[:output]
     options[:crop] = options[:output]
@@ -175,6 +177,10 @@ char_file = options[:csets].inject(nil) { |path, cset|
 abort "Char file not found for target encoding: #{options[:target_encoding]}" \
   unless char_file
 
+if ARGV[0] && !options[:input_set]
+  options[:input] = open_file_or_std(ARGV[0])
+end
+
 CMess::Cinderella.pick(
   options[:input],
   options[:pot],

data/bin/decode_entities

@@ -49,13 +49,14 @@ options = {
 }
 
 OptionParser.new { |opts|
-  opts.banner = "Usage: #{$0} [options]"
+  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)
+    options[:input_set] = true
   }
 
   opts.on('-o', '--output FILE', "Output file to write to [Default: STDOUT]") { |f|
@@ -64,6 +65,7 @@ OptionParser.new { |opts|
 
   opts.on('-I', '--in-place FILE', "Modify file in-place; sets '-i' and '-o'") { |f|
     options[:input], options[:output] = open_file_in_place(f)
+    options[:input_set] = true
   }
 
   opts.separator ''
@@ -93,6 +95,10 @@ OptionParser.new { |opts|
   opts.separator "When FILE is -, either STDIN or STDOUT is used (as appropriate)."
 }.parse!
 
+if ARGV[0] && !options[:input_set]
+  options[:input] = open_file_or_std(ARGV[0])
+end
+
 CMess::DecodeEntities.decode(
   options[:input],
   options[:output],

data/bin/guess_encoding

@@ -56,25 +56,44 @@ options = {
   :encodings            => nil,
   :additional_encodings => [],
   :target_encoding      => determine_system_encoding,
-  :guess                => false,
+  :manual               => false,
   :chunk_size           => nil,
   :ignore_bom           => false
 }
 
 OptionParser.new(nil, 40) { |opts|
-  opts.banner = "Usage: #{$0} [options]"
+  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)
+    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.separator ''
+
+  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") {
+    options[:manual] = true
+  }
+
   opts.on('-l', '--line LINE', "Line number of input file to use for testing [Default: #{options[:line]}]") { |l|
     options[:line] = l.to_i
 
@@ -101,24 +120,6 @@ OptionParser.new(nil, 40) { |opts|
     options[:target_encoding] = e
   }
 
-  opts.separator ''
-  opts.separator '  * Automatic guessing'
-  opts.separator ''
-
-  opts.on('-g', '--guess', "Actually guess the encoding of the input, automatically!", "(see below for a list of supported encodings)") {
-    options[:guess] = true
-  }
-
-  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.separator ''
-
-  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 'Generic options:'
 
@@ -160,7 +161,11 @@ OptionParser.new(nil, 40) { |opts|
   opts.separator "When FILE is -, STDIN is used."
 }.parse!
 
-if options[:guess]
+if ARGV[0] && !options[:input_set]
+  options[:input] = open_file_or_std(ARGV[0])
+end
+
+unless options[:manual]
   puts CGE::Automatic.guess(options[:input], options[:chunk_size], options[:ignore_bom])
 else
   options[:target_encoding].call if options[:target_encoding].respond_to?(:call)

data/lib/cmess/version.rb

@@ -30,7 +30,7 @@ module CMess::Version
 
   MAJOR = 0
   MINOR = 0
-  TINY  = 4
+  TINY  = 5
 
   class << self
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cmess
 version: !ruby/object:Gem::Version 
-  version: 0.0.4.157
+  version: 0.0.5.182
 platform: ruby
 authors: 
 - Jens Wille
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-08 00:00:00 +01:00
+date: 2008-01-21 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -86,14 +86,14 @@ homepage: http://prometheus.rubyforge.org/cmess
 post_install_message: 
 rdoc_options: 
 - --all
-- --inline-source
-- --charset
-- UTF-8
-- --main
-- README
 - --title
 - cmess Application documentation
 - --line-numbers
+- --main
+- README
+- --inline-source
+- --charset
+- UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement