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

data/tasks/ports/recipe.rb

@@ -0,0 +1,52 @@
+# encoding: UTF-8
+require 'mini_portile2'
+require 'fileutils'
+require 'rbconfig'
+
+module Ports
+  class Recipe < MiniPortile
+    def cook
+      checkpoint = "ports/#{name}-#{version}-#{host}.installed"
+
+      unless File.exist? checkpoint
+        super
+        FileUtils.touch checkpoint
+      end
+    end
+
+    private
+
+    def configure_defaults
+      [
+        "--host=#{@host}",
+        '--disable-static',
+        '--enable-shared'
+      ]
+    end
+
+    def windows?
+      host =~ /mswin|mingw32/
+    end
+
+    def system_host
+      RbConfig::CONFIG['host']
+    end
+
+    def cross_build?
+      host != system_host
+    end
+
+    def get_patches(libname, version)
+      patches = []
+  
+      patch_path = File.expand_path(
+        File.join('..','..','..','patches',libname,version), 
+        __FILE__
+      )
+
+      patches.concat(Dir[File.join(patch_path, '*.patch')].sort)
+      patches.concat(Dir[File.join(patch_path, '*.diff')].sort)
+    end
+  end
+end
+

data/tasks/test.rake

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

data/test/bin/install-openssl.sh

@@ -10,9 +10,9 @@ fi
 wget https://www.openssl.org/source/openssl-$OPENSSL_VERSION.tar.gz
 tar -xzf openssl-$OPENSSL_VERSION.tar.gz
 cd openssl-$OPENSSL_VERSION
-./config --prefix=/usr/local/openssl --openssldir=/usr/local/openssl
+./config --prefix=/opt/local --openssldir=/opt/local
 make
-make install
+make install_sw install_ssldirs
 cd ..
 rm -rf openssl-$OPENSSL_VERSION
 rm openssl-$OPENSSL_VERSION.tar.gz

data/test/bin/setup.sh

@@ -3,7 +3,7 @@
 set -x
 set -e
 
-tag=1.4
+tag=2.0
 
 docker pull metaskills/mssql-server-linux-tinytds:$tag
 

data/test/gem_test.rb

@@ -0,0 +1,179 @@
+# encoding: utf-8
+require 'test_helper'
+require 'tiny_tds/gem'
+
+class GemTest < MiniTest::Spec
+  gem_root ||= File.expand_path '../..', __FILE__
+
+  describe TinyTds::Gem do
+
+    # We're going to muck with some system globals so lets make sure
+    # they get set back later
+    original_host = RbConfig::CONFIG['host']
+    original_pwd = Dir.pwd
+
+    after do
+      RbConfig::CONFIG['host'] = original_host
+      Dir.chdir original_pwd
+    end
+
+    describe '#root_path' do
+      let(:root_path) { TinyTds::Gem.root_path }
+
+      it 'should be the root path' do
+        root_path.must_equal gem_root
+      end
+
+      it 'should be the root path no matter the cwd' do
+        Dir.chdir '/'
+
+        root_path.must_equal gem_root
+      end
+    end
+
+    describe '#ports_root_path' do
+      let(:ports_root_path) { TinyTds::Gem.ports_root_path }
+
+      it 'should be the ports path' do
+        ports_root_path.must_equal File.join(gem_root,'ports')
+      end
+
+      it 'should be the ports path no matter the cwd' do
+        Dir.chdir '/'
+
+        ports_root_path.must_equal File.join(gem_root,'ports')
+      end
+    end
+
+    describe '#ports_bin_paths' do
+      let(:ports_bin_paths) { TinyTds::Gem.ports_bin_paths }
+        
+      describe 'when the ports directories exist' do
+        let(:fake_bin_paths) do
+          ports_host_root = File.join(gem_root, 'ports', 'fake-host-with-dirs')
+          [
+            File.join('a','bin'),
+            File.join('a','inner','bin'),
+            File.join('b','bin')
+          ].map do |p|
+            File.join(ports_host_root, p)
+          end
+        end
+
+        before do
+          RbConfig::CONFIG['host'] = 'fake-host-with-dirs'
+          fake_bin_paths.each do |path|
+            FileUtils.mkdir_p(path)
+          end
+        end
+
+        after do
+          FileUtils.remove_entry_secure(
+            File.join(gem_root, 'ports', 'fake-host-with-dirs'), true
+          )
+        end
+
+        it 'should return all the bin directories' do
+          ports_bin_paths.sort.must_equal fake_bin_paths.sort
+        end
+
+        it 'should return all the bin directories regardless of cwd' do
+          Dir.chdir '/'
+          ports_bin_paths.sort.must_equal fake_bin_paths.sort
+        end
+      end
+
+      describe 'when the ports directories are missing' do
+        before do
+          RbConfig::CONFIG['host'] = 'fake-host-without-dirs'
+        end
+
+        it 'should return no directories' do
+          ports_bin_paths.must_be_empty
+        end
+
+        it 'should return no directories regardless of cwd' do
+          Dir.chdir '/'
+          ports_bin_paths.must_be_empty
+        end
+      end
+    end
+
+    describe '#ports_lib_paths' do
+      let(:ports_lib_paths) { TinyTds::Gem.ports_lib_paths }
+        
+      describe 'when the ports directories exist' do
+        let(:fake_lib_paths) do
+          ports_host_root = File.join(gem_root, 'ports', 'fake-host-with-dirs')
+          [
+            File.join('a','lib'),
+            File.join('a','inner','lib'),
+            File.join('b','lib')
+          ].map do |p|
+            File.join(ports_host_root, p)
+          end
+        end
+
+        before do
+          RbConfig::CONFIG['host'] = 'fake-host-with-dirs'
+          fake_lib_paths.each do |path|
+            FileUtils.mkdir_p(path)
+          end
+        end
+
+        after do
+          FileUtils.remove_entry_secure(
+            File.join(gem_root, 'ports', 'fake-host-with-dirs'), true
+          )
+        end
+
+        it 'should return all the lib directories' do
+          ports_lib_paths.sort.must_equal fake_lib_paths.sort
+        end
+
+        it 'should return all the lib directories regardless of cwd' do
+          Dir.chdir '/'
+          ports_lib_paths.sort.must_equal fake_lib_paths.sort
+        end
+      end
+
+      describe 'when the ports directories are missing' do
+        before do
+          RbConfig::CONFIG['host'] = 'fake-host-without-dirs'
+        end
+
+
+        it 'should return no directories' do
+          ports_lib_paths.must_be_empty
+        end
+
+        it 'should return no directories regardless of cwd' do
+          Dir.chdir '/'
+          ports_lib_paths.must_be_empty
+        end
+      end
+    end
+
+    describe '#ports_host' do
+      {
+        'i686-pc-linux-gnu' => 'i686-pc-linux-gnu',
+        'x86_64-pc-linux-gnu' => 'x86_64-pc-linux-gnu',
+        'i686-w64-mingw32' => 'i686-w64-mingw32',
+        'x86_64-w64-mingw32' => 'x86_64-w64-mingw32',
+        # consolidate this host to our build w64-mingw32 arch
+        'i686-pc-mingw32' => 'i686-w64-mingw32'
+      }.each do |host,expected|
+        describe "on a #{host} architecture" do
+          before do
+            RbConfig::CONFIG['host'] = host
+          end
+
+          it "should return a #{expected} ports host" do
+            TinyTds::Gem.ports_host.must_equal expected
+          end
+        end
+      end
+    end
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tiny_tds
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 2.0.0.pre1
 platform: x86-mingw32
 authors:
 - Ken Collins
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-22 00:00:00.000000000 Z
+date: 2017-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_portile2
@@ -126,8 +126,6 @@ files:
 - bin/tsql
 - circle.yml
 - exe/.keep
