nicolus 1.1.0 → 1.2.0

data/README.txt

@@ -1,5 +1,5 @@
 = nicolus
-http://nicolus.rubyforge.org/
+http://benjamin.francisoud.googlepages.com/nicolus
 by Benjamin Francisoud
 
 == DESCRIPTION:
@@ -14,16 +14,26 @@ Nicolus is a simple program to make all possible combination out of 2 or more li
 == SYNOPSIS:
 
 For example:
-  listA = aaa, bbb, ccc
-  listB = 111, 222
+  listA = [aaa, bbb, ccc]
+  listB = [111, 222]
 
 Combination will be:
-  result= aaa 111, aaa 222, bbb 111, bbb 222, ccc 111, ccc 222
+  result= [aaa 111, aaa 222, bbb 111, bbb 222, ccc 111, ccc 222]
 
 == INSTALL:
 
 * gem install nicolus
 
+== USAGE
+
+* C:\>nicolus
+
+== LINKS
+
+* Homepage http://benjamin.francisoud.googlepages.com/nicolus
+* RDoc http://nicolus.rubyforge.org/
+* Rubyforge Page http://www.rubyforge.org/projects/nicolus
+
 == LICENSE:
 
 (The MIT License)

data/lib/nicolus.rb

@@ -1,4 +1,5 @@
 require 'matrix'
+require 'iconv'
 
 class Object
  def blank?
@@ -7,6 +8,16 @@ class Object
 end
 
 class String
+
+  def utf16_to_iso
+    converter = Iconv.new('ISO-8859-1//IGNORE//TRANSLIT', 'UTF-16')
+    converter.iconv(self)
+  end
+
+  def nicolus_split
+    self.chomp.gsub("\t", ',').split(',')
+  end
+
   def unquote!
     # remove first
     unless (gsub!(/\A\"/, '').nil?)
@@ -17,12 +28,16 @@ class String
 end
 
 module Nicolus
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 
+  # Usage
+  #    comb = Nicolus::Combinaison.new("input.csv", "output.csv", true, true)
+  #    comb.run
   class Combinaison
-    def initialize(input_file, filename, inv=false)
+    def initialize(input_file, filename, inv=false, unicode=false)
       @input_file, @filename = input_file, filename
       @inv = inv
+      @unicode = unicode
     end
     
     def inverse?
@@ -35,9 +50,17 @@ module Nicolus
     # => [[a, b, c], [1, 2, 3], [A, B, C]]
     def create_lists
       list = []
-      IO.foreach(@input_file) do |line|
-        columns = line.chomp.split(',')
-        list << columns
+      if (@unicode)
+        content = IO.read(@input_file).utf16_to_iso
+        content.split("\n").each do |line|
+          columns = line.nicolus_split # chomp.gsub("\t", ',').split(',')
+          list << columns
+        end
+      else
+        IO.foreach(@input_file) do |line|
+          columns = line.nicolus_split # chomp.gsub("\t", ',').split(',')
+          list << columns
+        end
       end
       # [[a, 1, A], [b, 2, B], [c, 3, C]] => [[a, b, c], [1, 2, 3], [A, B, C]]
       @listes = (Matrix.rows list).transpose.to_a

data/lib/opt_parse.rb

@@ -3,6 +3,12 @@ require File.dirname(__FILE__) + '/nicolus.rb'
 
 module Nicolus
 
+  # Usage:
+  #    options = Nicolus::OptParse.parse(ARGV)
+  #    puts options[:input]
+  #    puts options[:output]
+  #    puts options[:inverse]
+  #    puts options[:unicode]
   class OptParse
     # Return a structure describing the options.
     def self.parse(args)
@@ -27,6 +33,10 @@ module Nicolus
           options[:inverse] = inv
         end
         
+        opts.on("-U", "--unicode", "Input is Unicode") do |unicode|
+          options[:unicode] = unicode
+        end
+        
         opts.separator ""
         opts.separator "Common options:"
         
@@ -50,5 +60,5 @@ module Nicolus
 end # module Nicolus
 
 options = Nicolus::OptParse.parse(ARGV)
-comb = Nicolus::Combinaison.new(options[:input], options[:output], options[:inverse])
+comb = Nicolus::Combinaison.new(options[:input], options[:output], options[:inverse], options[:unicode])
 comb.run

data/test/test_nicolus.rb

@@ -1,4 +1,5 @@
 require 'test/unit'
+require 'fileutils.rb'
 require File.dirname(__FILE__) + '/../lib/nicolus.rb'
 
 class TestNicolus < Test::Unit::TestCase
@@ -29,7 +30,19 @@ class TestNicolus < Test::Unit::TestCase
     assert File.exist?("test/combinaison_3_col_inverse.csv")
     File.delete "test/combinaison_3_col_inverse.csv"
   end
+
+  def test_run_tabs_utf
+    comb = Nicolus::Combinaison.new("test/listes_tabs_utf.csv", "test/combinaison_tabs_utf.csv", false, true)
+    comb.run
+    assert File.exist?("test/combinaison_tabs_utf.csv")
+  end
   
+  def test_run_tabs_no_utf
+    comb = Nicolus::Combinaison.new("test/listes_tabs.csv", "test/combinaison_tabs.csv") #, true)
+    comb.run
+    assert File.exist?("test/combinaison_tabs.csv")
+  end
+
   def test_unquote_normal
     to_unquote = "abc"
     to_unquote.unquote!
@@ -53,4 +66,11 @@ class TestNicolus < Test::Unit::TestCase
     to_unquote.unquote!
     assert_equal "ab\"c", to_unquote
   end
+<<<<<<< .mine
 end
+=======
+
+  def teardown
+    FileUtils.rm_f Dir['test/combinaison*']
+  end
+end>>>>>>> .r12

metadata

@@ -3,13 +3,13 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: nicolus
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
-date: 2008-02-15 00:00:00 +01:00
+  version: 1.2.0
+date: 2008-02-19 00:00:00 +01:00
 summary: Nicolus is a simple program to make all possible combination out of 2 or more lists of words.
 require_paths: 
 - lib
 email: pub.cog@gmail.com
-homepage: http://nicolus.rubyforge.org/
+homepage: http://benjamin.francisoud.googlepages.com/nicolus
 rubyforge_project: nicolus
 description: "Nicolus is a simple program to make all possible combination out of 2 or more lists of words.  == FEATURES/PROBLEMS:  * Command line parser * \"inverse\" generate \"aaa 111\" and \"111 aaa\"   == SYNOPSIS:"
 autorequire: