ruby-oci8 2.2.9-x64-mingw32 → 2.2.10-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb6707d7ba8417adae005295d0a3b2b47908d2d0a06a065034797ae37a94308d
-  data.tar.gz: 93601a2f486a2cc4c49ffe2e794cc637b1366679a1077ae6fbdaf3b03cb250ca
+  metadata.gz: 6f11569d15e1ba223253c3f09526fdf46656fad7847458251742f2ffedd19345
+  data.tar.gz: 01d23af2e740fe184cb426fd05b766d4f242424d9f542141b6e8b45e90fa2804
 SHA512:
-  metadata.gz: 73663e7381ac9a45afbce47f5dab35bb49ca971a2911524a7fb1ff693503b20a3cf9446c54a08eb1a173738c057866d7dd0a80e9f8e590a78cede8c3b7e90f42
-  data.tar.gz: 89434cc79e5184702d4696c253bad2a34be5a561bdb210610ecaf6cf655b6caf9c4f438cb993cc3ca166033dd8f60d555ffe344911d87dd4dd32897af4a06590
+  metadata.gz: d5ec81bde001125408d01e6986adf816a6ccfccc2992b670d5e9fc9bfe835a1e64382494fe5b60422e897f665807da6fe6cdc56e0a86225bfdf1a4b33cc67a38
+  data.tar.gz: daf5468076cbbf3ba1aeaff11c8ea2b0a5b1f2c6e6003ed74f44e2cb5f2f2a42f7a3c0123f4008b1c70da0112874091607db9b2350f048d4a4c9c607fa74a783

data/NEWS

@@ -1,5 +1,20 @@
 # @markup markdown
 
+2.2.10 (2022-01-12)
+===================
+
+- Use `File.exist?` instead of removed `File.exists?` in Ruby 3.2 (GH-242)
+
+  (contributed by Yasuo Honda)
+
+- Support ruby 3.1 distributed by rubyinstaller.org
+
+- Remove code for obsolete platforms
+  - Ruby compiled by Borland C++
+  - macOS released several years ago
+
+- Detect arm64 macOS shared library in oraconf.rb in preparation for Instant Client for Apple Silicon release.
+
 2.2.9 (2020-12-30)
 ==================
 

data/README.md

@@ -2,7 +2,7 @@ Ruby-oci8
 =========
 
 [![Gem Version](https://badge.fury.io/rb/ruby-oci8.svg)](http://badge.fury.io/rb/ruby-oci8)
-[![Build Status](https://travis-ci.com/kubo/ruby-oci8.svg?branch=master)](https://travis-ci.com/kubo/ruby-oci8)
+[![Tests](https://github.com/kubo/ruby-oci8/actions/workflows/tests.yml/badge.svg)](https://github.com/kubo/ruby-oci8/actions/workflows/tests.yml)
 
 What is ruby-oci8
 -----------------

data/dist-files

@@ -19,7 +19,6 @@ docs/install-instant-client.md
 docs/install-on-osx.md
 docs/ldap-auth-and-function-interposition.md
 docs/number-type-mapping.md
-docs/osx-install-dev-tools.png
 docs/platform-specific-issues.md
 docs/report-installation-issue.md
 docs/timeout-parameters.md

data/docs/install-on-osx.md

@@ -1,133 +1,46 @@
-# @title Install ruby-oci8 on OS X
+# @title Install ruby-oci8 on macOS
 
-Install ruby-oci8 on OS X
+Install ruby-oci8 on macOS
 =========================
 
-This page explains the way to install ruby-oci8 os OS X.
+**Note: Ruby-oci8 doesn't run on Apple Silicon because Oracle instant client
+for Apple Silicon has not been released yet.**
 
-Look at {file:docs/install-full-client.md}, {file:docs/install-instant-client.md}
-or {file:docs/install-binary-package.md} for other platforms.
-
-Install C compiler
-------------------
-
-You need to install the command line developer tools or the Xcode.
-(The latter includes the former.)
-
-Run `"cc --version"` in a terminal to check whether they are installed.
-
-If the cc version is printed, the tools are installed.
-
-If the follwoing dialog is displayed, click its Install button to
-install the tools.
-You have no need to install the Xcode to compile ruby-oci8.
-It requires command line tools, not an IDE such as the Xcode.
-
-![dialog](osx-install-dev-tools.png)
+Prerequisite
+------------
 
-If `"Agreeing to the Xcode/iOS license requires admin privileges,
-please re-run as root via sudo."` is printed, you need to run
-`"sudo cc --version"`, enter your password, look at the license
-and type `"agree"`.
+* Command line tools for Xcode or Xcode (by executing `xcode-select --install`) or [Xcode]
 
 Install Oracle Instant Client Packages
 --------------------------------------
 
-### Download Oracle Instant Client Packages
-
-Download the following packages from [Oracle Technology Network][]
-
-* Instant Client Package - Basic (`instantclient-basic-macos.x64-12.1.0.2.0.zip`) or Basic Lite (`instantclient-basiclite-macos.x64-12.1.0.2.0.zip`)
-* Instant Client Package - SDK (`instantclient-sdk-macos.x64-12.1.0.2.0.zip`)
-* Instant Client Package - SQL*Plus (`instantclient-sqlplus-macos.x64-12.1.0.2.0.zip`) (optionally) 
-
-### Install Oracle Instant Client Packages via Homebrew
-
-To install `Oracle Instant Client Basic` via [Homebrew][]
-
-* Copy downloaded zip files to `/Library/Caches/Homebrew`
-  (if the environment variable `HOMEBREW_CACHE`
-  is not set and `$HOME/Library/Caches/Homebrew` doesn't exist.)
-
-* Run the followining commands:
-
-        brew tap InstantClientTap/instantclient
-        brew install instantclient-basic
-        brew install instantclient-sdk
-        brew install instantclient-sqlplus # (optionally)
-
-* Set the environment variable `OCI_DIR` while performing the following installation steps
-  if Homebrew is installed outside `/usr/local`.
-
-        export OCI_DIR=$(brew --prefix)/lib
-
-To install `Oracle Instant Client Basic Lite` via [Homebrew][]
-
-* Copy downloaded zip files to `/Library/Caches/Homebrew`
-  (if the environment variable `HOMEBREW_CACHE`
-  is not set and `$HOME/Library/Caches/Homebrew` doesn't exist.)
-
-* Run the followining commands:
-
-        brew tap InstantClientTap/instantclient
-        brew install instantclient-basiclite
-        brew install instantclient-sdk
-        brew install instantclient-sqlplus --with-basiclite # (optionally)
-        
-* Set the environment variable `OCI_DIR` while performing the following installation steps
-  if Homebrew is installed outside `/usr/local`.
-
-        export OCI_DIR=$(brew --prefix)/lib
-
-### Install Oracle Instant Client Manually
-
-If you don't use [Homebrew][], do the following:
-
-Unzip the packages as follows:
-
-    mkdir -p /opt/oracle
-    cd /opt/oracle
-
-Copy downloaded files to /opt/oracle before running the following commands.
-
-    unzip instantclient-basic-macos.x64-12.1.0.2.0.zip
-    unzip instantclient-sdk-macos.x64-12.1.0.2.0.zip
-    unzip instantclient-sqlplus-macos.x64-12.1.0.2.0.zip
-
-Make a symbolic link to link the library.
-
-    cd /opt/oracle/instantclient_12_1
-    ln -s libclntsh.dylib.12.1 libclntsh.dylib
-
-Set the environment variable OCI_DIR while performing the following installation steps.
-
-    export OCI_DIR=/opt/oracle/instantclient_12_1
-
-Installation
-------------
-
-If you get a problem in the following steps, look at {file:docs/report-installation-issue.md}.
-
-### gem package
-
-Run the following command.
+If you have installed [Homebrew], use the following command:
 
-    gem install ruby-oci8
+```shell
+$ brew tap InstantClientTap/instantclient
+$ brew install instantclient-basic   # or instantclient-basiclite
+$ brew install instantclient-sdk
+$ brew install instantclient-sqlplus # (optionally)
+```
 
-### tar.gz package
+Otherwise, look at this [page][OTN] and set the environment variable
+`OCI_DIR` to point the the directory where instant client is installed.
+Ruby-oci8 installation script checks the directory.
 
-#### Download the source code
+```shell
+export OCI_DIR=$HOME/Downloads/instantclient_19_8  # for example
+```
 
-Download the latest tar.gz package from [download page][].
+Install ruby-oci8
+-----------------
 
-#### Run make and install
+Note that `/usr/bin/ruby` isn't available. You need to use [`rbenv`] or so.
 
-    tar xvfz ruby-oci8-VERSION.tar.gz
-    cd ruby-oci8-VERSION
-    make
-    make install
+```shell
+$ gem install ruby-oci8
+```
 
-[download page]: https://bintray.com/kubo/generic/ruby-oci8
 [Homebrew]: http://brew.sh/
-[fix_oralib]: https://github.com/kubo/fix_oralib_osx
-[Oracle Technology Network]: http://www.oracle.com/technetwork/topics/intel-macsoft-096467.html
+[OTN]: https://www.oracle.com/database/technologies/instant-client/macos-intel-x86-downloads.html#ic_osx_inst
+[Xcode]: https://apps.apple.com/us/app/xcode/id497799835
+[`rbenv`]: https://github.com/rbenv/rbenv

data/lib/oci8/version.rb

@@ -1,3 +1,3 @@
 class OCI8
-  VERSION = "2.2.9"
+  VERSION = "2.2.10"
 end

data/lib/oci8.rb

@@ -110,7 +110,7 @@ end
 
 begin
   require so_basename
-rescue LoadError, OCIError
+rescue LoadError
   require 'oci8/check_load_error'
   OCI8::Util::check_load_error($!)
   raise

data/ruby-oci8.gemspec

@@ -50,7 +50,7 @@ EOS
     # add map files to analyze a core (minidump) file.
     so_vers.each do |ver|
       map_file = 'ext/oci8/oci8lib_#{ver}.map'
-      so_files << map_file if File.exists? map_file
+      so_files << map_file if File.exist? map_file
     end
 
     # least version in so_vers

data/test/test_break.rb

@@ -99,6 +99,11 @@ class TestBreak < Minitest::Test
   def test_timeout
     @conn.non_blocking = true
     start_time = Time.now
+    if server_is_runing_on_windows?
+      end_time = start_time + 5
+    else
+      end_time = start_time + 1
+    end
 
     if defined? Rubinius and Rubinius::VERSION < "2.0"
       # Rubinius 1.2.4
@@ -112,12 +117,8 @@ class TestBreak < Minitest::Test
         @conn.exec("BEGIN DBMS_LOCK.SLEEP(5); END;")
       end
     end
-    if server_is_runing_on_windows?
-      end_time = start_time + 5
-    else
-      end_time = start_time + 1
-    end
     assert_in_delta(Time.now, end_time, 1)
+    sleep(0.01) # for truffleruby. Is truffleruby too fast?
     @conn.exec("BEGIN NULL; END;")
     assert_in_delta(Time.now, end_time, 1)
   end

data/test/test_oranumber.rb

@@ -215,9 +215,15 @@ EOS
   end
 
   def test_yaml
+    # Use the permitted_classes keyword parameter if it is supported by YAML.load
+    keyword_params = if YAML.method(:load).parameters.any? { |key, value| value == :permitted_symbols }
+                       {permitted_classes: [OraNumber]}
+                     else
+                       {}
+                     end
     (LARGE_RANGE_VALUES + ['~', '-~']).each do |x|
       n = OraNumber.new(x)
-      assert_equal(n, YAML.load(YAML.dump(n)))
+      assert_equal(n, YAML.load(YAML.dump(n), **keyword_params))
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-oci8
 version: !ruby/object:Gem::Version
-  version: 2.2.9
+  version: 2.2.10
 platform: x64-mingw32
 authors:
 - Kubo Takehiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-30 00:00:00.000000000 Z
+date: 2022-01-12 00:00:00.000000000 Z
 dependencies: []
 description: 'ruby-oci8 is a ruby interface for Oracle using OCI8 API. It is available
   with Oracle 10g or later including Oracle Instant Client.
@@ -37,7 +37,6 @@ files:
 - docs/install-on-osx.md
 - docs/ldap-auth-and-function-interposition.md
 - docs/number-type-mapping.md
-- docs/osx-install-dev-tools.png
 - docs/platform-specific-issues.md
 - docs/report-installation-issue.md
 - docs/timeout-parameters.md
@@ -64,6 +63,7 @@ files:
 - lib/oci8lib_260.so
 - lib/oci8lib_270.so
 - lib/oci8lib_300.so
+- lib/oci8lib_310.so
 - lib/ruby-oci8.rb
 - metaconfig
 - pre-distclean.rb