tiny_tds 3.1.0 → 3.2.0

data/lib/tiny_tds.rb

@@ -1,61 +1,42 @@
-# encoding: UTF-8
-require 'date'
-require 'bigdecimal'
-require 'rational'
+require "date"
+require "bigdecimal"
 
-require 'tiny_tds/version'
-require 'tiny_tds/error'
-require 'tiny_tds/client'
-require 'tiny_tds/result'
-require 'tiny_tds/gem'
+require "tiny_tds/version"
+require "tiny_tds/error"
+require "tiny_tds/client"
+require "tiny_tds/result"
+require "tiny_tds/gem"
 
-# Support multiple ruby versions, fat binaries under Windows.
-if RUBY_PLATFORM =~ /mingw|mswin/ && RUBY_VERSION =~ /(\d+.\d+)/
-  ver = Regexp.last_match(1)
+module TinyTds
+  # Is this file part of a fat binary gem with bundled freetds?
+  # This path must be enabled by add_dll_directory on Windows.
+  gplat = ::Gem::Platform.local
+  FREETDS_LIB_PATH = Dir[File.expand_path("../ports/#{gplat.cpu}-#{gplat.os}*/lib", __dir__)].first
 
   add_dll_path = proc do |path, &block|
-    begin
-      require 'ruby_installer/runtime'
-      RubyInstaller::Runtime.add_dll_directory(path, &block)
-    rescue LoadError
-      old_path = ENV['PATH']
-      ENV['PATH'] = "#{path};#{old_path}"
+    if RUBY_PLATFORM =~ /(mswin|mingw)/i && path
       begin
+        require "ruby_installer/runtime"
+        RubyInstaller::Runtime.add_dll_directory(path, &block)
+      rescue LoadError
+        old_path = ENV["PATH"]
+        ENV["PATH"] = "#{path};#{old_path}"
         block.call
-      ensure
-        ENV['PATH'] = old_path
-      end
-    end
-  end
-
-  add_dll_paths = proc do |paths, &block|
-    if path=paths.shift
-      add_dll_path.call(path) do
-        add_dll_paths.call(paths, &block)
+        ENV["PATH"] = old_path
       end
     else
+      # libsybdb is found by a relative rpath in the cross compiled extension dll
+      # or by the system library loader
       block.call
     end
   end
 
-  # Temporary add bin directories for DLL search, so that freetds DLLs can be found.
-  add_dll_paths.call( TinyTds::Gem.ports_bin_paths ) do
-    begin
-      require "tiny_tds/#{ver}/tiny_tds"
-    rescue LoadError
-      require 'tiny_tds/tiny_tds'
-    end
-  end
-else
-  # Load dependent shared libraries into the process, so that they are already present,
-  # when tiny_tds.so is loaded. This ensures, that shared libraries are loaded even when
-  # the path is different between build and run time (e.g. Heroku).
-  ports_libs = File.join(TinyTds::Gem.ports_root_path,
-                         "#{RbConfig::CONFIG['host']}/lib/*.so")
-  Dir[ports_libs].each do |lib|
-    require 'fiddle'
-    Fiddle.dlopen(lib)
+  add_dll_path.call(FREETDS_LIB_PATH) do
+    # Try the <major>.<minor> subdirectory for fat binary gems
+    major_minor = RUBY_VERSION[/^(\d+\.\d+)/] or
+      raise "Oops, can't extract the major/minor version from #{RUBY_VERSION.dump}"
+    require "tiny_tds/#{major_minor}/tiny_tds"
+  rescue LoadError
+    require "tiny_tds/tiny_tds"
   end
-
-  require 'tiny_tds/tiny_tds'
 end

data/tasks/native_gem.rake

@@ -1,23 +1,16 @@
-# encoding: UTF-8
+CrossLibraries.each do |xlib|
+  platform = xlib.platform
 
-desc 'Build the native binary gems using rake-compiler-dock'
-task 'gem:native' => ['ports:cross'] do
-  require 'rake_compiler_dock'
+  desc "Build fat binary gem for platform #{platform}"
+  task "gem:native:#{platform}" do
+    require "rake_compiler_dock"
 
