tiny_tds 0.4.4 → 0.4.5.rc1

data/CHANGELOG

@@ -1,4 +1,11 @@
 
+* 0.4.5.rc1 *
+
+* Release static libs for Windows.
+
+* Change how :host/:port are implemented. Now sending "host:port" to :dataserver.
+
+
 * 0.4.4 *
 
 * New :host/:port connection options. Removes need for freetds.conf file.

data/Gemfile

@@ -3,12 +3,12 @@ source :rubygems
 
 group :development do
   gem 'rake', '>= 0.8.7'
-  gem 'mini_portile', '0.2.1'
+  gem 'mini_portile', '0.2.2'
   gem 'rake-compiler', '0.7.7'
 end
 
 group :test do
-  gem 'mini_shoulda'
+  gem 'mini_shoulda', '0.3.0'
   gem 'activesupport', '2.3.5'
   gem 'bench_press', '0.3.1'
   platforms :mri_18 do

data/NOTES

@@ -1,7 +1,5 @@
 
 TODO
-
-  * Update Readme when 0.83.dev becomes a release.
   
   * Client & Connection
     - Make a #ping method that does the "SELECT 1" when not closed.
@@ -11,4 +9,3 @@ TODO
   * Result Set
     - See if we can make a binary string of [timestamp] type.
 
-

data/Rakefile

@@ -6,8 +6,6 @@ require 'rake/testtask'
 require 'rake/extensiontask'
 require "rubygems/package_task"
 
-Dir["tasks/*.rake"].sort.each { |f| load f }
-
 def test_libs
   ['lib','test']
 end
@@ -36,7 +34,6 @@ task :compile => ["ports:freetds"] unless ENV['TINYTDS_SKIP_PORTS']
 Rake::ExtensionTask.new('tiny_tds', gemspec) do |ext|
   ext.lib_dir = 'lib/tiny_tds'
   ext.config_options << "--enable-iconv" unless ENV['TINYTDS_SKIP_PORTS']
-  # Automatically add build options to avoid need of manual input.
   if RUBY_PLATFORM =~ /mswin|mingw/ then
     # Define target for extension (supporting fat binaries).
     RUBY_VERSION =~ /(\d+\.\d+)/
@@ -45,8 +42,6 @@ Rake::ExtensionTask.new('tiny_tds', gemspec) do |ext|
     ext.cross_compile = true
     ext.cross_platform = ['i386-mingw32']
     ext.cross_config_options << "--disable-lookup"
-    ext.cross_config_options << "--with-iconv-dir=#{$recipes[:libiconv].path}"
-    ext.cross_config_options << "--with-freetds-dir=#{$recipes[:freetds].path}"
   end
 end
 
@@ -54,4 +49,4 @@ task :build => [:clean, :compile]
 
 task :default => [:build, :test]
 
-
+Dir["tasks/*.rake"].sort.each { |f| load f }

data/ext/tiny_tds/extconf.rb

@@ -75,6 +75,7 @@ if enable_config("lookup", true)
     abort "-----\nCan not find FreeTDS's db-lib or include directory.\n-----"
   end
 else
+  $LDFLAGS = ENV.fetch("LDFLAGS")
   unless have_freetds_libraries?(*FREETDS_LIBRARIES) && have_freetds_headers?(*FREETDS_HEADERS)
     abort "-----\nCan not find FreeTDS's db-lib or include directory.\n-----"
   end

data/lib/tiny_tds/client.rb

@@ -56,11 +56,7 @@ module TinyTds
       opts[:timeout] ||= 5
       opts[:encoding] = (opts[:encoding].nil? || opts[:encoding].downcase == 'utf8') ? 'UTF-8' : opts[:encoding].upcase
       opts[:port] ||= 1433
-      ENV['TDSPORT'] = opts[:port].to_s
-      if opts[:dataserver].to_s.empty?
-        opts[:dataserver] = ''
-        ENV['TDSHOST'] = opts[:host].to_s
-      end
+      opts[:dataserver] = "#{opts[:host]}:#{opts[:port]}" if opts[:dataserver].to_s.empty?
       connect(opts)
     end
     

data/lib/tiny_tds/version.rb

@@ -1,3 +1,3 @@
 module TinyTds
-  VERSION = '0.4.4'
+  VERSION = '0.4.5.rc1'
 end

data/tasks/ports.rake

@@ -36,12 +36,10 @@ namespace :ports do
     recipe = $recipes[:freetds]
     checkpoint = "ports/.#{recipe.name}.#{recipe.version}.#{recipe.host}.timestamp"
     unless File.exist?(checkpoint)
+      # recipe.configure_options << "--disable-debug"
+      recipe.configure_options << '--sysconfdir="C:/Sites"' if recipe.host != ORIGINAL_HOST
       recipe.configure_options << "--disable-odbc"
       recipe.configure_options << "--with-tdsver=7.1"
-      # HACK: Only do this when cross compiling (util MiniPortile#activate gets the job done)
-      unless recipe.host == ORIGINAL_HOST
-        recipe.configure_options << "--with-libiconv-prefix=#{$recipes[:libiconv].path}"
-      end
       recipe.cook
       touch checkpoint
     end
@@ -55,5 +53,6 @@ task :cross do
   $recipes.each do |_, recipe|
     recipe.host = host
   end
+  # hook compile task with dependencies
+  Rake::Task["compile"].prerequisites.unshift "ports:freetds"
 end
-

data/test/test_helper.rb

@@ -35,15 +35,6 @@ module TinyTds
       
     end
     
-    setup do
-      
-    end
-    
-    teardown do
-      ENV['TDSPORT'] = nil
-      ENV['TDSHOST'] = nil
-    end
-    
     
     protected
     

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: tiny_tds
 version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: 
+  hash: 15424127
+  prerelease: 6
   segments: 
   - 0
   - 4
-  - 4
-  version: 0.4.4
+  - 5
+  - rc
+  - 1
+  version: 0.4.5.rc1
 platform: ruby
 authors: 
 - Ken Collins
@@ -16,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-11 00:00:00 -04:00
+date: 2011-04-15 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -83,16 +85,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: TinyTDS - A modern, simple and fast FreeTDS library for Ruby using DB-Library.