tiny_tds 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ebd6b7b9d21919fda9b7981bb8c2fb91bffc30fc52c20af755cf1f4149ecb78
-  data.tar.gz: 925d9f1495eed1939585a0c413145b1e8917cf7d8ae219a71416f00ad89a7f00
+  metadata.gz: da6ec62dafae6c5922693c73e68c96b400d11a01e822dd14cca6dfe895ad73c5
+  data.tar.gz: d0cf523d4883812c73380dc9362205cf4129c003f7fe59fa0ec4ddabb6113563
 SHA512:
-  metadata.gz: 57653af7ec8f2a4d176ded975ce57c639c326a9ba9270c7fa91b43a2290cb8ab9452047fb79b593b95b59c526317c957628b1f3abc7e5e0935fdd021a3de38ea
-  data.tar.gz: 0abb0eb0fd59833f4564021123c20efc6b069531f028ac985b6a0ef539652a0530de0750de4ee37512402383686d402ca260986d5fa557d81e47242e15b23178
+  metadata.gz: 31a885748fc4baf54c8db55685a21c33bce4c3d5814392b8eda842f793ed5ae1ab32214d0c9ae4a0d56569d3ade6d65ccf3f0dbb537763ae107360de4cb73578
+  data.tar.gz: 786633e1af17f4821ee856d25c9621cef95367a7cf00acb3ff2dfff4dd563a6d3095ba82a86ccfeb3a1031d7f987548067b5f6138c6510d523284ce4526c45c9

data/.github/workflows/ci.yml

@@ -13,17 +13,22 @@ jobs:
         platform:
           - "x64-mingw32"
           - "x64-mingw-ucrt"
-    name: cross-compile-windows
+          - "x86_64-linux-gnu"
+          - "x86_64-linux-musl"
+          - "aarch64-linux-gnu"
+          - "aarch64-linux-musl"
+
+    name: cross-compile
     runs-on: ubuntu-22.04
-    container:
-      image: "ghcr.io/rake-compiler/rake-compiler-dock-image:1.7.0-mri-${{ matrix.platform }}"
     steps:
       - uses: actions/checkout@v4
 
-      - run: git config --global --add safe.directory /__w/tiny_tds/tiny_tds # shrug
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "2.7"
 
-      - name: Install gems
-        shell: bash
+      - name: "Install dependencies"
         run: bundle install
 
       - name: Write used versions into file
@@ -34,14 +39,14 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ports
-          key: cross-compiled-v3-${{ matrix.platform }}-${{ hashFiles('**/.ports_versions') }}
+          key: cross-compiled-v1-${{ matrix.platform }}-${{ hashFiles('**/.ports_versions') }}
           restore-keys: |
-            cross-compiled-v3-${{ matrix.platform }}-${{ hashFiles('**/.ports_versions') }}
-            cross-compiled-v3-${{ matrix.platform }}-
+            cross-compiled-v1-${{ matrix.platform }}-${{ hashFiles('**/.ports_versions') }}
+            cross-compiled-v1-${{ matrix.platform }}-
 
       - name: Build gem
         shell: bash
-        run: bundle exec rake gem:for_platform[${{ matrix.platform }}]
+        run: bundle exec rake gem:native:${{ matrix.platform }}
 
       - uses: actions/upload-artifact@v4
         with:
@@ -89,6 +94,18 @@ jobs:
           ruby -e "require 'tiny_tds'; puts TinyTds::Gem.root_path"
           exit $LASTEXITCODE
 
+      - name: Test if tsql wrapper works
+        shell: pwsh
+        run: |
+          tsql-ttds -C
+          exit $LASTEXITCODE
+
+      - name: Test if defncopy wrapper works
+        shell: pwsh
+        run: |
+          defncopy-ttds -v
+          exit $LASTEXITCODE
+
   test-windows-mingw:
     needs:
       - cross-compile
@@ -123,21 +140,9 @@ jobs:
 
       - name: Install native gem and restore cross-compiled code from it
         shell: pwsh
-        run: |
-          $rubyArchitecture = (ruby -e "puts RbConfig::CONFIG['arch']").Trim()
-          $gemVersion = (Get-Content VERSION).Trim()
-          $gemToUnpack = "./tiny_tds-$gemVersion-$rubyArchitecture.gem"
-
-          Write-Host "Looking to unpack $gemToUnpack"
-          gem unpack --target ./tmp "$gemToUnpack"
-
-          # Restore precompiled code
-          $source = (Resolve-Path ".\tmp\tiny_tds-$gemVersion-$rubyArchitecture\lib\tiny_tds").Path
-          $destination = (Resolve-Path ".\lib\tiny_tds").Path
-          Get-ChildItem $source -Recurse -Exclude "*.rb" | Copy-Item -Destination {Join-Path $destination $_.FullName.Substring($source.length)}
-
-          # Restore ports
-          Copy-Item -Path ".\tmp\tiny_tds-$gemVersion-$rubyArchitecture\ports" -Destination "." -Recurse
+        run: "& ./test/bin/restore-from-native-gem.ps1"
+        env:
+          RUBY_ARCHITECTURE: "x64-mingw32"
 
       - name: Setup MSSQL
         uses: rails-sqlserver/setup-mssql@v1
@@ -214,6 +219,18 @@ jobs:
           ruby -e "require 'tiny_tds'; puts TinyTds::Gem.root_path"
           exit $LASTEXITCODE
 
+      - name: Test if tsql wrapper works
+        shell: pwsh
+        run: |
+          tsql-ttds -C
+          exit $LASTEXITCODE
+
+      - name: Test if defncopy wrapper works
+        shell: pwsh
+        run: |
+          defncopy-ttds -v
+          exit $LASTEXITCODE
+
   test-windows-ucrt:
     needs:
       - cross-compile
@@ -250,21 +267,9 @@ jobs:
 
       - name: Install native gem and restore cross-compiled code from it
         shell: pwsh
-        run: |
-          $rubyArchitecture = (ruby -e "puts RbConfig::CONFIG['arch']").Trim()
-          $gemVersion = (Get-Content VERSION).Trim()
-          $gemToUnpack = "./tiny_tds-$gemVersion-$rubyArchitecture.gem"
-
-          Write-Host "Looking to unpack $gemToUnpack"
-          gem unpack --target ./tmp "$gemToUnpack"
-
-          # Restore precompiled code
-          $source = (Resolve-Path ".\tmp\tiny_tds-$gemVersion-$rubyArchitecture\lib\tiny_tds").Path
-          $destination = (Resolve-Path ".\lib\tiny_tds").Path
-          Get-ChildItem $source -Recurse -Exclude "*.rb" | Copy-Item -Destination {Join-Path $destination $_.FullName.Substring($source.length)}
-
-          # Restore ports
-          Copy-Item -Path ".\tmp\tiny_tds-$gemVersion-$rubyArchitecture\ports" -Destination "." -Recurse
+        run: "& ./test/bin/restore-from-native-gem.ps1"
+        env:
+          RUBY_ARCHITECTURE: "x64-mingw-ucrt"
 
       - name: Setup MSSQL
         uses: rails-sqlserver/setup-mssql@v1
@@ -336,44 +341,94 @@ jobs:
           ruby -e "require 'tiny_tds'; puts TinyTds::Gem.root_path"
           exit $LASTEXITCODE
 
-  compile-native-ports:
+      - name: Test if tsql wrapper works
+        shell: pwsh
+        run: |
+          tsql-ttds -C
+          exit $LASTEXITCODE
+
+      - name: Test if defncopy wrapper works
+        shell: pwsh
+        run: |
+          defncopy-ttds -v
+          exit $LASTEXITCODE
+
+  install-linux:
+    needs:
+      - cross-compile
+    strategy:
+      fail-fast: false
+      matrix:
+        platform:
+          - "x86_64-linux-gnu"
+          - "x86_64-linux-musl"
+          - "aarch64-linux-gnu"
+          - "aarch64-linux-musl"
+
+        ruby-version:
+          - "2.7"
+          - "3.0"
+          - "3.1"
+          - "3.2"
+          - "3.3"
+          - "3.4"
+
+        include:
+          - platform: x86_64-linux-musl
+            docker_tag: "-alpine"
+            bootstrap: "apk add -U build-base &&" # required to compile bigdecimal on Ruby 2.7
+
+          - platform: aarch64-linux-gnu
+            docker_platform: "--platform=linux/arm64"
+
+          - platform: aarch64-linux-musl
+            docker_platform: "--platform=linux/arm64"
+            docker_tag: "-alpine"
+            bootstrap: "apk add -U build-base &&"
+
+    name: install-linux
     runs-on: ubuntu-22.04
-    name: cross-compile-linux
     steps:
       - uses: actions/checkout@v4
 
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 3.4
-          bundler-cache: true
-
-      - name: Write used versions into file
-        run: bundle exec rake ports:version_file
-
-      - name: Cache ports
-        uses: actions/cache@v4
+      - name: Download precompiled gem
+        uses: actions/download-artifact@v4
         with:
-          path: ports
-          key: native-v3-${{ hashFiles('**/.ports_versions') }}
-          restore-keys: |
-            native-v3-${{ hashFiles('* */.ports_versions') }}
-            native-v3-
-
-      - name: Build required libraries
-        run: |
-          bundle exec rake ports
+          name: gem-${{ matrix.platform }}
+          path: precompiled/gems
+
+      - name: Setup QEMU for docker
+        uses: docker/setup-qemu-action@v3
+        if: ${{ matrix.docker_platform }} != ''
+
+      - run: |
+          docker run --rm -v $PWD/precompiled:/precompiled -w /precompiled \
+            ${{ matrix.docker_platform }} ruby:${{ matrix.ruby-version }}${{ matrix.docker_tag }} \
+            sh -c "
+              gem update --system 3.3.22 &&
+              ${{ matrix.bootstrap }}
+              gem install --no-document ./gems/tiny_tds-$(cat VERSION)-${{ matrix.platform }}.gem &&
+              ruby -e \"require 'tiny_tds'; puts TinyTds::Gem.root_path\" &&
+              tsql-ttds -C &&
+              defncopy-ttds -v
+            "
 
   test-linux:
     needs:
-      - compile-native-ports
+      - cross-compile
     name: test-linux
     strategy:
       fail-fast: false
       matrix:
+        force-encryption:
+          - false
+          - true
+
         mssql-version:
           - 2017
           - 2019
           - 2022
+
         ruby-version:
           - "2.7"
           - "3.0"
@@ -391,20 +446,16 @@ jobs:
           ruby-version: ${{ matrix.ruby-version }}
           bundler-cache: true
 
-      - name: Write used versions into file
-        run: |
-          bundle exec rake ports:version_file
-
-      - name: Cache ports
-        uses: actions/cache@v4
+      - name: Download precompiled gem
+        uses: actions/download-artifact@v4
         with:
-          path: ports
-          key: native-v3-${{ hashFiles('**/.ports_versions') }}
-          fail-on-cache-miss: true
+          name: gem-x86_64-linux-gnu
 
-      - name: Build gem
-        run: |
-          bundle exec rake build
+      - name: Install native gem and restore cross-compiled code from it
+        shell: pwsh
+        run: "& ./test/bin/restore-from-native-gem.ps1"
+        env:
+          RUBY_ARCHITECTURE: "x86_64-linux-gnu"
 
       - name: Setup MSSQL
         uses: rails-sqlserver/setup-mssql@v1
@@ -412,6 +463,7 @@ jobs:
           components: sqlcmd,sqlengine
           version: ${{ matrix.mssql-version }}
           sa-password: "c0MplicatedP@ssword"
+          force-encryption: ${{ matrix.force-encryption }}
 
       - name: Setup MSSQL database
         run: |
@@ -435,6 +487,52 @@ jobs:
           paths: "test/reports/TEST-*.xml"
         if: always()
 
+  install-linux-native:
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version:
+          - "2.7"
+          - "3.0"
+          - "3.1"
+          - "3.2"
+          - "3.3"
+          - "3.4"
+
+    name: install-linux-native
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
+
+      - name: Install FreeTDS
+        shell: bash
+        run: ./test/bin/install-freetds.sh
+
+      - name: Build gem
+        shell: bash
+        run: gem build tiny_tds.gemspec
+
+      - name: Install gem
+        shell: bash
+        run: gem install "tiny_tds-$(cat VERSION).gem"
+
+      - name: Test if TinyTDS loads
+        shell: bash
+        run: ruby -e "require 'tiny_tds'; puts TinyTds::Gem.root_path"
+
+      - name: Test if tsql wrapper works
+        shell: bash
+        run: tsql-ttds -C
+
+      - name: Test if defncopy wrapper works
+        shell: bash
+        run: defncopy-ttds -v
+
   install_macos:
     strategy:
       fail-fast: false
@@ -475,3 +573,18 @@ jobs:
         shell: bash
         run: |
           ruby -e "require 'tiny_tds'; puts TinyTds::Gem.root_path"
+
+  standardrb:
+    name: standardrb
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "2.7"
+          bundler-cache: true
+
+      - name: Check standardrb
+        shell: bash
+        run: bundle exec standardrb

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 3.2.0
+
+* Reduce number of files shipped with precompiled Windows gem
+* Provide precompiled gem for Linux (GNU + MUSL / 64-bit x86 + ARM)
+* Fix wrappers for `tsql` and `defncopy` utility.
+* Use libiconv v1.18 and freetds v1.4.26 for Windows and Linux builds
+
 ## 3.1.0
 
 * Add Ruby 3.4 to the cross compile list
@@ -13,6 +20,7 @@
 * Add `bigdecimal` to dependencies
 
 ## 2.1.7
+
 * Add Ruby 3.3 to the cross compile list
 
 ## 2.1.6

data/Gemfile

@@ -1,2 +1,2 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 gemspec

data/README.md

@@ -18,16 +18,42 @@ The API is simple and consists of these classes:
 
 ## Install
 
-Installing with rubygems should just work. TinyTDS is currently tested on Ruby version 2.7.0 and upward.
+tiny_tds is tested with Ruby v2.7 and upwards.
 
+### Windows and Linux (64-bit)
+
+We precompile tiny_tds with FreeTDS and supporting libraries, which are dynamically linked at runtime. Therefore, you can run:
+
+```shell
+gem install tiny_tds
 ```
-$ gem install tiny_tds
+
+It should find the platform-specific gem.
+
+You can also avoid getting the platform-specific gem if you want to compile FreeTDS and supporting libraries yourself:
+
+```shell
+gem install tiny_tds --platform ruby
 ```
 
-If you use Windows, we pre-compile TinyTDS with static versions of FreeTDS and supporting libraries.
-If you're using RubyInstaller, the binary gem will require that devkit is installed and in your path to operate properly.
+### Mac
 
-On all other platforms, we will find these dependencies. It is recommended that you install the latest FreeTDS via your method of choice. For example, here is how to install FreeTDS on Ubuntu. You might also need the `build-essential` and possibly the `libc6-dev` packages.
+Install FreeTDS via Homebrew:
+
+```shell
+brew install openssl@3 libiconv
+brew install freetds
+```
+
+Then you can install tiny_tds:
+
+```shell
+gem install tiny_tds
+```
+
+### Everybody else
+
+`tiny_tds` will find FreeTDS and other libraries based on your compiler paths. Below you can see an example on how to install FreeTDS on a Debian system.
 
 ```shell
 $ apt-get install wget
@@ -37,41 +63,21 @@ $ apt-get install libc6-dev
 $ wget http://www.freetds.org/files/stable/freetds-1.4.23.tar.gz
 $ tar -xzf freetds-1.4.23.tar.gz
 $ cd freetds-1.4.23
-$ ./configure --prefix=/usr/local --with-tdsver=7.4
+$ ./configure --prefix=/usr/local --with-tdsver=7.4 --disable-odbc
 $ make
 $ make install
 ```
 