-  # make sure to install our bundle
-  sh "bundle package --all" # Avoid repeated downloads of gems by using gem files from the host.
-
-  GEM_PLATFORM_HOSTS.each do |plat, meta|
-    RakeCompilerDock.sh "bundle --local && RUBY_CC_VERSION=#{meta[:ruby_versions]} rake native:#{plat} gem", platform: plat
+    RakeCompilerDock.sh <<-EOT, platform: platform
+			bundle install &&
+			rake native:#{platform} pkg/#{SPEC.full_name}-#{platform}.gem MAKEOPTS=-j`nproc` RUBY_CC_VERSION=#{RakeCompilerDock.set_ruby_cc_version("~> 2.7", "~> 3.0")} MAKEFLAGS="V=1"
+    EOT
   end
-end
-
-# assumes you are in a container provided by Rake compiler
-# if not, use the task above
-task 'gem:for_platform', [:gem_platform] do |_task, args|
-  args.with_defaults(gem_platform: RbConfig::CONFIG["arch"])
 
-  sh "bundle install"
-  Rake::Task["ports:compile"].invoke(GEM_PLATFORM_HOSTS[args.gem_platform][:host], args.gem_platform)
-  sh "RUBY_CC_VERSION=#{GEM_PLATFORM_HOSTS[args.gem_platform][:ruby_versions]} rake native:#{args.gem_platform} gem"
+  desc "Build the native binary gems"
+  multitask "gem:native" => "gem:native:#{platform}"
 end

data/tasks/package.rake

@@ -1,8 +1,6 @@
-# encoding: UTF-8
-require 'rubygems/package_task'
+require "rubygems/package_task"
 
 Gem::PackageTask.new(SPEC) do |pkg|
   pkg.need_tar = false
   pkg.need_zip = false
 end
-

data/tasks/ports.rake

@@ -1,108 +1,24 @@
-# encoding: UTF-8
-require 'mini_portile2'
-require 'fileutils'
-require_relative 'ports/libiconv'
-require_relative 'ports/openssl'
-require_relative 'ports/freetds'
-require_relative '../ext/tiny_tds/extconsts'
+require_relative "../ext/tiny_tds/extconsts"
 
 namespace :ports do
   libraries_to_compile = {
-    openssl: Ports::Openssl.new(OPENSSL_VERSION),
-    libiconv: Ports::Libiconv.new(ICONV_VERSION),
-    freetds: Ports::Freetds.new(FREETDS_VERSION)
+    openssl: OPENSSL_VERSION,
+    libiconv: ICONV_VERSION,
+    freetds: FREETDS_VERSION
   }
 
