tiny_tds 2.0.0-x86-mingw32 → 2.1.0.pre1-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63f4a4b55ed3ada2526b8951976880c43bc94cc9
-  data.tar.gz: f3e018c6e78eba48160faeb84afbfd7d9648f787
+  metadata.gz: b42e2b9247cd45037bedcd58a07c39d8b28520ef
+  data.tar.gz: 0456ac8aff8a082f89d3ee35d661fb1814d0a51b
 SHA512:
-  metadata.gz: ee45c234bea04a263aa8fc7373926c1d321f757f8a9cbd625645dd70482784e1ca5243b12897aa2d7871030d473d62706abe3e4da86c139169e4664052c94619
-  data.tar.gz: b9399b0262462fbb23cbce92f1a8a1624fbf1c3226afd299472bad37021be3349e1125c9b79fe9b3f9da73a64a8becc6561a00627fab45c0c6a8b6877a6b7815
+  metadata.gz: 797a236d57a8dc64902b5e939c33206dd86dc2b229b1ecadfadec719c22ea613eea8d38e68bea518c490bc10809a54d680b3a12720ff98b882ed3f6143b25d32
+  data.tar.gz: ad42a39989054f20edf2f35645d9020b40411a99f4de412a0886e40e5c20a7e54811081403b9ca8f1240931cd967595eda2fa24ad833219a38a9c3ee517ea10e

data/CHANGELOG

@@ -1,9 +1,20 @@
-* 1.3.0
+* 2.1.0 *
+
+* Support RubyInstaller2 for Windows. Fixes #365.
+* Support the FREETDS_DIR environment variable. Fixes #371.
+
+
+* 2.0.0 *
+
+* Stop building FreeTDS as a part of the extension build.
+
+
+* 1.3.0 *
 
 * FreeTDS: Link libgcc statically for Windows. (#351) Fixes #349.
 
 
-* 1.2.0
+* 1.2.0 *
 
 * Use OpenSSL v1.1.0e & FreeTDS v1.00.27 for Windows builds.
 

data/Gemfile

@@ -2,7 +2,6 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
-  gem 'rake-compiler-dock', github: 'rake-compiler/rake-compiler-dock'
 end
 
 group :test do

data/Rakefile

@@ -29,6 +29,9 @@ Rake::ExtensionTask.new('tiny_tds', SPEC) do |ext|
 
   # 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')
+
     platform_host_map = GEM_PLATFORM_HOSTS
     gemplat = spec.platform.to_s
     host = platform_host_map[gemplat]

data/VERSION

@@ -1 +1 @@
-2.0.0
+2.1.0.pre1

data/appveyor.yml

@@ -3,6 +3,7 @@ init:
   - SET PATH=C:\MinGW\msys\1.0\bin;%PATH%
   - SET RAKEOPT=-rdevkit
   - SET TESTOPTS='-v'
+  - SET MAKE=make V=1
 clone_depth: 5
 skip_tags: true
 skip_branch_with_pr: true
@@ -42,8 +43,8 @@ environment:
   TINYTDS_UNIT_AZURE_PASS:
     secure: fYKSKV4v+36OFQp2nZdX4DfUpgmy5cm0wuR73cgdmEk=
   matrix:
-    - ruby_version: "23-x64"
-    - ruby_version: "23"
+    - ruby_version: "24-x64"
+    - ruby_version: "24"
     - ruby_version: "22-x64"
     - ruby_version: "22"
 on_failure:

data/ext/tiny_tds/extconf.rb

@@ -23,15 +23,25 @@ do_help if arg_config('--help')
 # Make sure to check the ports path for the configured host
 host = RbConfig::CONFIG['host']
 project_dir = File.join(['..']*4)
-freetds_dir = File.join(project_dir, 'ports', host, 'freetds', FREETDS_VERSION)
-freetds_dir = File.expand_path(freetds_dir)
+freetds_ports_dir = File.join(project_dir, 'ports', host, 'freetds', FREETDS_VERSION)
+freetds_ports_dir = File.expand_path(freetds_ports_dir)
 
 # Add all the special path searching from the original tiny_tds build
 # order is important here! First in, last searched.
-%w(
+DIRS = %w(
   /usr/local
   /opt/local
-).each do |path|
+)
+
+# Grab freetds environment variable for use by people on services like
+# Heroku who they can't easily use bundler config to set directories
+DIRS.push(ENV['FREETDS_DIR']) if ENV.has_key?('FREETDS_DIR')
+
+# Add the ports directory if it exists for local developer builds
+DIRS.push(freetds_ports_dir) if File.directory?(freetds_ports_dir)
+
+# Add the search paths for freetds configured above
+DIRS.each do |path|
   idir = "#{path}/include"
   ldir = "#{path}/lib"
 
@@ -41,12 +51,6 @@ freetds_dir = File.expand_path(freetds_dir)
   )
 end
 
