ruby-bsdconv 11.1.0 → 11.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0066bb97b35708c2537ce5e757ba9bbcdb507a44
-  data.tar.gz: 7e09436a715d04d719d71a9f52c4a29a35f5cc00
+  metadata.gz: ac83b010e742d45610e126dbf4e0fec6fcd3b717
+  data.tar.gz: ec794f163b76f01e5bdd6a9fd481affeeab81215
 SHA512:
-  metadata.gz: 3da4b1f5d9743358fda293bca924e022dfaa394104c6465873063ccdf3e326a4aa4c795911e002549981e1df9ab41257a66ed6178bb20c7f5581bf9434763748
-  data.tar.gz: f0cb64891797a31c7b225dd1b148cc17616f2604e28b3802c43f0115f837ee6f2e19ea19e34275ed88385fb014f37f2d0d47c65b709363a6ed04715fbe2c00e8
+  metadata.gz: efa3bf01b8e64282a142dad8315df7a9db9254335dce0b6cced96e285b7317200dbba88bc1d84153f89cf5c1f12e7812097664f4289e049f46e02aef00507a9d
+  data.tar.gz: 9e83c49f520b3c95dd5700ae0383776f6269cca868e36025149ad1863a98193d1cd296abfa0aebeeb7d0183d7fb31ea5b4e9c56583f6bab2800f8d1bb346cecf

data/README.md