-Please read the MiniPortile and/or Windows sections at the end of this file for advanced configuration options past the following:
+You can also tell `tiny_tds` where to find your FreeTDS installation.
 
+```shell
+gem install tiny_tds -- --with-freetds-dir=/opt/freetds
 ```
---with-freetds-dir=DIR
-  Use the freetds library placed under DIR.
-```
-
 
 ## Getting Started
 
 Optionally, Microsoft has done a great job writing [an article](https://learn.microsoft.com/en-us/sql/connect/ruby/ruby-driver-for-sql-server?view=sql-server-ver16) on how to get started with SQL Server and Ruby using TinyTDS, however, the articles are using outdated versions.
 
-
-## FreeTDS Compatibility & Configuration
-
-TinyTDS is developed against FreeTDs 1.1+. We also test with SQL Server 2017, 2019, 2022 and Azure. Older version of SQL Server or FreeTDS could work, but are not supported.
-
-> [!IMPORTANT]
->
-> Windows users of our pre-compiled native gems need not worry about installing FreeTDS and its dependencies.
-
-* **Do I need to install FreeTDS?** Yes! Somehow, someway, you are going to need FreeTDS for TinyTDS to compile against.
-
-* **OK, I am installing FreeTDS, how do I configure it?** Contrary to what most people think, you do not need to specially configure FreeTDS in any way for client libraries like TinyTDS to use it. About the only requirement is that you compile it with libiconv for proper encoding support. FreeTDS must also be compiled with OpenSSL (or the like) to use it with Azure. See the "Using TinyTDS with Azure" section below for more info.
-
-* **Do I need to configure `--with-tdsver` equal to anything?** Most likely! Technically you should not have to. This is only a default for clients/configs that do not specify what TDS version they want to use.
-
-* **I want to configure FreeTDS using `--enable-msdblib` and/or `--enable-sybase-compat` so it works for my database. Cool?** It's a waste of time and totally moot! Client libraries like TinyTDS define their own C structure names where they diverge from Sybase to SQL Server. Technically we use the MSDBLIB structures which does not mean we only work with that database vs Sybase. These configs are just a low level default for C libraries that do not define what they want. So I repeat, you do not NEED to use any of these, nor will they hurt anything since we control what C structure names we use internally!
-
-
 ## Data Types
 
 Our goal is to support every SQL Server data type and covert it to a logical Ruby object. When dates or times are returned, they are instantiated to either `:utc` or `:local` time depending on the query options. Only [datetimeoffset] types are excluded. All strings are associated the to the connection's encoding and all binary data types are associated to Ruby's `ASCII-8BIT/BINARY` encoding.
@@ -387,19 +393,6 @@ Please read our [thread_test.rb](https://github.com/rails-sqlserver/tiny_tds/blo
 
 This is possible. Since FreeTDS v1.0, utf-16 is enabled by default and supported by tiny_tds. You can toggle it by using `use_utf16` when establishing the connection.
 
-## Compiling Gems for Windows
-
-For the convenience of Windows users, TinyTDS ships pre-compiled gems for supported versions of Ruby on Windows. In order to generate these gems, [rake-compiler-dock](https://github.com/rake-compiler/rake-compiler-dock) is used. This project provides several [Docker images](https://registry.hub.docker.com/u/larskanis/) with rvm, cross-compilers and a number of different target versions of Ruby.
-
-Run the following rake task to compile the gems for Windows. This will check the availability of [Docker](https://www.docker.com/) (and boot2docker on Windows or OS-X) and will give some advice for download and installation. When docker is running, it will download the docker image (once-only) and start the build:
-
-```
-$ rake gem:native
-```
-
-The compiled gems will exist in `./pkg` directory.
-
-
 ## Development & Testing
 
 First, clone the repo using the command line or your Git GUI of choice.
@@ -446,16 +439,32 @@ $ rake TINYTDS_UNIT_DATASERVER=mydbserver TINYTDS_SCHEMA=sqlserver_2017
 $ rake TINYTDS_UNIT_HOST=mydb.host.net TINYTDS_SCHEMA=sqlserver_azure
 ```
 