-# Add the ports directory if it exists for local developer builds
-if File.directory?(freetds_dir)
-  puts "Using freetds port path #{freetds_dir}"
-  dir_config('freetds', "#{freetds_dir}/include", "#{freetds_dir}/lib")
-end
-
 have_dependencies = [
   find_header('sybfront.h'),
   find_header('sybdb.h'),

data/ext/tiny_tds/extconsts.rb

@@ -1,5 +1,5 @@
 
-ICONV_VERSION = ENV['TINYTDS_ICONV_VERSION'] || "1.14"
+ICONV_VERSION = ENV['TINYTDS_ICONV_VERSION'] || "1.15"
 ICONV_SOURCE_URI = "http://ftp.gnu.org/pub/gnu/libiconv/libiconv-#{ICONV_VERSION}.tar.gz"
 
 OPENSSL_VERSION = ENV['TINYTDS_OPENSSL_VERSION'] || '1.1.0e'

data/lib/tiny_tds.rb

@@ -12,20 +12,39 @@ 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)
-  # Set the PATH environment variable, so that the DLLs can be found.
-  old_path = ENV['PATH']
-  begin
-    ENV['PATH'] = [
-      TinyTds::Gem.ports_bin_paths,
-      TinyTds::Gem.ports_lib_paths,
-      old_path
-    ].flatten.join File::PATH_SEPARATOR
 
-    require "tiny_tds/#{ver}/tiny_tds"
-  rescue LoadError
-    require 'tiny_tds/tiny_tds'
-  ensure
-    ENV['PATH'] = old_path
+  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}"
+      begin
+        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)
+      end
+    else
+      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,

data/patches/freetds/1.00.27/0002-Don-t-use-MSYS2-file-libws2_32.diff

@@ -0,0 +1,28 @@
+From 56e8972f66c3e948e2ad6885595c58fd23dcdb37 Mon Sep 17 00:00:00 2001
+From: Lars Kanis <kanis@comcard.de>
+Date: Thu, 6 Jul 2017 17:09:40 +0200
+Subject: [PATCH] Don't use MSYS2 file libws2_32.a for MINGW build
+
+This file is intended for MSYS2/cygwin builds and blocks OpenSSL
+detection of freetds on i686.
+---
+ configure    | 2 --
+ configure.ac | 2 --
+ 2 files changed, 4 deletions(-)
+
+diff --git a/configure b/configure
+index 9495a49..31eb01d 100644
+--- a/configure
++++ b/configure
+@@ -15915,8 +15915,6 @@ case $host in
+ 	tds_mingw=yes
+ 	if test "$host_cpu" = "x86_64"; then
+ 		LIBS="-lws2_32"
+-	elif test -r /usr/lib/w32api/libws2_32.a; then
+-		LIBS="-L/usr/lib/w32api -lws2_32"
+ 	else
+ 		LIBS="-lws2_32"
+ 	fi
+-- 
+2.6.2.windows.1
+

data/tasks/ports.rake

@@ -43,6 +43,9 @@ namespace :ports do
       # freetds doesn't have an option that will provide an rpath
       # so we do it manually
       ENV['OPENSSL_CFLAGS'] = "-Wl,-rpath -Wl,#{openssl.path}/lib"
+      # Add the pkgconfig file with MSYS2'ish path, to prefer our ports build
+      # over MSYS2 system OpenSSL.
+      ENV['PKG_CONFIG_PATH'] = "#{openssl.path.gsub(/^(\w):/i){"/"+$1.downcase}}/lib/pkgconfig:#{ENV['PKG_CONFIG_PATH']}"
       freetds.configure_options << "--with-openssl=#{openssl.path}"
     end
 

data/tasks/ports/freetds.rb

@@ -23,7 +23,7 @@ module Ports
       end
 
       if windows?
-        opts << '--sysconfdir=C:\Sites'
+        opts << '--sysconfdir=C:/Sites'
         opts << '--enable-sspi'
       end
 

data/tasks/ports/openssl.rb

@@ -28,8 +28,11 @@ module Ports
     private
 
     def execute(action, command, options={})
