tiny_tds 0.6.3.rc1 → 0.6.3.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74cf755ff3bd0cfe314ff8df7630ff974787c009
-  data.tar.gz: 25bab39df87ed93bbbc708e0ae7eae13c032396d
+  metadata.gz: 93f0e6a826fc86c7517b4c7735b7d39b46075689
+  data.tar.gz: d64e8e16bdb9cbf6c83e427c70aa7a1e70c206f9
 SHA512:
-  metadata.gz: 2cff679d4e28c193b6e1eb3228039c7175ba72dd531f4bc78c2f71ff94c117dd873c8b7a512ac7a07f13360ae43053748cfe1b4c35789ccefc8812f903b9014b
-  data.tar.gz: af9e12104d0bcbd6c6a9e603452db52727186fa7d15d6c8b0b7e900a44cc2858767b087e04af8117d3f886de9e996b3ee10cda1d8d070c916b1972c4a0befa8d
+  metadata.gz: 55811f95960940a21c87c4235ab84b910b2ae465c73f06e9eca6305f0486569d7b8ca2c41223ac6b8c499ce55ab4404a5081f168dd9a739c07c77326ed267f62
+  data.tar.gz: c654528c4174aee664b40c8a4c281bc51de2df4a697efb7f881a5e0f681b3d88b4e97369ec57471fcbf2adfafe36a8e6c4abb0fa944ddea6d07d3c0ce15120ba

data/.gitignore

@@ -16,4 +16,3 @@ Gemfile.lock
 misc
 *.gem
 ports
-rake-compiler-dev-box/

data/CHANGELOG

@@ -1,6 +1,10 @@
 
 * 0.6.3.rc1 *
 
+* Ensure zero terminated strings, where C-str pointers are expected. Use StringValueCStr() Fixes #208.
+
+* Revert 999fa571 so timeouts do not kill the client. Fixes #179.
+
 * Remove `sspi_w_kerberos.diff` patch. Not needed anymore.
 
 * Tested again on Azure. Added notes to README on recommended settings.

data/CODE_OF_CONDUCT.md