-## Docker Builds
+### Code formatting
 
-If you use a [multi stage](https://docs.docker.com/develop/develop-images/multistage-build/) Docker build to assemble your gems in one phase and then copy your app and gems
-into another, lighter, container without build tools you will need to make sure you tell the OS how to find dependencies for TinyTDS.
+We are using `standardrb` to format our code. Just run `bundle exec standardrb --fix` to format all Ruby files.
 
-After you have built and installed FreeTDS it will normally place library files in `/usr/local/lib`. When TinyTDS builds native extensions,
-it [already knows to look here](https://github.com/rails-sqlserver/tiny_tds/blob/master/ext/tiny_tds/extconf.rb#L31) but if you copy your app to a new container that link will be broken.
+### Compiling Gems for Windows and Linux
+
+> [!WARNING]
+> Compiling the Gems on native Windows currently does not work.
+
+For the convenience, TinyTDS ships pre-compiled gems for supported versions of Ruby on Windows and Linux. In order to generate these gems, [rake-compiler-dock](https://github.com/rake-compiler/rake-compiler-dock) is used.
+
+Run the following rake task to compile the gems. This will check the availability of [Docker](https://www.docker.com/) and will give some advice for download and installation. When docker is running, it will download the docker image (once-only) and start the build:
+
+```shell
+bundle exec rake gem:native
+```
+
+The compiled gems will exist in `./pkg` directory.
+
+If you only need a specific gem for one platform and architecture, run this command:
+
+```shell
+bundle exec rake gem:native:x64-mingw-ucrt
+```
 
-Set the LD_LIBRARY_PATH environment variable `export LD_LIBRARY_PATH=/usr/local/lib:${LD_LIBRARY_PATH}` and run `ldconfig`. If you run `ldd tiny_tds.so` you should not see any broken links. Make
-sure you also copied in the library dependencies from your build container with a command like `COPY --from=builder /usr/local/lib /usr/local/lib`.
+All the supported architectures and platforms are listed in the `Rakefile` in the `CrossLibraries` constant.
 
 ## Help & Support
 
@@ -481,4 +490,4 @@ My name is Ken Collins and I currently maintain the SQL Server adapter for Activ
 
 ## License
 
-TinyTDS is Copyright (c) 2010-2015 Ken Collins, <ken@metaskills.net> and Will Bond (Veracross LLC) <wbond@breuer.com>. It is distributed under the MIT license. Windows binaries contain pre-compiled versions of FreeTDS <http://www.freetds.org/> which is licensed under the GNU LGPL license at <http://www.gnu.org/licenses/lgpl-2.0.html>
+TinyTDS is Copyright (c) 2010-2015 Ken Collins, <ken@metaskills.net> and Will Bond (Veracross LLC) <wbond@breuer.com>. It is distributed under the MIT license. Windows and Linux binaries contain pre-compiled versions of FreeTDS <http://www.freetds.org/> and `libconv` which is licensed under the GNU LGPL license at <http://www.gnu.org/licenses/lgpl-2.0.html>. They also contain OpenSSL, which is licensed under the OpenSSL license at <https://openssl-library.org/source/license/index.html>.

data/Rakefile

@@ -1,56 +1,65 @@
-# encoding: UTF-8
-require 'rbconfig'
-require 'rake'
-require 'rake/clean'
-require 'rake/extensiontask'
-require_relative './ext/tiny_tds/extconsts'
-
-SPEC = Gem::Specification.load(File.expand_path('../tiny_tds.gemspec', __FILE__))
-
-ruby_cc_ucrt_versions = "3.4.0:3.3.5:3.2.0:3.1.0".freeze
-ruby_cc_mingw32_versions = "3.0.0:2.7.0".freeze
-
-GEM_PLATFORM_HOSTS = {
-  'x64-mingw32' => {
-    host: 'x86_64-w64-mingw32',
-    ruby_versions: ruby_cc_mingw32_versions
-  },
-  'x64-mingw-ucrt' => {
-    host: 'x86_64-w64-mingw32',
-    ruby_versions: ruby_cc_ucrt_versions
-  },
-}
+require "rbconfig"
+require "rake"
+require "rake/clean"
+require "rake/extensiontask"
+
+SPEC = Gem::Specification.load(File.expand_path("../tiny_tds.gemspec", __FILE__))
+
+CrossLibrary = Struct.new :platform, :openssl_config
+CrossLibraries = [
+  ["x64-mingw-ucrt", "mingw64"],
+  ["x64-mingw32", "mingw64"],
+  ["x86_64-linux-gnu", "linux-x86_64"],
+  ["x86_64-linux-musl", "linux-x86_64"],
+  ["aarch64-linux-gnu", "linux-aarch64"],
+  ["aarch64-linux-musl", "linux-aarch64"]
+].map do |platform, openssl_config|
+  CrossLibrary.new platform, openssl_config
+end
 
 # Add our project specific files to clean for a rebuild
-CLEAN.include FileList["{ext,lib}/**/*.{so,#{RbConfig::CONFIG['DLEXT']},o}"],
-              FileList["exe/*"]
+CLEAN.include FileList["{ext,lib}/**/*.{so,#{RbConfig::CONFIG["DLEXT"]},o}"],
+  FileList["exe/*"]
 
 # Clobber all our temp files and ports files including .install files
 # and archives
 CLOBBER.include FileList["tmp/**/*"],
-                FileList["ports/**/*"].exclude(%r{^ports/archives})
+  FileList["ports/**/*"].exclude(%r{^ports/archives})
 
-Dir['tasks/*.rake'].sort.each { |f| load f }
+Dir["tasks/*.rake"].sort.each { |f| load f }
 
-Rake::ExtensionTask.new('tiny_tds', SPEC) do |ext|
-  ext.lib_dir = 'lib/tiny_tds'
+Rake::ExtensionTask.new("tiny_tds", SPEC) do |ext|
+  ext.lib_dir = "lib/tiny_tds"
   ext.cross_compile = true
-  ext.cross_platform = GEM_PLATFORM_HOSTS.keys
+  ext.cross_platform = CrossLibraries.map(&:platform)
 
   # Add dependent DLLs to the cross gems
   ext.cross_compiling do |spec|
     # The fat binary gem doesn't depend on the freetds package, since it bundles the library.
-    spec.metadata.delete('msys2_mingw_dependencies')
+    spec.metadata.delete("msys2_mingw_dependencies")
 
-    # We don't need the sources in a fat binary gem
-    spec.files = spec.files.reject { |f| f =~ %r{^ports\/archives/} }
-
-    # Make sure to include the ports binaries and libraries
-    spec.files += FileList["ports/#{spec.platform.to_s}/**/**/{bin,lib}/*"].exclude do |f|
-      File.directory? f
+    if /mingw/.match?(spec.platform.to_s)
+      spec.files += [
+        "ports/#{spec.platform}/bin/libsybdb-5.dll",
+        "ports/#{spec.platform}/bin/defncopy.exe",
+        "ports/#{spec.platform}/bin/tsql.exe"
+      ]
+    elsif /linux/.match?(spec.platform.to_s)
+      spec.files += [
+        "ports/#{spec.platform}/lib/libsybdb.so.5",
+        "ports/#{spec.platform}/bin/defncopy",
+        "ports/#{spec.platform}/bin/tsql"
+      ]
     end
+  end
 
-    spec.files += Dir.glob('exe/*')
+  ext.cross_config_options += CrossLibraries.map do |xlib|
+    {
+      xlib.platform => [
+        "--with-cross-build=#{xlib.platform}",
+        "--with-openssl-platform=#{xlib.openssl_config}"
+      ]
+    }
   end
 end
 

data/VERSION

@@ -1 +1 @@
-3.1.0
+3.2.0