+      # OpenSSL Requires Perl >= 5.10, while the Ruby devkit uses MSYS1 with Perl 5.8.8.
+      # To overcome this, prepend Git's usr/bin to the PATH.
+      # It has MSYS2 with a recent version of perl.
       prev_path = ENV['PATH']
-      if host =~ /mingw/
+      if host =~ /mingw/ && IO.popen(["perl", "-e", "print($])"], &:read).to_f < 5.010
         git_perl = 'C:/Program Files/Git/usr/bin'
         if File.directory?(git_perl)
           ENV['PATH'] = "#{git_perl}#{File::PATH_SEPARATOR}#{ENV['PATH']}"

data/tiny_tds.gemspec

@@ -19,9 +19,10 @@ Gem::Specification.new do |s|
   s.extensions    = ['ext/tiny_tds/extconf.rb']
   s.license       = 'MIT'
   s.required_ruby_version = '>= 2.0.0'
-  s.add_runtime_dependency     'mini_portile2', '~> 2.0'
+  s.metadata['msys2_mingw_dependencies'] = 'freetds'
+  s.add_development_dependency 'mini_portile2', '~> 2.0'
   s.add_development_dependency 'rake', '~> 10.4'
-  s.add_development_dependency 'rake-compiler', '0.9.5'
+  s.add_development_dependency 'rake-compiler', '~> 1.0'
   s.add_development_dependency 'rake-compiler-dock', '~> 0.6.0'
   s.add_development_dependency 'minitest', '~> 5.6'
   s.add_development_dependency 'connection_pool', '~> 2.2'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tiny_tds
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0.pre1
 platform: x86-mingw32
 authors:
 - Ken Collins
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-07 00:00:00.000000000 Z
+date: 2017-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_portile2
@@ -19,7 +19,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -44,16 +44,16 @@ dependencies:
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler-dock
   requirement: !ruby/object:Gem::Requirement
@@ -147,6 +147,7 @@ files:
 - lib/tiny_tds/result.rb
 - lib/tiny_tds/version.rb
 - patches/freetds/1.00.27/0001-mingw_missing_inet_pton.diff
+- patches/freetds/1.00.27/0002-Don-t-use-MSYS2-file-libws2_32.diff
 - patches/libiconv/1.14/1-avoid-gets-error.patch
 - ports/i686-w64-mingw32/freetds/1.00.27/bin/bsqldb.exe
 - ports/i686-w64-mingw32/freetds/1.00.27/bin/datacopy.exe
@@ -161,14 +162,14 @@ files:
 - ports/i686-w64-mingw32/freetds/1.00.27/lib/libct.la
 - ports/i686-w64-mingw32/freetds/1.00.27/lib/libsybdb.dll.a
 - ports/i686-w64-mingw32/freetds/1.00.27/lib/libsybdb.la
-- ports/i686-w64-mingw32/libiconv/1.14/bin/iconv.exe
-- ports/i686-w64-mingw32/libiconv/1.14/bin/libcharset-1.dll
-- ports/i686-w64-mingw32/libiconv/1.14/bin/libiconv-2.dll
-- ports/i686-w64-mingw32/libiconv/1.14/lib/charset.alias
-- ports/i686-w64-mingw32/libiconv/1.14/lib/libcharset.dll.a
-- ports/i686-w64-mingw32/libiconv/1.14/lib/libcharset.la
-- ports/i686-w64-mingw32/libiconv/1.14/lib/libiconv.dll.a
-- ports/i686-w64-mingw32/libiconv/1.14/lib/libiconv.la
+- ports/i686-w64-mingw32/libiconv/1.15/bin/iconv.exe
+- ports/i686-w64-mingw32/libiconv/1.15/bin/libcharset-1.dll
+- ports/i686-w64-mingw32/libiconv/1.15/bin/libiconv-2.dll
+- ports/i686-w64-mingw32/libiconv/1.15/lib/charset.alias
+- ports/i686-w64-mingw32/libiconv/1.15/lib/libcharset.dll.a
+- ports/i686-w64-mingw32/libiconv/1.15/lib/libcharset.la
+- ports/i686-w64-mingw32/libiconv/1.15/lib/libiconv.dll.a
+- ports/i686-w64-mingw32/libiconv/1.15/lib/libiconv.la
 - ports/i686-w64-mingw32/openssl/1.1.0e/bin/c_rehash
 - ports/i686-w64-mingw32/openssl/1.1.0e/bin/libcrypto-1_1.dll
 - ports/i686-w64-mingw32/openssl/1.1.0e/bin/libssl-1_1.dll
@@ -221,12 +222,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: '2.0'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.12