-  directory "ports"
-  CLEAN.include "ports/*mingw*"
-  CLEAN.include "ports/*.installed"
-
-  task :openssl, [:host, :gem_platform] do |_task, args|
-    args.with_defaults(host: RbConfig::CONFIG['host'], gem_platform: RbConfig::CONFIG["arch"])
-
-    libraries_to_compile[:openssl].files = [OPENSSL_SOURCE_URI]
-    libraries_to_compile[:openssl].host = args.host
-    libraries_to_compile[:openssl].gem_platform = args.gem_platform
-
-    libraries_to_compile[:openssl].cook
-    libraries_to_compile[:openssl].activate
-  end
-
-  task :libiconv, [:host, :gem_platform] do |_task, args|
-    args.with_defaults(host: RbConfig::CONFIG['host'], gem_platform: RbConfig::CONFIG["arch"])
-
-    libraries_to_compile[:libiconv].files = [ICONV_SOURCE_URI]
-    libraries_to_compile[:libiconv].host = args.host
-    libraries_to_compile[:libiconv].gem_platform = args.gem_platform
-    libraries_to_compile[:libiconv].cook
-    libraries_to_compile[:libiconv].activate
-  end
-
-  task :freetds, [:host, :gem_platform] do |_task, args|
-    args.with_defaults(host: RbConfig::CONFIG['host'], gem_platform: RbConfig::CONFIG["arch"])
-
-    libraries_to_compile[:freetds].files = [FREETDS_SOURCE_URI]
-    libraries_to_compile[:freetds].host = args.host
-    libraries_to_compile[:freetds].gem_platform = args.gem_platform
-
-    if libraries_to_compile[:openssl]
-      # freetds doesn't have an option that will provide an rpath
-      # so we do it manually
-      ENV['OPENSSL_CFLAGS'] = "-Wl,-rpath -Wl,#{libraries_to_compile[:openssl].path}/lib64"
-      # Add the pkgconfig file with MSYS2'ish path, to prefer our ports build
-      # over MSYS2 system OpenSSL.
-      ENV['PKG_CONFIG_PATH'] = "#{libraries_to_compile[:openssl].path.gsub(/^(\w):/i) { "/" + $1.downcase }}/lib64/pkgconfig:#{ENV['PKG_CONFIG_PATH']}"
-      libraries_to_compile[:freetds].configure_options << "--with-openssl=#{libraries_to_compile[:openssl].path}"
-    end
-
-    if libraries_to_compile[:libiconv]
-      libraries_to_compile[:freetds].configure_options << "--with-libiconv-prefix=#{libraries_to_compile[:libiconv].path}"
-    end
-
-    libraries_to_compile[:freetds].cook
-    libraries_to_compile[:freetds].activate
-  end
-
-  task :compile, [:host, :gem_platform] do |_task, args|
-    args.with_defaults(host: RbConfig::CONFIG['host'], gem_platform: RbConfig::CONFIG["arch"])
-
-    puts "Compiling ports for #{args.host} (Ruby platform #{args.gem_platform}) ..."
-
-    libraries_to_compile.keys.each do |lib|
-      Rake::Task["ports:#{lib}"].invoke(args.host, args.gem_platform)
-    end
-  end
-
-  desc 'Build the ports windows binaries via rake-compiler-dock'
-  task 'cross' do
-    require 'rake_compiler_dock'
-
-    # build the ports for all our cross compile hosts
-    GEM_PLATFORM_HOSTS.each do |gem_platform, meta|
-      # make sure to install our bundle
-      build = ['bundle']
-      build << "RUBY_CC_VERSION=#{meta[:ruby_versions]} rake ports:compile[#{meta[:host]},#{gem_platform}] MAKE='make -j`nproc`'"
-      RakeCompilerDock.sh build.join(' && '), platform: gem_platform
-    end
-  end
-
   desc "Notes the actual versions for the compiled ports into a file"
   task "version_file", [:gem_platform] do |_task, args|
     args.with_defaults(gem_platform: RbConfig::CONFIG["arch"])
 
     ports_version = {}
 
-    libraries_to_compile.each do |library, library_recipe|
-      ports_version[library] = library_recipe.version
+    libraries_to_compile.each do |library, version|
+      ports_version[library] = version
     end
 
     ports_version[:platform] = args.gem_platform
 
-    File.open(".ports_versions", "w") do |f|
-      f.write ports_version
-    end
+    File.write(".ports_versions", ports_version)
   end
 end
-
-desc 'Build ports and activate libraries for the current architecture.'
-task :ports => ['ports:compile']

data/tasks/test.rake

@@ -1,9 +1,7 @@
-# encoding: UTF-8
-require 'rake/testtask'
+require "rake/testtask"
 
 Rake::TestTask.new do |t|
-  t.libs << 'test'
-  t.test_files = FileList['test/**/*_test.rb']
+  t.libs << "test"
+  t.test_files = FileList["test/**/*_test.rb"]
   t.verbose = true
 end
-

data/test/bin/install-freetds.sh

@@ -10,11 +10,9 @@ fi
 wget http://www.freetds.org/files/stable/freetds-$FREETDS_VERSION.tar.gz
 tar -xzf freetds-$FREETDS_VERSION.tar.gz
 cd freetds-$FREETDS_VERSION
-./configure --prefix=/opt/local \
-            --with-openssl=/opt/local \
-            --with-tdsver=7.3
+./configure
 make
-make install
+sudo make install
 cd ..
 rm -rf freetds-$FREETDS_VERSION
 rm freetds-$FREETDS_VERSION.tar.gz

data/test/bin/restore-from-native-gem.ps1

@@ -0,0 +1,10 @@
+$gemVersion = (Get-Content VERSION).Trim()
+$gemToUnpack = "./tiny_tds-$gemVersion-$env:RUBY_ARCHITECTURE.gem"
+
+Write-Host "Looking to unpack $gemToUnpack"
+gem unpack --target ./tmp "$gemToUnpack"
+
+# Restore precompiled code
+$source = (Resolve-Path ".\tmp\tiny_tds-$gemVersion-$env:RUBY_ARCHITECTURE\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)}