@@ -0,0 +1,31 @@
+Contributor Code of Conduct
+
+As contributors and maintainers of this project, we pledge to respect all
+people who contribute through reporting issues, posting feature requests,
+updating documentation, submitting pull requests or patches, and other
+activities.
+
+We are committed to making participation in this project a harassment-free
+experience for everyone, regardless of level of experience, gender, gender
+identity and expression, sexual orientation, disability, personal appearance,
+body size, race, ethnicity, age, or religion.
+
+Examples of unacceptable behavior by participants include the use of sexual
+language or imagery, derogatory comments or personal attacks, trolling, public
+or private harassment, insults, or other unprofessional conduct.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct. Project maintainers who do not
+follow the Code of Conduct may be removed from the project team.
+
+This code of conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by opening an issue or contacting one or more of the project
+maintainers.
+
+This Code of Conduct is adapted from the Contributor Covenant
+(http://contributor-covenant.org), version 1.1.0, available at
+http://contributor-covenant.org/version/1/1/0/

data/README.md

@@ -318,27 +318,15 @@ To find out more about the FreeTDS release system [visit this thread](http://lis
 
 ## Compiling Gems for Windows
 
-For the convenience of Windows users, TinyTDS ships pre-compiled for Ruby 1.9.3, 2.0 and 2.1 on Windows. In order to generate these gems, [rake-compiler-dev-box](https://github.com/tjschuck/rake-compiler-dev-box) is used. This project provides a [Vagrant](http://www.vagrantup.com/) box with rvm, cross-compilers and a number of different versions of ruby.
+For the convenience of Windows users, TinyTDS ships pre-compiled for Ruby 1.9.3, 2.0, 2.1 and 2.2 on Windows. In order to generate these gems, [rake-compiler-dock](https://github.com/rake-compiler/rake-compiler-dock) is used. This project provides a [Docker image](https://registry.hub.docker.com/u/larskanis/rake-compiler-dock/) with rvm, cross-compilers and a number of different target versions of ruby.
 
-There are a handful of rake tasks that are part of TinyTDS that make cross-compiling simple. Ensure that you have VirtualBox, Vagrant and git installed, and then run the following to download the box and perform initial setup:
+Run the following rake task to compile the gem 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 cross-compile:setup
+$ rake gem:windows
 ```
 
-Once the setup is complete, run the following rake task to compile the gem for Windows. The first time this will take a while since the `rake-compiler` gem will need to compile a few different versions of ruby:
-
-```
-$ rake cross-compile
-```
-
-The compiled gems will exist in `./rake-compile-dev-box/tiny_tds/pkg/`.
-
-If you want to clean up the dependent ports, temp files and resulting gems, run:
-
-```
-$ rake cross-compile:clean
-```
+The compiled gems will exist in `./pkg/`.
 
 
 ## Development & Testing
@@ -372,7 +360,6 @@ $ rake TINYTDS_SKIP_PORTS=1
 
 ## TODO List
 
-* Include OpenSSL with Windows binaries for SQL Azure.
 * Install an interrupt handler.
 * Allow #escape to accept all ruby primitives.
 

data/Rakefile

@@ -18,6 +18,20 @@ def test_files
   end
 end
 
+def add_file_to_gem(spec, relative_path)
+  target_path = File.join gem_build_path(spec), relative_path
+  target_dir = File.dirname(target_path)
+  mkdir_p target_dir
+  rm_f target_path
+  safe_ln relative_path, target_path
+  spec.files += [relative_path]
+end
+
+def gem_build_path(spec)
+  File.join 'pkg', spec.full_name
+end
+
+
 gemspec = Gem::Specification::load(File.expand_path('../tiny_tds.gemspec', __FILE__))
 
 Rake::TestTask.new do |t|
@@ -31,7 +45,7 @@ Gem::PackageTask.new(gemspec) do |pkg|
   pkg.need_zip = false
 end
 
-task :compile => ["ports:freetds"] unless ENV['TINYTDS_SKIP_PORTS']
+task :compile
 
 task :build => [:clean, :compile]
 
@@ -41,71 +55,50 @@ Dir["tasks/*.rake"].sort.each { |f| load f }
 
 Rake::ExtensionTask.new('tiny_tds', gemspec) do |ext|
   ext.lib_dir = 'lib/tiny_tds'
-  if RUBY_PLATFORM =~ /mswin|mingw/ then
-    # Define target for extension (supporting fat binaries).
-    RUBY_VERSION =~ /(\d+\.\d+)/
-    ext.lib_dir = "lib/tiny_tds/#{$1}"
-  else
-    ext.cross_compile = true
-    ext.cross_platform = []
-    ext.cross_config_options << "--disable-lookup"
-    config_opts = {}
+  ext.cross_compile = true
+  ext.cross_platform = ['x86-mingw32', 'x64-mingw32']
+  ext.cross_config_options += %w[ --disable-lookup --enable-cross-build ]
+
+  # Add dependent DLLs to the cross gems
+  ext.cross_compiling do |spec|
     platform_host_map =  {
-      'x86-mingw32' => 'i586-mingw32msvc',
+      'x86-mingw32' => 'i686-w64-mingw32',
       'x64-mingw32' => 'x86_64-w64-mingw32'
     }
-    # This section ensures we setup up rake dependencies and that libiconv
-    # and freetds are compiled using the cross-compiler and then passed to
-    # extconf.rb in such a way that library detection works.
-    platform_host_map.each do |plat, host|
-      ext.cross_platform << plat
-      libiconv = define_libiconv_recipe(plat, host)
-      freetds  = define_freetds_recipe(plat, host, libiconv)
-      task "native:#{plat}" => ["ports:freetds:#{plat}"] unless ENV['TINYTDS_SKIP_PORTS']
-      # For some reason --with-freetds-dir and --with-iconv-dir would not work.
-      # It seems the default params that extconf.rb constructs include
-      # --without-freetds-include, --without-freetds-lib, --without-iconv-lib
-      # and --without-iconv-include. Thus we must explicitly override them.
-      config_opts[plat] = " --with-freetds-include=#{freetds.path}/include"
-      config_opts[plat] += " --with-freetds-lib=#{freetds.path}/lib"
-      config_opts[plat] += " --with-iconv-include=#{libiconv.path}/include"
-      config_opts[plat] += " --with-iconv-lib=#{libiconv.path}/lib"
+
+    gemplat = spec.platform.to_s
+    host = platform_host_map[gemplat]
+
+    dlls = [
+      "libeay32-1.0.2d-#{host}.dll",
+      "ssleay32-1.0.2d-#{host}.dll",
+      "libiconv-2.dll",
+      "libsybdb-5.dll",
+    ]
+
+    # We don't need the sources in a fat binary gem
+    spec.files = spec.files.reject{|f| f=~/^ports\/archives/ }
+    spec.files += dlls.map{|dll| "ports/#{host}/bin/#{File.basename(dll)}" }
+
+    dlls.each do |dll|
+      file "ports/#{host}/bin/#{dll}" do |t|
+        sh "x86_64-w64-mingw32-strip", t.name
+      end
     end
-    ext.cross_config_options << config_opts
   end
-end
 
-desc "Checks out rake-compiler-dev-box and sets up the cross-compiling box. This can take a long time."
-task 'cross-compile:setup' do
-  # Make sure we have the command-line programs we need
-  sh 'git', '--version'
-  sh 'vagrant', '-v'
-  if Dir.exists? 'rake-compiler-dev-box'
-    Dir.chdir 'rake-compiler-dev-box'
-  else
-    sh 'git', 'clone', 'https://github.com/tjschuck/rake-compiler-dev-box.git'
-    Dir.chdir 'rake-compiler-dev-box'
-    sh 'patch -p1 < ../compile/rake-compiler-dev-box.patch'
-  end
-  sh 'vagrant', 'up'
 end
 
-desc "Invokes the cross-compiler to generate gems for windows"
-task 'cross-compile' do
-  build_dir = './rake-compiler-dev-box/tiny_tds/'
-  if not Dir.exists?(build_dir)
-    Dir.mkdir build_dir
-  end
-  # Copy the current version of tiny_tds into the box directory
-  Dir.entries('./').each do |entry|
-    next if ['.', '..', 'rake-compiler-dev-box'].include?(entry)
-    cp_r entry, build_dir, :remove_destination => true
-  end
-  Dir.chdir './rake-compiler-dev-box'
-  sh 'vagrant ssh -c "package_win32_fat_binary tiny_tds"'
+# Bundle the freetds sources to avoid download while gem install
+task gem_build_path(gemspec) do
+  add_file_to_gem(gemspec, "ports/archives/freetds-0.91.112.tar.gz")
 end
 
-desc "Cleans up all of the compiled ports, gems and tmp files from cross-compile"
-task 'cross-compile:clean' do
-  rm_r './rake-compiler-dev-box/tiny_tds'
+desc "Build the windows binary gems per rake-compiler-dock"
+task 'gem:windows' do
+  require 'rake_compiler_dock'
+  RakeCompilerDock.sh <<-EOT
+#    bundle install &&
+    rake cross native gem RUBY_CC_VERSION=1.9.3:2.0.0:2.1.6:2.2.2
+  EOT
 end

data/appveyor.yml

@@ -0,0 +1,48 @@
+services:
+  - mssql2014
+
+install:
+  - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
+  - SET PATH=C:\MinGW\msys\1.0\bin;%PATH%
+  - SET RAKEOPT=-rdevkit
+  - SET TINYTDS_UNIT_DATASERVER=localhost\SQL2014
+  - SET TINYTDS_UNIT_DATABASE=master
+  - SET TINYTDS_UNIT_USER=sa
+  - SET TINYTDS_UNIT_PASS=Password12!
+  - ruby --version
+  - gem --version
+  - bundle install
+  - ps: |
+        [reflection.assembly]::LoadWithPartialName("Microsoft.SqlServer.Smo") | Out-Null
+        [reflection.assembly]::LoadWithPartialName("Microsoft.SqlServer.SqlWmiManagement") | Out-Null
+
+        $serverName = $env:COMPUTERNAME
+        $instanceName = 'SQL2014'
+        $smo = 'Microsoft.SqlServer.Management.Smo.'
+        $wmi = new-object ($smo + 'Wmi.ManagedComputer')
+
+        # Enable TCP/IP
+        $uri = "ManagedComputer[@Name='$serverName']/ServerInstance[@Name='$instanceName']/ServerProtocol[@Name='Tcp']"
+        $Tcp = $wmi.GetSmoObject($uri)
+        $Tcp.IsEnabled = $true
+        $TCP.alter()
+
+        # Start services
+        Set-Service SQLBrowser -StartupType Manual
+        Start-Service SQLBrowser
+        Start-Service "MSSQL`$$instanceName"
+
+build: off
+
+test_script:
+  - bundle exec rake
+
+environment:
+  matrix:
+    - ruby_version: "193"
+    #- ruby_version: "200"
+    #- ruby_version: "200-x64"
+    #- ruby_version: "21"
+    #- ruby_version: "21-x64"
+    #- ruby_version: "22"
+    - ruby_version: "22-x64"

data/ext/tiny_tds/client.c

@@ -233,7 +233,7 @@ static VALUE rb_tinytds_execute(VALUE self, VALUE sql) {
   GET_CLIENT_WRAPPER(self);
   rb_tinytds_client_reset_userdata(cwrap->userdata);
   REQUIRE_OPEN_CLIENT(cwrap);
-  dbcmd(cwrap->client, StringValuePtr(sql));
+  dbcmd(cwrap->client, StringValueCStr(sql));
   if (dbsqlsend(cwrap->client) == FAIL) {
     rb_warn("TinyTds: dbsqlsend() returned FAIL.\n");
     return Qfalse;
@@ -316,25 +316,25 @@ static VALUE rb_tinytds_connect(VALUE self, VALUE opts) {
   if (!NIL_P(version))
     dbsetlversion(cwrap->login, NUM2INT(version));
   if (!NIL_P(user))
-    dbsetluser(cwrap->login, StringValuePtr(user));
+    dbsetluser(cwrap->login, StringValueCStr(user));
   if (!NIL_P(pass))
-    dbsetlpwd(cwrap->login, StringValuePtr(pass));
+    dbsetlpwd(cwrap->login, StringValueCStr(pass));
   if (!NIL_P(app))
-    dbsetlapp(cwrap->login, StringValuePtr(app));
+    dbsetlapp(cwrap->login, StringValueCStr(app));
   if (!NIL_P(ltimeout))
     dbsetlogintime(NUM2INT(ltimeout));
   if (!NIL_P(timeout))
     dbsettime(NUM2INT(timeout));
   if (!NIL_P(charset))
-    DBSETLCHARSET(cwrap->login, StringValuePtr(charset));
+    DBSETLCHARSET(cwrap->login, StringValueCStr(charset));
   if (!NIL_P(database) && (azure == Qtrue)) {
     #ifdef DBSETLDBNAME
-      DBSETLDBNAME(cwrap->login, StringValuePtr(database));
+      DBSETLDBNAME(cwrap->login, StringValueCStr(database));
     #else
       rb_warn("TinyTds: Azure connections not supported in this version of FreeTDS.\n");
     #endif
   }
-  cwrap->client = dbopen(cwrap->login, StringValuePtr(dataserver));
+  cwrap->client = dbopen(cwrap->login, StringValueCStr(dataserver));
   if (cwrap->client) {
     cwrap->closed = 0;
     cwrap->charset = charset;
@@ -343,10 +343,10 @@ static VALUE rb_tinytds_connect(VALUE self, VALUE opts) {
     dbsetuserdata(cwrap->client, (BYTE*)cwrap->userdata);
     cwrap->userdata->closed = 0;
     if (!NIL_P(database) && (azure != Qtrue)) {
-      dbuse(cwrap->client, StringValuePtr(database));
+      dbuse(cwrap->client, StringValueCStr(database));
     }
     VALUE transposed_encoding = rb_funcall(cTinyTdsClient, intern_transpose_iconv_encoding, 1, charset);
-    cwrap->encoding = rb_enc_find(StringValuePtr(transposed_encoding));
+    cwrap->encoding = rb_enc_find(StringValueCStr(transposed_encoding));
     if (dbtds(cwrap->client) <= 7) {
       cwrap->identity_insert_sql = "SELECT CAST(@@IDENTITY AS bigint) AS Ident";
     } else {

data/ext/tiny_tds/extconf.rb

@@ -3,10 +3,54 @@ ENV['RC_ARCHS'] = '' if RUBY_PLATFORM =~ /darwin/
 # :stopdoc:
 
 require 'mkmf'
+require 'mini_portile'
+require 'fileutils'
+
+# If your using 0.82, you may have to make a conf file to get it to work. For example:
+# $ export FREETDSCONF='/opt/local/etc/freetds/freetds.conf'
+ICONV_VERSION = ENV['TINYTDS_ICONV_VERSION'] || "1.14"
+ICONV_SOURCE_URI = "http://ftp.gnu.org/pub/gnu/libiconv/libiconv-#{ICONV_VERSION}.tar.gz"
+
+OPENSSL_VERSION = ENV['TINYTDS_OPENSSL_VERSION'] || '1.0.2d'
+OPENSSL_SOURCE_URI = "http://www.openssl.org/source/openssl-#{OPENSSL_VERSION}.tar.gz"
+
+FREETDS_VERSION = ENV['TINYTDS_FREETDS_VERSION'] || "0.91"
+FREETDS_VERSION_INFO = Hash.new { |h,k|
+  h[k] = {:files => "ftp://ftp.freetds.org/pub/freetds/stable/freetds-#{k}.tar.gz"}
+}.merge({
+  "0.82" => {:files => "ftp://ftp.freetds.org/pub/freetds/old/0.82/freetds-0.82.tar.gz"},
+  "0.91" => {:files => "ftp://ftp.freetds.org/pub/freetds/stable/freetds-0.91.112.tar.gz"},
+  "current" => {:files => "ftp://ftp.freetds.org/pub/freetds/current/freetds-current.tar.gz"}
+})
+FREETDS_SOURCE_URI = FREETDS_VERSION_INFO[FREETDS_VERSION][:files]
 
 # Shamelessly copied from nokogiri
 #
 
+def do_help
+  print <<HELP
+usage: ruby #{$0} [options]
+
+    --enable-system-freetds / --disable-system-freetds
+    --enable-system-iconv / --disable-system-iconv
+    --enable-system-openssl / --disable-system-openssl
+        Force use of system or builtin freetds/iconv/openssl library.
+        Default is to prefer system libraries and fallback to builtin.
+
+    --with-freetds-dir=DIR
+        Use the freetds library placed under DIR.
+
+    --enable-lookup
+        Search for freetds through all paths in the PATH environment variable.
+
+    --enable-cross-build
+        Do cross-build.
+HELP
+  exit! 0
+end
+
+do_help if arg_config('--help')
+
 FREETDSDIR = ENV['FREETDS_DIR']
 
 if FREETDSDIR.nil? || FREETDSDIR.empty?
@@ -40,6 +84,144 @@ def searchable_paths_with_directories(*directories)
   end.flatten.compact
 end
 
+class BuildRecipe < MiniPortile
+  def initialize(name, version, files)
+    super(name, version)
+    self.files = files
+    self.target = File.expand_path('../../../ports', __FILE__)
+    # Prefer host_alias over host in order to use i586-mingw32msvc as
+    # correct compiler prefix for cross build, but use host if not set.
+    self.host = consolidated_host(RbConfig::CONFIG["host_alias"].empty? ? RbConfig::CONFIG["host"] : RbConfig::CONFIG["host_alias"])
+    self.patch_files = Dir[File.join(self.target, "patches", self.name, self.version, "*.diff")].sort
+  end
+
+  def consolidated_host(name)
+    # For ruby-1.9.3 we use newer mingw-w64 (i686-w64-mingw32) to build the shared libraries
+    # and mingw32 (i586-mingw32msvc) to build the extension.
+    name.gsub('i586-mingw32msvc', 'i686-w64-mingw32').
+         gsub('i686-pc-mingw32', 'i686-w64-mingw32')
+  end
+
+  def configure_defaults
+    [
+      "--host=#{host}",    # build for specific target (host)
+      "--disable-static",
+      "--enable-shared",
+    ]
+  end
+
+  def port_path
+    "#{target}/#{host}"
+  end
+
+  # When using rake-compiler-dock on Windows, the underlying Virtualbox shared
+  # folders don't support symlinks, but libiconv expects it for a build on
+  # Linux. We work around this limitation by using the temp dir for cooking.
+  def chdir_for_build
+    build_dir = ENV['RCD_HOST_RUBY_PLATFORM'].to_s =~ /mingw|mswin|cygwin/ ? '/tmp' : '.'
+    Dir.chdir(build_dir) do
+      yield
+    end
+  end
+
+  def cook_and_activate
+    checkpoint = File.join(self.target, "#{self.name}-#{self.version}-#{self.host}.installed")
+    unless File.exist?(checkpoint)
+      chdir_for_build do
+        self.cook
+      end
+      FileUtils.touch checkpoint
+    end
+    self.activate
+    self
+  end
+end
+
+def define_libssl_recipe(host)
+  BuildRecipe.new("openssl", OPENSSL_VERSION, [OPENSSL_SOURCE_URI]).tap do |recipe|
+    class << recipe
+      def extract_file(file, target)
+        filename = File.basename(file)
+        FileUtils.mkdir_p target
+
+        message "Extracting #{filename} into #{target}... "
+        result = `#{tar_exe} #{tar_compression_switch(filename)}xf "#{file}" -C "#{target}" 2>&1`
+        if $?.success?
+          output "OK"
+        else
+          # tar on windows returns error exit code, because it can not extract symlinks
+          output "ERROR (ignored)"
+        end
+      end
+
+      def configure
+        config = if host=~/mingw/
+          host=~/x86_64/ ? 'mingw64' : 'mingw'
+        end
+        args = [ "CFLAGS=-DDSO_WIN32",
+            "./Configure",
+            "no-shared",
+            configure_prefix,
+            config,
+          ]
+        args.unshift("CROSS_COMPILE=#{host}-") if enable_config("cross-build")
+
+        execute "configure", "sh -c \"#{args.join(" ")}\""
+      end
+
+      def compile
+        super
+        # OpenSSL DLLs are called "libeay32.dll" and "ssleay32.dll" per default,
+        # regardless to the version. This is best suited to meet the Windows DLL hell.
+        # To avoid any conflicts we do a static build and build DLLs afterwards,
+        # with our own naming scheme.
+        execute "mkdef-libeay32", "(perl util/mkdef.pl 32 libeay >libeay32.def)"
+        execute "mkdef-ssleay32", "(perl util/mkdef.pl 32 ssleay >ssleay32.def)"
+        dllwrap = consolidated_host(RbConfig::CONFIG["DLLWRAP"])
+        execute "dllwrap-libeay32", "#{dllwrap} --dllname libeay32-#{version}-#{host}.dll --output-lib libcrypto.dll.a --def libeay32.def libcrypto.a -lwsock32 -lgdi32 -lcrypt32"
+        execute "dllwrap-ssleay32", "#{dllwrap} --dllname ssleay32-#{version}-#{host}.dll --output-lib libssl.dll.a --def ssleay32.def libssl.a libcrypto.dll.a"
+      end
+
+      def install
+        super
+        FileUtils.cp "#{work_path}/libeay32-#{version}-#{host}.dll", "#{path}/bin/"
+        FileUtils.cp "#{work_path}/ssleay32-#{version}-#{host}.dll", "#{path}/bin/"
+        FileUtils.cp "#{work_path}/libcrypto.dll.a", "#{path}/lib/"
+        FileUtils.cp "#{work_path}/libssl.dll.a", "#{path}/lib/"
+      end
+    end
+  end
+end
+
+def define_libiconv_recipe(host)
+  BuildRecipe.new("libiconv", ICONV_VERSION, [ICONV_SOURCE_URI])
+             .tap do |recipe|
+    # always produce position independent code
+    recipe.configure_options << "CFLAGS=-fPIC"
+  end
+end
+
+def define_freetds_recipe(host, libiconv, libssl)
+  BuildRecipe.new("freetds", FREETDS_VERSION, [FREETDS_SOURCE_URI])
+             .tap do |recipe|
+    with_tdsver = FREETDS_VERSION =~ /0\.8/ ? "--with-tdsver=8.0" : "--with-tdsver=7.1"
+    for_windows = recipe.host =~ /mswin|mingw/i
+    recipe.configure_options << '--with-pic'
+    recipe.configure_options << "--with-libiconv-prefix=#{libiconv.path}" if libiconv
+    recipe.configure_options << "--with-openssl=#{libssl.path}" if libssl
+    recipe.configure_options << '--sysconfdir=C:/Sites' if for_windows
+    recipe.configure_options << '--enable-sspi' if for_windows
+    recipe.configure_options << "--disable-odbc"
+    recipe.configure_options << with_tdsver
+    if libiconv
+      # For some reason freetds doesn't honor --with-libiconv-prefix
+      # so we have do add it by hand:
+      recipe.configure_options << "\"CFLAGS=-I#{libiconv.path}/include\""
+      recipe.configure_options << "\"LDFLAGS=-L#{libiconv.path}/lib -liconv\""
+    end
+  end
+end
+
 if RbConfig::CONFIG['target_os'] =~ /mswin32|mingw32/
   lib_prefix = 'lib' unless RbConfig::CONFIG['target_os'] =~ /mingw32/
   # There's no default include/lib dir on Windows. Let's just add the Ruby ones
@@ -77,10 +259,8 @@ FREETDS_LIB_DIRS = (searchable_paths_with_directories(['lib'],['lib','freetds'])
 # lookup over searchable paths is great for native compilation, however, when
 # cross compiling we need to specify our own paths.
 if enable_config("lookup", true)
-  dir_config('iconv',   FREETDS_HEADER_DIRS, FREETDS_LIB_DIRS)
   dir_config('freetds', FREETDS_HEADER_DIRS, FREETDS_LIB_DIRS)
 else
-  dir_config('iconv')
   dir_config('freetds')
 
   # remove LDFLAGS
@@ -91,11 +271,28 @@ def asplode(lib)
   abort "-----\n#{lib} is missing.\n-----"
 end
 
-asplode 'libiconv' unless have_func('iconv_open', 'iconv.h') || have_library('iconv', 'iconv_open', 'iconv.h')
-asplode 'freetds'  unless have_header('sybfront.h') && have_header('sybdb.h')
+def freetds_usable?(lib_prefix)
+  have_header('sybfront.h') && have_header('sybdb.h') &&
+    find_library("#{lib_prefix}sybdb", 'tdsdbopen') &&
+    find_library("#{lib_prefix}ct",    'ct_bind')
+end
+
+# We use freetds, when available already, and fallback to compilation of ports
+system_freetds = enable_config('system-freetds', ENV['TINYTDS_SKIP_PORTS'] || freetds_usable?(lib_prefix))
+
+# We expect to have iconv and OpenSSL available on non-Windows systems
+host = RbConfig::CONFIG["host"]
+system_iconv = enable_config('system-iconv', host =~ /mingw|mswin/ ? false : true)
+system_openssl = enable_config('system-openssl', host =~ /mingw|mswin/ ? false : true )
+
+unless system_freetds
+  libssl = define_libssl_recipe(host).cook_and_activate unless system_openssl
+  libiconv = define_libiconv_recipe(host).cook_and_activate unless system_iconv
+  freetds = define_freetds_recipe(host, libiconv, libssl).cook_and_activate
+  dir_config('freetds', freetds.path + "/include", freetds.path + "/lib")
+end
 
-asplode 'freetds'  unless find_library("#{lib_prefix}sybdb", 'tdsdbopen')
-asplode 'freetds'  unless find_library("#{lib_prefix}ct",    'ct_bind')
+asplode 'freetds'  unless freetds_usable?(lib_prefix)
 
 create_makefile('tiny_tds/tiny_tds')
 

data/lib/tiny_tds.rb

@@ -9,11 +9,30 @@ require 'tiny_tds/client'
 require 'tiny_tds/result'
 
 # Support multiple ruby versions, fat binaries under Windows.
-begin
-  RUBY_VERSION =~ /(\d+.\d+)/
-  require "tiny_tds/#{$1}/tiny_tds"
-rescue LoadError
+if RUBY_PLATFORM =~ /mingw|mswin/ && RUBY_VERSION =~ /(\d+.\d+)/
+  ver = $1
+  # Set the PATH environment variable, so that the DLLs can be found.
+  old_path = ENV['PATH']
+  begin
+    # Do the same host consolidation as in extconf.rb
+    ports_dir = RbConfig::CONFIG["host"].gsub('i586-mingw32msvc', 'i686-w64-mingw32').
+                                         gsub('i686-pc-mingw32', 'i686-w64-mingw32')
+    ENV['PATH'] = "#{File.expand_path("../../ports/#{ports_dir}/bin", __FILE__)};#{old_path}"
+    require "tiny_tds/#{ver}/tiny_tds"
+  rescue LoadError
+    require 'tiny_tds/tiny_tds'
+  ensure
+    ENV['PATH'] = old_path
+  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.expand_path("../../ports/#{RbConfig::CONFIG["host"]}/lib/*.so", __FILE__)
+  Dir[ports_libs].each do |lib|
+    require "fiddle"
+    Fiddle.dlopen(lib)
+  end
+
   require 'tiny_tds/tiny_tds'
 end
-
-

data/lib/tiny_tds/version.rb

@@ -1,3 +1,3 @@
 module TinyTds
-  VERSION = '0.6.3.rc1'
+  VERSION = '0.6.3.rc2'
 end

data/test/test_helper.rb

@@ -78,7 +78,7 @@ module TinyTds
         :tds_version   => ENV['TINYTDS_UNIT_VERSION'],
         :username      => username,
         :password      => password,
-        :database      => 'tinytdstest',
+        :database      => ENV['TINYTDS_UNIT_DATABASE'] || 'tinytdstest',
         :appname       => 'TinyTds Dev',
         :login_timeout => 5,
         :timeout       => connection_timeout,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tiny_tds
 version: !ruby/object:Gem::Version
-  version: 0.6.3.rc1
+  version: 0.6.3.rc2
 platform: ruby
 authors:
 - Ken Collins
@@ -10,8 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-14 00:00:00.000000000 Z
+date: 2015-07-31 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: mini_portile
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.6.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.6.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -27,33 +41,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.4'
 - !ruby/object:Gem::Dependency
-  name: mini_portile
+  name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.9.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.9.5
 - !ruby/object:Gem::Dependency
-  name: rake-compiler
+  name: rake-compiler-dock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: 0.4.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: 0.4.3
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -94,13 +108,12 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - CHANGELOG
+- CODE_OF_CONDUCT.md
 - Gemfile
 - MIT-LICENSE
 - README.md
 - Rakefile
-- compile/rake-compiler-dev-box.patch
-- ext/patch/Makefile.in.diff
-- ext/patch/dblib-30-char-username.diff
+- appveyor.yml
 - ext/tiny_tds/client.c
 - ext/tiny_tds/client.h
 - ext/tiny_tds/extconf.rb
@@ -113,7 +126,9 @@ files:
 - lib/tiny_tds/error.rb
 - lib/tiny_tds/result.rb
 - lib/tiny_tds/version.rb
-- tasks/ports.rake
+- ports/archives/freetds-0.91.112.tar.gz
+- ports/patches/freetds/0.91/Makefile.in.diff
+- ports/patches/freetds/0.91/dblib-30-char-username.diff
 - test/benchmark/query.rb
 - test/benchmark/query_odbc.rb
 - test/benchmark/query_tinytds.rb
@@ -150,23 +165,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: TinyTDS - A modern, simple and fast FreeTDS library for Ruby using DB-Library.
-test_files:
-- test/benchmark/query.rb
-- test/benchmark/query_odbc.rb
-- test/benchmark/query_tinytds.rb
-- test/client_test.rb
-- test/result_test.rb
-- test/schema/1px.gif
-- test/schema/sqlserver_2000.sql
-- test/schema/sqlserver_2005.sql
-- test/schema/sqlserver_2008.sql
-- test/schema/sqlserver_2014.sql
-- test/schema/sqlserver_azure.sql
-- test/schema/sybase_ase.sql
-- test/schema_test.rb
-- test/test_helper.rb
-- test/thread_test.rb
+test_files: []

data/compile/rake-compiler-dev-box.patch

@@ -1,31 +0,0 @@
-diff --git a/bin/package_win32_fat_binary b/bin/package_win32_fat_binary
-index b336eb7..8ef4f98 100755
---- a/bin/package_win32_fat_binary
-+++ b/bin/package_win32_fat_binary
-@@ -12,9 +12,8 @@ cd '/vagrant'
- # passed in path of gem to be cross-compiled
- cd $1
- 
--# need to use 1.8.7 for fat-binaries (1.9.3 can't cross-build 1.8.7)
--rvm use 1.8.7
-+rvm use 1.9.3
- bundle install
- 
- bundle exec rake clean
--bundle exec rake cross native gem RUBY_CC_VERSION=1.8.7:1.9.3:2.0.0
-+bundle exec rake cross native gem RUBY_CC_VERSION=1.9.3:2.0.0:2.1.1
-diff --git a/bin/prepare_xrubies b/bin/prepare_xrubies
-index 0e2043c..bd1d3c8 100755
---- a/bin/prepare_xrubies
-+++ b/bin/prepare_xrubies
-@@ -18,10 +18,6 @@ rvm all do gem install rake-compiler -v "~> 0.9.2"
- # Use just one CPU for building 1.8.7 and 1.9.3
- export MAKE="make"
- 
--# Build 1.8.7 with mingw32 compiler (GCC 4.2)
--rvm use 1.8.7
--rake-compiler cross-ruby VERSION=1.8.7-p374 HOST=i586-mingw32msvc
--
- # Build 1.9.3 using 1.9.3 as base
- rvm use 1.9.3
- rake-compiler cross-ruby VERSION=1.9.3-p545 HOST=i586-mingw32msvc

data/ext/patch/Makefile.in.diff

@@ -1,29 +0,0 @@
---- a/Makefile.in	2011-08-17 18:57:36.000000000 -0700
-+++ b/Makefile.in	2014-05-02 10:27:01.275813000 -0700
-@@ -772,13 +772,6 @@
- 
- 
- install-data-local:
--	$(mkinstalldirs) $(ETC)
--	if test ! -f $(ETC)/freetds.conf; then \
--		$(INSTALL_DATA) $(srcdir)/freetds.conf $(ETC)/freetds.conf; \
--	fi
--	if test ! -f $(ETC)/locales.conf; then \
--		$(INSTALL_DATA) $(srcdir)/locales.conf $(ETC)/locales.conf; \
--	fi
- 
- clean-local:
- 	find . \( -name \*.test_output -o -name \*.bb -o -name \*.bbg -o -name \*.da -o -name \*.gc\* \) -exec rm -f {} \;
---- a/src/pool/Makefile.in	2011-08-17 18:57:36.000000000 -0700
-+++ b/src/pool/Makefile.in	2014-05-02 10:32:39.628347600 -0700
-@@ -574,10 +574,6 @@
- 
- 
- install-data-local:
--	$(mkinstalldirs) $(ETC)
--	if test ! -f $(ETC)/pool.conf; then \
--		$(INSTALL_DATA) $(srcdir)/pool.conf $(ETC)/pool.conf; \
--	fi
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.

data/ext/patch/dblib-30-char-username.diff

@@ -1,11 +0,0 @@
---- a/src/dblib/dblib.c
-+++ b/src/dblib/dblib.c
-@@ -765,7 +765,7 @@ dbsetlname(LOGINREC * login, const char *value, int which)
- 		return FAIL;
- 	}
- 
--	if (TDS_MAX_LOGIN_STR_SZ < strlen(value)) {
-+	if (login->tds_login->tds_version < 0x700 && TDS_MAX_LOGIN_STR_SZ < strlen(value)) {
- 		dbperror(NULL, SYBENTLL, 0);
- 		return FAIL;
- 	}

data/tasks/ports.rake

@@ -1,73 +0,0 @@
-require 'mini_portile'
-
-# If your using 0.82, you may have to make a conf file to get it to work. For example:
-# $ export FREETDSCONF='/opt/local/etc/freetds/freetds.conf'
-ICONV_VERSION = "1.14"
-FREETDS_VERSION = ENV['TINYTDS_FREETDS_VERSION'] || "0.91"
-FREETDS_VERSION_INFO = Hash.new { |h,k|
-  h[k] = {:files => "ftp://ftp.freetds.org/pub/freetds/stable/freetds-#{k}.tar.gz"}
-}.merge({
-  "0.82" => {:files => "ftp://ftp.freetds.org/pub/freetds/old/0.82/freetds-0.82.tar.gz"},
-  "0.91" => {:files => "ftp://ftp.freetds.org/pub/freetds/stable/freetds-0.91.112.tar.gz"},
-  "current" => {:files => "ftp://ftp.freetds.org/pub/freetds/current/freetds-current.tgz"}
-})
-
-# all ports depends on this directory to exist
-directory "ports"
-
-def define_libiconv_recipe(platform, host)
-  recipe = MiniPortile.new "libiconv", ICONV_VERSION
-  recipe.files << "http://ftp.gnu.org/pub/gnu/libiconv/libiconv-#{ICONV_VERSION}.tar.gz"
-  recipe.host = host
-  desc "Compile libiconv for '#{platform}' (#{host})"
-  task "ports:libiconv:#{platform}" => ["ports"] do
-    checkpoint = "ports/.#{recipe.name}-#{recipe.version}-#{recipe.host}.installed"
-    unless File.exist?(checkpoint)
-      # always produce position independent code
-      recipe.configure_options << "CFLAGS='-fPIC'"
-      recipe.cook
-      touch checkpoint
-      recipe.activate
-    end
-  end
-  recipe
-end
-
-def define_freetds_recipe(platform, host, libiconv)
-  recipe = MiniPortile.new "freetds", FREETDS_VERSION
-  recipe.files << FREETDS_VERSION_INFO[FREETDS_VERSION][:files]
-  recipe.host = host
-  if recipe.respond_to?(:patch_files) && FREETDS_VERSION == "0.91"
-    recipe.patch_files << File.expand_path(File.join('..', '..', 'ext', 'patch', 'dblib-30-char-username.diff'), __FILE__)
-    unless RUBY_PLATFORM =~ /mswin|mingw/
-      recipe.patch_files << File.expand_path(File.join('..', '..', 'ext', 'patch', 'Makefile.in.diff'), __FILE__)
-    end
-  end
-  desc "Compile freetds for '#{platform}' (#{host})"
-  task "ports:freetds:#{platform}" => ["ports", "ports:libiconv:#{platform}"] do
-    checkpoint = "ports/.#{recipe.name}-#{recipe.version}-#{recipe.host}.installed"
-    unless File.exist?(checkpoint)
-      with_tdsver = ENV['TINYTDS_FREETDS_VERSION'] =~ /0\.8/ ? "--with-tdsver=8.0" : "--with-tdsver=7.1"
-      for_windows = recipe.host =~ /mswin|mingw/i
-      recipe.configure_options << '--with-pic'
-      recipe.configure_options << "--with-libiconv-prefix=#{libiconv.path}"
-      recipe.configure_options << '--sysconfdir="C:/Sites"' if for_windows
-      recipe.configure_options << '--enable-sspi' if for_windows
-      recipe.configure_options << "--disable-odbc"
-      recipe.configure_options << with_tdsver
-      recipe.cook
-      touch checkpoint
-      recipe.activate
-    end
-  end
-  recipe
-end
-
-# native compilation of ports
-host = RbConfig::CONFIG["host"]
-libiconv = define_libiconv_recipe(RUBY_PLATFORM, host)
-freetds  = define_freetds_recipe(RUBY_PLATFORM, host, libiconv)
-
-# compile native FreeTDS
-desc "Compile native freetds"
-task "ports:freetds" => ["ports:freetds:#{RUBY_PLATFORM}"]