[ruby-oci8-commit] [315] trunk/ruby-oci8: * setup.rb: 1.

[nobody at rubyforge.org]

Revision: 315
Author:   kubo
Date:     2009-02-06 07:53:35 -0500 (Fri, 06 Feb 2009)

Log Message:
-----------
* setup.rb: 1. install lib/**/*.yml flies also.
    (It is pointed by Nate Wiger that encoding.yml is not installed.)
    2. exclude .svn or .git directories on installation.
* lib/oci8/oci8.rb: A private method define_a_column was renamed
    to define_one_column to prevent activerecord oracle adapter
    and oracle enhanced adapter from redefining the method.
* dist-files: add newly added file names which must be included
    in gem or tar.gz packages.

Modified Paths:
--------------
    trunk/ruby-oci8/ChangeLog
    trunk/ruby-oci8/dist-files
    trunk/ruby-oci8/lib/oci8/oci8.rb
    trunk/ruby-oci8/setup.rb

Modified: trunk/ruby-oci8/ChangeLog
===================================================================
--- trunk/ruby-oci8/ChangeLog	2009-02-01 15:07:17 UTC (rev 314)
+++ trunk/ruby-oci8/ChangeLog	2009-02-06 12:53:35 UTC (rev 315)
@@ -1,3 +1,13 @@
+2009-02-06  KUBO Takehiro  <kubo at jiubao.org>
+	* setup.rb: 1. install lib/**/*.yml flies also.
+	    (It is pointed by Nate Wiger that encoding.yml is not installed.)
+	    2. exclude .svn or .git directories on installation.
+	* lib/oci8/oci8.rb: A private method define_a_column was renamed
+	    to define_one_column to prevent activerecord oracle adapter
+	    and oracle enhanced adapter from redefining the method.
+	* dist-files: add newly added file names which must be included
+	    in gem or tar.gz packages.
+
 2009-02-01  KUBO Takehiro  <kubo at jiubao.org>
 	* lib/dbd/OCI8.rb: add code for ruby-dbi 0.4 type conversion.
 	* test/test_dbi.rb: suppress deprecated warnings while running

Modified: trunk/ruby-oci8/dist-files
===================================================================
--- trunk/ruby-oci8/dist-files	2009-02-01 15:07:17 UTC (rev 314)
+++ trunk/ruby-oci8/dist-files	2009-02-06 12:53:35 UTC (rev 315)
@@ -37,13 +37,16 @@
 ext/oci8/xmldb.c
 lib/.document
 lib/oci8.rb.in
-lib/DBD/OCI8/OCI8.rb
+lib/dbd/OCI8.rb
 lib/oci8/.document
 lib/oci8/compat.rb
 lib/oci8/datetime.rb
+lib/oci8/encoding-init.rb
+lib/oci8/encoding.yml
 lib/oci8/metadata.rb
 lib/oci8/object.rb
 lib/oci8/oci8.rb
+lib/oci8/oracle_version.rb
 test/README
 test/config.rb
 test/test_all.rb
@@ -58,6 +61,7 @@
 test/test_dbi_clob.rb
 test/test_metadata.rb
 test/test_oci8.rb
+test/test_oracle_version.rb
 test/test_oradate.rb
 test/test_oranumber.rb
 test/test_rowid.rb

Modified: trunk/ruby-oci8/lib/oci8/oci8.rb
===================================================================
--- trunk/ruby-oci8/lib/oci8/oci8.rb	2009-02-01 15:07:17 UTC (rev 314)
+++ trunk/ruby-oci8/lib/oci8/oci8.rb	2009-02-06 12:53:35 UTC (rev 315)
@@ -529,15 +529,15 @@
       num_cols = __param_count
       1.upto(num_cols) do |i|
         parm = __paramGet(i)
-        define_a_column(i, parm) unless __defined?(i)
+        define_one_column(i, parm) unless __defined?(i)
         @column_metadata[i - 1] = parm
       end
       num_cols
     end # define_columns
 
-    def define_a_column(pos, param)
+    def define_one_column(pos, param)
       __define(pos, make_bind_object(param))
-    end # define_a_column
+    end # define_one_column
 
     def bind_params(*bindvars)
       bindvars.each_with_index do |val, i|

Modified: trunk/ruby-oci8/setup.rb
===================================================================
--- trunk/ruby-oci8/setup.rb	2009-02-01 15:07:17 UTC (rev 314)
+++ trunk/ruby-oci8/setup.rb	2009-02-06 12:53:35 UTC (rev 315)
@@ -495,7 +495,7 @@
   end
 
   REJECT_DIRS = %w(
-    CVS SCCS RCS CVS.adm
+    CVS SCCS RCS CVS.adm .svn .git
   )
 
   def all_dirs_in(dirname)
@@ -1163,7 +1163,7 @@
   end
 
   def ruby_scripts
-    collect_filenames_auto().select {|n| /\.rb\z/ =~ n }
+    collect_filenames_auto().select {|n| /\.(rb|yml)\z/ =~ n }
   end
   
   # picked up many entries from cvs-1.11.1/src/ignore.c