@@ -0,0 +1,10 @@
+#Gems
+	https://rubygems.org/gems/ruby-bsdconv
+
+#Documentation
+	http://buganini.github.io/bsdconv/ruby-bsdconv/doc/api.html
+
+	see example/* for example
+
+#Support
+	IRC: irc://irc.freenode.net#bsdconv

data/Rakefile

@@ -2,24 +2,16 @@
 
 require "#{dir = File.dirname(__FILE__)}/task/gemgem"
 
-Gemgem.dir = dir
-($LOAD_PATH << File.expand_path("#{Gemgem.dir}/lib")).uniq!
-
-desc 'Generate gemspec'
-task 'gem:spec' do
-  Gemgem.spec = Gemgem.create do |s|
-    s.name    = 'ruby-bsdconv'
-    s.version = '11.1.0'
-    s.extensions  = 'ext/ruby-bsdconv/extconf.rb'
-    s.authors     = ['Buganini Q']
-    s.email       = 'buganini@gmail.com'
-    s.homepage    = 'https://github.com/buganini/ruby-bsdconv'
-    s.license     = 'BSD'
-    s.summary     = 'ruby wrapper for bsdconv'
-    s.description =
-      "#{s.summary}. bsdconv is a BSD licensed charset/encoding converter" \
-      " library with more functionalities than libiconv"
-  end
-
-  Gemgem.write
+Gemgem.init(dir) do |s|
+  s.name        = 'ruby-bsdconv'
+  s.version     = '11.3.1'
+  s.extensions  = 'ext/ruby-bsdconv/extconf.rb'
+  s.authors     = ['Buganini Q']
+  s.email       = 'buganini@gmail.com'
+  s.homepage    = 'https://github.com/buganini/ruby-bsdconv'
+  s.license     = 'BSD'
+  s.summary     = 'ruby wrapper for bsdconv'
+  s.description =
+    "#{s.summary}. bsdconv is a BSD licensed charset/encoding converter" \
+    " library with more functionalities than libiconv"
 end

data/doc/api.rst

@@ -0,0 +1,99 @@
+Ruby binding API
+================
+
+.. rb:module:: bsdconv
+
+.. rb:class:: Bsdconv
+
+	.. rb:const:: FILTER
+	.. rb:const:: FROM
+	.. rb:const:: INTER
+	.. rb:const:: TO
+
+		Phase type
+
+	.. rb:const:: CTL_ATTACH_SCORE
+	.. rb:const:: CTL_ATTACH_OUTPUT_FILE
+	.. rb:const:: CTL_AMBIGUOUS_PAD
+
+		Request for :rb:meth:`ctl`
+
+	.. rb:classmethod:: new(conversion)
+
+		Create converter instance with given conversion string
+
+	.. rb:classmethod:: insert_phase(conversion, codec, phase_type, phasen)
+
+		Insert conversion phase into bsdconv conversion string
+
+	.. rb:classmethod:: insert_codec(conversion, codec, phasen, codecn)
+
+		Insert conversion codec into bsdconv conversion string
+
+	.. rb:classmethod:: replace_phase(conversion, codec, phase_type, phasen)
+
+		Replace conversion phase in the bsdconv conversion string
+
+	.. rb:classmethod:: replace_codec(conversion, codec, phasen, codecn)
+
+		Replace conversion codec in the bsdconv conversion string
+
+	.. rb:classmethod:: error()
+
+		Get error message
+
+	.. rb:classmethod:: codecs_list(type)
+
+		DEPRECATED: Use :rb:meth:`modules_list` instead
+
+	.. rb:classmethod:: modules_list(type)
+
+		Get modules list of specified type
+
+	.. rb:classmethod:: codec_check(type, module)
+
+		DEPRECATED: Use :rb:meth:`module_check` instead
+
+	.. rb:classmethod:: module_check(type, module)
+
+		Check availability with given type and module name
+
+	.. rb:classmethod:: mktemp(template)
+
+		mkstemp()
+
+	.. rb:classmethod:: fopen(path, mode)
+
+		fopen()
+
+	.. rb:method:: conv(s)
+
+		Perform conversion
+
+	.. rb:method:: init()
+
+		Initialize/Reset bsdconv converter
+
+	.. rb:method:: ctl(arg_ptr_obj, arg_int)
+
+		Manipulate the underlying codec parameters
+
+	.. rb:method:: conv_chunk(s)
+
+		Perform conversion without initializing and flushing
+
+	.. rb:method:: conv_chunk_last(s)
+
+		Perform conversion without initializing
+
+	.. rb:method:: conv_file(from_file, to_file)
+
+		Perform conversion with given filename
+
+	.. rb:method:: counter([name])
+
+		Return conversion info
+
+	.. rb:method:: counter_reset([name])
+
+		Reset counter, if no name supplied, all counters will be reset

data/example/example_conv.rb

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+
+require 'bsdconv'
+
+c = Bsdconv.new(ARGV[0])
+
+if c.nil?
+	abort(Bsdconv.error())
+end
+
+s = ""
+c.init
+while $stdin.gets
+	s += $_
+end
+puts c.conv(s)
+
+p c.counter

data/example/example_conv_file.rb

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+require 'bsdconv'
+
+c = Bsdconv.new(ARGV[0])
+
+if c.nil?
+	abort(Bsdconv.error())
+end
+
+c.conv_file(ARGV[1], ARGV[2])
+
+p c
+p c.counter

data/example/{example3.rb → example_ctl.rb}

@@ -5,7 +5,7 @@ require 'bsdconv'
 score,path=Bsdconv::mktemp("score.XXXXXX")
 list=open("characters_list.txt","w+")
 
-c=Bsdconv.new('utf-8:score_train:null')
+c=Bsdconv.new('utf-8:score-train:null')
 c.init
 
 c.ctl(Bsdconv::CTL_ATTACH_SCORE, score, 0);

data/example/example_insert_replace.rb

@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+
+require 'bsdconv'
+
+sin="utf-8:utf-8,ascii"
+sout=Bsdconv.insert_phase(sin, "upper", Bsdconv::INTER, 1)
+puts sout
+
+sin=sout
+sout=Bsdconv.replace_phase(sin, "full", Bsdconv::INTER, 1)
+puts sout
+
+sin=sout
+sout=Bsdconv.replace_codec(sin, "big5", 2, 1)
+puts sout
+
+sin=sout
+sout=Bsdconv.insert_codec(sin, "ascii", 0, 1)
+puts sout

data/example/example_modules.rb

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+require 'bsdconv'
+
+p Bsdconv.module_check(Bsdconv::FROM, "_utf-8")
+p Bsdconv.module_check(Bsdconv::INTER, "_utf-8")
+puts 'Filter:'
+p Bsdconv.modules_list(Bsdconv::FILTER)
+puts 'From:'
+p Bsdconv.modules_list(Bsdconv::FROM)
+puts 'Inter:'
+p Bsdconv.modules_list(Bsdconv::INTER)
+puts 'To:'
+p Bsdconv.modules_list(Bsdconv::TO)

data/ext/ruby-bsdconv/bsdconv.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2013 Kuan-Chung Chiu <buganini@gmail.com>
+ * Copyright (c) 2011-2014 Kuan-Chung Chiu <buganini@gmail.com>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -40,7 +40,6 @@ static VALUE m_conv_chunk_last(VALUE, VALUE);
 static VALUE m_conv_file(VALUE, VALUE, VALUE);
 static VALUE m_counter(int, VALUE *, VALUE);
 static VALUE m_counter_reset(int, VALUE *, VALUE);
-static VALUE m_nil(VALUE);
 static VALUE m_inspect(VALUE);
 
 static VALUE f_insert_phase(VALUE, VALUE, VALUE, VALUE, VALUE);
@@ -48,8 +47,8 @@ static VALUE f_insert_codec(VALUE, VALUE, VALUE, VALUE, VALUE);
 static VALUE f_replace_phase(VALUE, VALUE, VALUE, VALUE, VALUE);
 static VALUE f_replace_codec(VALUE, VALUE, VALUE, VALUE, VALUE);
 static VALUE f_error(VALUE);
-static VALUE f_codecs_list(VALUE, VALUE);
-static VALUE f_codec_check(VALUE, VALUE, VALUE);
+static VALUE f_modules_list(VALUE, VALUE);
+static VALUE f_module_check(VALUE, VALUE, VALUE);
 static VALUE f_mktemp(VALUE, VALUE);
 static VALUE f_fopen(VALUE, VALUE, VALUE);
 
@@ -68,22 +67,24 @@ void Init_bsdconv(){
 	rb_define_method(Bsdconv, "counter_reset", m_counter_reset, -1);
 	rb_define_method(Bsdconv, "inspect", m_inspect, 0);
 
+	rb_define_const(Bsdconv, "FILTER", INT2NUM(FILTER));
 	rb_define_const(Bsdconv, "FROM", INT2NUM(FROM));
 	rb_define_const(Bsdconv, "INTER", INT2NUM(INTER));
 	rb_define_const(Bsdconv, "TO", INT2NUM(TO));
 
-	rb_define_const(Bsdconv, "CTL_ATTACH_SCORE", INT2NUM(BSDCONV_ATTACH_SCORE));
-	rb_define_const(Bsdconv, "CTL_SET_WIDE_AMBI", INT2NUM(BSDCONV_SET_WIDE_AMBI));
-	rb_define_const(Bsdconv, "CTL_SET_TRIM_WIDTH", INT2NUM(BSDCONV_SET_TRIM_WIDTH));
-	rb_define_const(Bsdconv, "CTL_ATTACH_OUTPUT_FILE", INT2NUM(BSDCONV_ATTACH_OUTPUT_FILE));
+	rb_define_const(Bsdconv, "CTL_ATTACH_SCORE", INT2NUM(BSDCONV_CTL_ATTACH_SCORE));
+	rb_define_const(Bsdconv, "CTL_ATTACH_OUTPUT_FILE", INT2NUM(BSDCONV_CTL_ATTACH_OUTPUT_FILE));
+	rb_define_const(Bsdconv, "CTL_AMBIGUOUS_PAD", INT2NUM(BSDCONV_CTL_AMBIGUOUS_PAD));
 
 	rb_define_singleton_method(Bsdconv, "insert_phase", f_insert_phase, 4);
 	rb_define_singleton_method(Bsdconv, "insert_codec", f_insert_codec, 4);
 	rb_define_singleton_method(Bsdconv, "replace_phase", f_replace_phase, 4);
 	rb_define_singleton_method(Bsdconv, "replace_codec", f_replace_codec, 4);
 	rb_define_singleton_method(Bsdconv, "error", f_error, 0);
-	rb_define_singleton_method(Bsdconv, "codecs_list", f_codecs_list, 1);
-	rb_define_singleton_method(Bsdconv, "codec_check", f_codec_check, 2);
+	rb_define_singleton_method(Bsdconv, "modules_list", f_modules_list, 1);
+	rb_define_singleton_method(Bsdconv, "module_check", f_module_check, 2);
+	rb_define_singleton_method(Bsdconv, "codecs_list", f_modules_list, 1);
+	rb_define_singleton_method(Bsdconv, "codec_check", f_module_check, 2);
 	rb_define_singleton_method(Bsdconv, "mktemp", f_mktemp, 1);
 	rb_define_singleton_method(Bsdconv, "fopen", f_fopen, 2);
 
@@ -246,7 +247,6 @@ static VALUE m_counter(int argc, VALUE *argv, VALUE self){
 }
 
 static VALUE m_counter_reset(int argc, VALUE *argv, VALUE self){
-	VALUE ret;
 	struct bsdconv_instance *ins;
 	Data_Get_Struct(self, struct bsdconv_instance, ins);
 	if(argc!=0){
@@ -277,28 +277,28 @@ static VALUE m_inspect(VALUE self){
 
 static VALUE f_insert_phase(VALUE self, VALUE conversion, VALUE codec, VALUE phase_type, VALUE phasen){
 	char *s=bsdconv_insert_phase(RSTRING_PTR(conversion), RSTRING_PTR(codec), NUM2INT(phase_type), NUM2INT(phasen));
-	char *ret=rb_str_new2(s);
+	VALUE ret=rb_str_new2(s);
 	bsdconv_free(s);
 	return ret;
 }
 
 static VALUE f_insert_codec(VALUE self, VALUE conversion, VALUE codec, VALUE phasen, VALUE codecn){
 	char *s=bsdconv_insert_codec(RSTRING_PTR(conversion), RSTRING_PTR(codec), NUM2INT(phasen), NUM2INT(codecn));
-	char *ret=rb_str_new2(s);
+	VALUE ret=rb_str_new2(s);
 	bsdconv_free(s);
 	return ret;
 }
 
 static VALUE f_replace_phase(VALUE self, VALUE conversion, VALUE codec, VALUE phase_type, VALUE phasen){
 	char *s=bsdconv_replace_phase(RSTRING_PTR(conversion), RSTRING_PTR(codec), NUM2INT(phase_type), NUM2INT(phasen));
-	char *ret=rb_str_new2(s);
+	VALUE ret=rb_str_new2(s);
 	bsdconv_free(s);
 	return ret;
 }
 
 static VALUE f_replace_codec(VALUE self, VALUE conversion, VALUE codec, VALUE phasen, VALUE codecn){
 	char *s=bsdconv_replace_codec(RSTRING_PTR(conversion), RSTRING_PTR(codec), NUM2INT(phasen), NUM2INT(codecn));
-	char *ret=rb_str_new2(s);
+	VALUE ret=rb_str_new2(s);
 	bsdconv_free(s);
 	return ret;
 }
@@ -311,11 +311,11 @@ static VALUE f_error(VALUE self){
 	return ret;
 }
 
-static VALUE f_codecs_list(VALUE self, VALUE phase_type){
+static VALUE f_modules_list(VALUE self, VALUE phase_type){
 	char **list, **p;
 	VALUE ret;
 	ret=rb_ary_new();
-	list=bsdconv_codecs_list(NUM2INT(phase_type));
+	list=bsdconv_modules_list(NUM2INT(phase_type));
 	p=list;
 	while(*p!=NULL){
 		rb_ary_push(ret, rb_str_new2(*p));
@@ -326,8 +326,8 @@ static VALUE f_codecs_list(VALUE self, VALUE phase_type){
 	return ret;
 }
 
-static VALUE f_codec_check(VALUE self, VALUE phase_type, VALUE codec){
-	if(bsdconv_codec_check(NUM2INT(phase_type), RSTRING_PTR(codec))){
+static VALUE f_module_check(VALUE self, VALUE phase_type, VALUE codec){
+	if(bsdconv_module_check(NUM2INT(phase_type), RSTRING_PTR(codec))){
 		return Qtrue;
 	}
 	return Qfalse;

data/ruby-bsdconv.gemspec

@@ -1,23 +1,29 @@
 # -*- encoding: utf-8 -*-
-# stub: ruby-bsdconv 11.1.0 ruby lib
+# stub: ruby-bsdconv 11.3.1 ruby lib
+# stub: ext/ruby-bsdconv/extconf.rb
 
 Gem::Specification.new do |s|
   s.name = "ruby-bsdconv"
-  s.version = "11.1.0"
+  s.version = "11.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["Buganini Q"]
-  s.date = "2013-09-16"
+  s.date = "2014-05-13"
   s.description = "ruby wrapper for bsdconv. bsdconv is a BSD licensed charset/encoding converter library with more functionalities than libiconv"
   s.email = "buganini@gmail.com"
   s.extensions = ["ext/ruby-bsdconv/extconf.rb"]
   s.files = [
   ".gitignore",
-  "README",
+  "README.md",
   "Rakefile",
-  "example/example.rb",
-  "example/example2.rb",
-  "example/example3.rb",
+  "doc/api.rst",
+  "example/example_chunk.rb",
+  "example/example_conv.rb",
+  "example/example_conv_file.rb",
+  "example/example_ctl.rb",
+  "example/example_insert_replace.rb",
+  "example/example_modules.rb",
   "ext/ruby-bsdconv/bsdconv.c",
   "ext/ruby-bsdconv/extconf.rb",
   "ruby-bsdconv.gemspec",
@@ -25,8 +31,7 @@ Gem::Specification.new do |s|
   "test/test_basic.rb"]
   s.homepage = "https://github.com/buganini/ruby-bsdconv"
   s.licenses = ["BSD"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "2.1.3"
+  s.rubygems_version = "2.2.2"
   s.summary = "ruby wrapper for bsdconv"
   s.test_files = ["test/test_basic.rb"]
 end

data/task/gemgem.rb

@@ -1,106 +1,144 @@
 
-require 'pathname'
-
 module Gemgem
   class << self
-    attr_accessor :dir, :spec
+    attr_accessor :dir, :spec, :spec_create
   end
 
   module_function
-  def create
-    yield(spec = Gem::Specification.new{ |s|
-      s.rubygems_version = Gem::VERSION
-      s.date             = Time.now.strftime('%Y-%m-%d')
-      s.files            = gem_files
-      s.test_files       = gem_files.grep(%r{^test/(.+?/)*test_.+?\.rb$})
-      s.executables      = Dir['bin/*'].map{ |f| File.basename(f) }
-      s.require_paths    = %w[lib]
-    })
-    spec
-  end
-
-  def gem_tag
-    spec.version.to_s
+  def gem_tag    ; spec.version.to_s                  ; end
+  def gem_path   ; "#{pkg_dir}/#{spec.name}-#{gem_tag}.gem"; end
+  def spec_path  ; "#{dir}/#{spec.name}.gemspec"      ; end
+  def pkg_dir    ; "#{dir}/pkg"                       ; end
+  def escaped_dir; @escaped_dir ||= Regexp.escape(dir); end
+
+  def init dir, &block
+    self.dir = dir
+    $LOAD_PATH.unshift("#{dir}/lib")
+    ENV['RUBYLIB'] = "#{dir}/lib:#{ENV['RUBYLIB']}"
+    ENV['PATH']    = "#{dir}/bin:#{ENV['PATH']}"
+    self.spec_create = block
   end
 
-  def gem_filename
-    "#{spec.name}-#{spec.version}.gem"
+  def create
+    spec = Gem::Specification.new do |s|
+      s.date        = Time.now.strftime('%Y-%m-%d')
+      s.files       = gem_files
+      s.test_files  = test_files
+      s.executables = bin_files
+    end
+    spec_create.call(spec)
+    self.spec = spec
   end
 
   def write
-    File.open("#{dir}/#{spec.name}.gemspec", 'w'){ |f|
-      f << split_lines(spec.to_ruby) }
+    File.open(spec_path, 'w'){ |f| f << split_lines(spec.to_ruby) }
   end
 
   def split_lines ruby
-    ruby.gsub(/(.+?)\[(.+?)\]/){ |s|
+    ruby.gsub(/(.+?)\s*=\s*\[(.+?)\]/){ |s|
       if $2.index(',')
-        "#{$1}[\n  #{$2.split(',').map(&:strip).join(",\n  ")}]"
+        "#{$1} = [\n  #{$2.split(',').map(&:strip).join(",\n  ")}]"
       else
         s
       end
     }
   end
 
+  def strip_path path
+    strip_home_path(strip_cwd_path(path))
+  end
+
+  def strip_home_path path
+    path.sub(ENV['HOME'], '~')
+  end
+
+  def strip_cwd_path path
+    path.sub(Dir.pwd, '.')
+  end
+
+  def git *args
+    `git --git-dir=#{dir}/.git #{args.join(' ')}`
+  end
+
+  def sh_git *args
+    Rake.sh('git', "--git-dir=#{dir}/.git", *args)
+  end
+
+  def sh_gem *args
+    Rake.sh(Gem.ruby, '-S', 'gem', *args)
+  end
+
+  def glob path=dir
+    Dir.glob("#{path}/**/*", File::FNM_DOTMATCH)
+  end
+
   def all_files
-    @all_files ||= find_files(Pathname.new(dir)).map{ |file|
-      if file.to_s =~ %r{\.git/|\.git$}
-        nil
+    @all_files ||= fold_files(glob).sort
+  end
+
+  def fold_files files
+    files.inject([]){ |r, path|
+      if File.file?(path) && path !~ %r{/\.git(/|$)}  &&
+         (rpath = path[%r{^#{escaped_dir}/(.*$)}, 1])
+        r << rpath
+      elsif File.symlink?(path) # walk into symlinks...
+        r.concat(fold_files(glob(File.expand_path(path,
+                                                  File.readlink(path)))))
       else
-        file.to_s
+        r
       end
-    }.compact.sort
+    }
   end
 
   def gem_files
-    @gem_files ||= all_files - ignored_files
+    @gem_files ||= all_files.reject{ |f|
+      f =~ ignored_pattern && !git_files.include?(f)
+    }
   end
 
-  def ignored_files
-    @ignored_file ||= all_files.select{ |path| ignore_patterns.find{ |ignore|
-      path =~ ignore && !git_files.include?(path)}}
+  def test_files
+    @test_files ||= gem_files.grep(%r{^test/(.+?/)*test_.+?\.rb$})
+  end
+
+  def bin_files
+    @bin_files ||= gem_files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   end
 
   def git_files
     @git_files ||= if File.exist?("#{dir}/.git")
-                     `git ls-files`.split("\n")
+                     git('ls-files').split("\n")
                    else
                      []
                    end
   end
 
-  # protected
-  def find_files path
-    path.children.select(&:file?).map{|file| file.to_s[(dir.size+1)..-1]} +
-    path.children.select(&:directory?).map{|dir| find_files(dir)}.flatten
+  def ignored_files
+    @ignored_files ||= all_files.grep(ignored_pattern)
   end
 
-  def ignore_patterns
-    @ignore_files ||= expand_patterns(
-      gitignore.split("\n").reject{ |pattern|
-        pattern.strip == ''
-      }).map{ |pattern| %r{^([^/]+/)*?#{Regexp.escape(pattern)}(/[^/]+)*?$} }
+  def ignored_pattern
+    @ignored_pattern ||= if gitignore.empty?
+                           /^$/
+                         else
+                           Regexp.new(expand_patterns(gitignore).join('|'))
+                         end
   end
 
   def expand_patterns pathes
-    pathes.map{ |path|
-      if path !~ /\*/
-        path
-      else
-        expand_patterns(
-          Dir[path] +
-          Pathname.new(File.dirname(path)).children.select(&:directory?).
-            map{ |prefix| "#{prefix}/#{File.basename(path)}" })
-      end
-    }.flatten
+    # http://git-scm.com/docs/gitignore
+    pathes.flat_map{ |path|
+      # we didn't implement negative pattern for now
+      Regexp.escape(path).sub(%r{^/}, '^').gsub(/\\\*/, '[^/]*')
+    }
   end
 
   def gitignore
-    if File.exist?(path = "#{dir}/.gitignore")
-      File.read(path)
-    else
-      ''
-    end
+    @gitignore ||= if File.exist?(path = "#{dir}/.gitignore")
+                     File.read(path).lines.
+                       reject{ |l| l == /^\s*(#|\s+$)/ }.map(&:strip)
+                   else
+                     []
+                   end
   end
 end
 
@@ -108,22 +146,37 @@ namespace :gem do
 
 desc 'Install gem'
 task :install => [:build] do
-  sh("#{Gem.ruby} -S gem install pkg/#{Gemgem.gem_filename}")
+  Gemgem.sh_gem('install', Gemgem.gem_path)
 end
 
 desc 'Build gem'
 task :build => [:spec] do
-  sh("#{Gem.ruby} -S gem build #{Gemgem.spec.name}.gemspec")
-  sh("mkdir -p pkg")
-  sh("mv #{Gemgem.gem_filename} pkg/")
+  require 'fileutils'
+  require 'rubygems/package'
+  gem = nil
+  Dir.chdir(Gemgem.dir) do
+    gem = Gem::Package.build(Gem::Specification.load(Gemgem.spec_path))
+    FileUtils.mkdir_p(Gemgem.pkg_dir)
+    FileUtils.mv(gem, Gemgem.pkg_dir) # gem is relative path, but might be ok
+  end
+  puts "\e[35mGem built: \e[33m" \
+       "#{Gemgem.strip_path("#{Gemgem.pkg_dir}/#{gem}")}\e[0m"
+end
+
+desc 'Generate gemspec'
+task :spec do
+  Gemgem.create
+  Gemgem.write
 end
 
 desc 'Release gem'
 task :release => [:spec, :check, :build] do
-  sh("git tag #{Gemgem.gem_tag}")
-  sh("git push")
-  sh("git push --tags")
-  sh("#{Gem.ruby} -S gem push pkg/#{Gemgem.gem_filename}")
+  Gemgem.module_eval do
+    sh_git('tag', Gemgem.gem_tag)
+    sh_git('push')
+    sh_git('push', '--tags')
+    sh_gem('push', Gemgem.gem_path)
+  end
 end
 
 task :check do
@@ -146,11 +199,35 @@ end # of gem namespace
 
 desc 'Run tests in memory'
 task :test do
-  $LOAD_PATH.unshift('lib')
-  Dir['./test/**/test_*.rb'].each{ |file| require file[0..-4] }
+  next if Gemgem.test_files.empty?
+
+  Gemgem.test_files.each{ |file| require "#{Gemgem.dir}/#{file[0..-4]}" }
   Test::Unit::Runner.autorun
 end
 
+desc 'Trash ignored files'
+task :clean => ['gem:spec'] do
+  next if Gemgem.ignored_files.empty?
+
+  require 'fileutils'
+  trash = File.expand_path("~/.Trash/#{Gemgem.spec.name}")
+  puts "Move the following files into:" \
+       " \e[35m#{Gemgem.strip_path(trash)}\e[33m"
+
+  Gemgem.ignored_files.each do |file|
+    from = "#{Gemgem.dir}/#{file}"
+    to   = "#{trash}/#{File.dirname(file)}"
+    puts Gemgem.strip_path(from)
+
+    FileUtils.mkdir_p(to)
+    FileUtils.mv(from, to)
+  end
+
+  print "\e[0m"
+end
+
 task :default do
-  puts `#{Gem.ruby} -S #{$PROGRAM_NAME} -T`
+  # Is there a reliable way to do this in the current process?
+  # It failed miserably before between Rake versions...
+  exec "#{Gem.ruby} -S #{$PROGRAM_NAME} -f #{Rake.application.rakefile} -T"
 end

data/test/test_basic.rb

@@ -12,18 +12,18 @@ class TestBasic < Test::Unit::TestCase
 
     sin="utf-8:utf-8,ascii"
     sout=Bsdconv.insert_phase(sin, "upper", Bsdconv::INTER, 1)
-    assert_equal "UTF-8:UPPER:UTF-8,ASCII", sout
+    assert_equal "utf-8:upper:utf-8,ascii", sout
 
     sin=sout
     sout=Bsdconv.replace_phase(sin, "full", Bsdconv::INTER, 1)
-    assert_equal "UTF-8:FULL:UTF-8,ASCII", sout
+    assert_equal "utf-8:full:utf-8,ascii", sout
 
     sin=sout
     sout=Bsdconv.replace_codec(sin, "big5", 2, 1)
-    assert_equal "UTF-8:FULL:UTF-8,BIG5", sout
+    assert_equal "utf-8:full:utf-8,big5", sout
 
     sin=sout
     sout=Bsdconv.insert_codec(sin, "ascii", 0, 1)
-    assert_equal "UTF-8,ASCII:FULL:UTF-8,BIG5", sout
+    assert_equal "utf-8,ascii:full:utf-8,big5", sout
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-bsdconv
 version: !ruby/object:Gem::Version
-  version: 11.1.0
+  version: 11.3.1
 platform: ruby
 authors:
 - Buganini Q
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-16 00:00:00.000000000 Z
+date: 2014-05-13 00:00:00.000000000 Z
 dependencies: []
 description: ruby wrapper for bsdconv. bsdconv is a BSD licensed charset/encoding
   converter library with more functionalities than libiconv
@@ -18,12 +18,16 @@ extensions:
 - ext/ruby-bsdconv/extconf.rb
 extra_rdoc_files: []
 files:
-- .gitignore
-- README
+- ".gitignore"
+- README.md
 - Rakefile
-- example/example.rb
-- example/example2.rb
-- example/example3.rb
+- doc/api.rst
+- example/example_chunk.rb
+- example/example_conv.rb
+- example/example_conv_file.rb
+- example/example_ctl.rb
+- example/example_insert_replace.rb
+- example/example_modules.rb
 - ext/ruby-bsdconv/bsdconv.c
 - ext/ruby-bsdconv/extconf.rb
 - ruby-bsdconv.gemspec
@@ -39,17 +43,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: ruby wrapper for bsdconv

data/README

@@ -1,3 +0,0 @@
-https://rubygems.org/gems/ruby-bsdconv
-
-see example/* for examples

data/example/example2.rb

@@ -1,21 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'bsdconv'
-
-c=Bsdconv.new('utf-8:utf-8')
-
-if c.nil?
-	abort(Bsdconv.error())
-end
-
-c.insert_phase('full',Bsdconv::INTER, 1)
-puts c.conv('test')
-
-p Bsdconv.codec_check(Bsdconv::FROM, "_utf-8")
-p Bsdconv.codec_check(Bsdconv::INTER, "_utf-8")
-puts 'From:'
-p Bsdconv.codecs_list(Bsdconv::FROM)
-puts 'Inter:'
-p Bsdconv.codecs_list(Bsdconv::INTER)
-puts 'To:'
-p Bsdconv.codecs_list(Bsdconv::TO)