-- exe/defncopy.exe
-- exe/tsql.exe
 - ext/tiny_tds/client.c
 - ext/tiny_tds/client.h
 - ext/tiny_tds/extconf.rb
@@ -145,13 +143,48 @@ files:
 - lib/tiny_tds/bin.rb
 - lib/tiny_tds/client.rb
 - lib/tiny_tds/error.rb
+- lib/tiny_tds/gem.rb
 - lib/tiny_tds/result.rb
 - lib/tiny_tds/version.rb
-- ports/i686-w64-mingw32/bin/libcrypto32-1.1.0e-i686-w64-mingw32.dll
-- ports/i686-w64-mingw32/bin/libiconv-2.dll
-- ports/i686-w64-mingw32/bin/libssl32-1.1.0e-i686-w64-mingw32.dll
-- ports/i686-w64-mingw32/bin/libsybdb-5.dll
-- ports/patches/freetds/1.00.27/0001-mingw_missing_inet_pton.diff
+- patches/freetds/1.00.27/0001-mingw_missing_inet_pton.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
+- ports/i686-w64-mingw32/freetds/1.00.27/bin/defncopy.exe
+- ports/i686-w64-mingw32/freetds/1.00.27/bin/freebcp.exe
+- ports/i686-w64-mingw32/freetds/1.00.27/bin/libct-4.dll
+- ports/i686-w64-mingw32/freetds/1.00.27/bin/libsybdb-5.dll
+- ports/i686-w64-mingw32/freetds/1.00.27/bin/osql
+- ports/i686-w64-mingw32/freetds/1.00.27/bin/tdspool.exe
+- ports/i686-w64-mingw32/freetds/1.00.27/bin/tsql.exe
+- ports/i686-w64-mingw32/freetds/1.00.27/lib/libct.dll.a
+- 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/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
+- ports/i686-w64-mingw32/openssl/1.1.0e/bin/openssl.exe
+- ports/i686-w64-mingw32/openssl/1.1.0e/lib/libcrypto.a
+- ports/i686-w64-mingw32/openssl/1.1.0e/lib/libcrypto.dll.a
+- ports/i686-w64-mingw32/openssl/1.1.0e/lib/libssl.a
+- ports/i686-w64-mingw32/openssl/1.1.0e/lib/libssl.dll.a
+- tasks/native_gem.rake
+- tasks/package.rake
+- tasks/ports.rake
+- tasks/ports/freetds.rb
+- tasks/ports/libiconv.rb
+- tasks/ports/openssl.rb
+- tasks/ports/recipe.rb
+- tasks/test.rake
 - test/appveyor/dbsetup.ps1
 - test/appveyor/dbsetup.sql
 - test/benchmark/query.rb
@@ -161,6 +194,7 @@ files:
 - test/bin/install-openssl.sh
 - test/bin/setup.sh
 - test/client_test.rb
+- test/gem_test.rb
 - test/result_test.rb
 - test/schema/1px.gif
 - test/schema/sqlserver_2000.sql
@@ -190,12 +224,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 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.8
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: TinyTDS - A modern, simple and fast FreeTDS library for Ruby using DB-Library.