tiny_tds 1.3.0 → 2.0.0.pre1

data/tasks/ports/libiconv.rb

@@ -0,0 +1,43 @@
+require_relative './recipe'
+
+module Ports
+  class Libiconv < Recipe
+    def initialize(version)
+      super('libiconv', version)
+
+      set_patches
+    end
+
+    def cook
+      chdir_for_build do
+        super
+      end
+      self
+    end
+
+    private
+
+    # 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 configure_defaults
+      [
+        "--host=#{@host}",
+        '--disable-static',
+        '--enable-shared',
+        'CFLAGS=-fPIC -O2'
+      ]
+    end
+
+    def set_patches
+      self.patch_files.concat get_patches(name, version)
+    end
+  end
+end

data/tasks/ports/openssl.rb

@@ -0,0 +1,75 @@
+require_relative './recipe'
+
+module Ports
+  class Openssl < Recipe
+    def initialize(version)
+      super('openssl', version)
+
+      set_patches
+    end
+
+    def configure
+      return if configured?
+
+      md5_file = File.join(tmp_path, 'configure.md5')
+      digest   = Digest::MD5.hexdigest(computed_options.to_s)
+      File.open(md5_file, "w") { |f| f.write digest }
+
+      # Windows doesn't recognize the shebang so always explicitly use sh
+      execute('configure', "sh -c \"./Configure #{computed_options.join(' ')}\"")
+    end
+
+    def install
+      unless installed?
+        execute('install', %Q(#{make_cmd} install_sw install_ssldirs))
+      end
+    end
+
+    private
+
+    def execute(action, command, options={})
+      prev_path = ENV['PATH']
+      if host =~ /mingw/
+        git_perl = 'C:/Program Files/Git/usr/bin'
+        if File.directory?(git_perl)
+          ENV['PATH'] = "#{git_perl}#{File::PATH_SEPARATOR}#{ENV['PATH']}"
+          ENV['PERL'] = 'perl'
+        end
+      end
+
+      super
+      ENV['PATH'] = prev_path
+    end
+
+    def configure_defaults
+      opts = [
+        'shared',
+        target_arch
+      ]
+
+      if cross_build?
+        opts << "--cross-compile-prefix=#{host}-"
+      end
+
+      opts
+    end
+
+    def target_arch
+      if windows?
+        arch = ''
+        arch = '64' if host=~ /x86_64/
+
+        "mingw#{arch}"
+      else
+        arch = 'x32'
+        arch = 'x86_64' if host=~ /x86_64/
+
+        "linux-#{arch}"
+      end
+    end
+
+    def set_patches
+      self.patch_files.concat get_patches(name, version)
+    end
+  end
+end

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/ports.rake

@@ -0,0 +1,84 @@
+# 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'
+
+OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE if defined? OpenSSL
+
+namespace :ports do
+  openssl = Ports::Openssl.new(OPENSSL_VERSION)
+  libiconv = Ports::Libiconv.new(ICONV_VERSION)
+  freetds = Ports::Freetds.new(FREETDS_VERSION)
+
+  directory "ports"
+
+  task :openssl, [:host] do |task, args|
+    args.with_defaults(host: RbConfig::CONFIG['host'])
+
+    openssl.files = [OPENSSL_SOURCE_URI]
+    openssl.host = args.host
+    openssl.cook
+    openssl.activate
+  end
+
+  task :libiconv, [:host] do |task, args|
+    args.with_defaults(host: RbConfig::CONFIG['host'])
+
+    libiconv.files = [ICONV_SOURCE_URI]
+    libiconv.host = args.host
+    libiconv.cook
+    libiconv.activate
+  end
+
+  task :freetds, [:host] do |task, args|
+    args.with_defaults(host: RbConfig::CONFIG['host'])
+
+    freetds.files = [FREETDS_SOURCE_URI]
+    freetds.host = args.host
+
+    if openssl
+      # 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"
+      freetds.configure_options << "--with-openssl=#{openssl.path}"
+    end
+
+    if libiconv
+      freetds.configure_options << "--with-libiconv-prefix=#{libiconv.path}"
+    end
+
+    freetds.cook
+    freetds.activate
+  end
+
+  task :compile, [:host] do |task,args|
+    args.with_defaults(host: RbConfig::CONFIG['host'])
+
+    puts "Compiling ports for #{args.host}..."
+
+    ['openssl','libiconv','freetds'].each do |lib|
+      Rake::Task["ports:#{lib}"].invoke(args.host)
+    end
+  end
+
+  desc 'Build the ports windows binaries via rake-compiler-dock'
+  task 'cross' do
+    require 'rake_compiler_dock'
+
+    # make sure to install our bundle
+    build = ['bundle']
+
+    # build the ports for all our cross compile hosts
+    GEM_PLATFORM_HOSTS.each do |gem_platform, host|
+      build << "rake ports:compile[#{host}]"
+    end
+
+    RakeCompilerDock.sh build.join(' && ')
+  end
+end
+
+desc 'Build ports and activate libraries for the current architecture.'
+task :ports => ['ports:compile']

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
+

data/test/result_test.rb

@@ -135,10 +135,10 @@ class ResultTest < TinyTds::TestCase
         text = 'test affected rows sql'
         @client.execute("DELETE FROM [datatypes]").do
         afrows = @client.execute("SELECT @@ROWCOUNT AS AffectedRows").each.first['AffectedRows']
-        assert_instance_of Fixnum, afrows
+        ['Fixnum', 'Integer'].must_include afrows.class.name
         @client.execute("INSERT INTO [datatypes] ([varchar_50]) VALUES ('#{text}')").do
         pk1 = @client.execute(@client.identity_sql).each.first['Ident']
-        assert_instance_of Fixnum, pk1, 'we it be able to CAST to bigint'
+        ['Fixnum', 'Integer'].must_include pk1.class.name, 'we it be able to CAST to bigint'
         @client.execute("UPDATE [datatypes] SET [varchar_50] = NULL WHERE [varchar_50] = '#{text}'").do
         afrows = @client.execute("SELECT @@ROWCOUNT AS AffectedRows").each.first['AffectedRows']
         assert_equal 1, afrows

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: ruby
 authors:
 - Ken Collins
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-18 00:00:00.000000000 Z
+date: 2017-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_portile2
@@ -113,6 +113,7 @@ files:
 - ".gitignore"
 - ".rubocop.yml"
 - ".travis.yml"
+- BACKERS.md
 - CHANGELOG
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -138,9 +139,19 @@ 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/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
+- 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
@@ -150,6 +161,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
@@ -179,9 +191,9 @@ 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
@@ -198,6 +210,7 @@ test_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
@@ -210,3 +223,4 @@ test_files:
 - test/schema_test.rb
 - test/test_helper.rb
 - test/thread_test.rb
+has_rdoc: