amalgalite 0.9.0 → 0.10.0

data/gemspec.rb

@@ -25,6 +25,7 @@ Amalgalite::GEM_SPEC = Gem::Specification.new do |spec|
   spec.add_development_dependency("rake", "~> 0.8.4")
   spec.add_development_dependency("configuration", "~> 0.0.5")
   spec.add_development_dependency("rspec", "~> 1.2.2")
+  spec.add_development_dependency("rake-compiler", "~> 0.5.0")
 
   if ext_conf = Configuration.for_if_exist?("extension") then
     spec.extensions <<  ext_conf.configs
@@ -51,6 +52,5 @@ end
 Amalgalite::GEM_SPEC_WIN = Amalgalite::GEM_SPEC.clone
 Amalgalite::GEM_SPEC_WIN.platform = ::Gem::Platform.new( "i386-mswin32_60" )
 Amalgalite::GEM_SPEC_WIN.extensions = []
-Amalgalite::GEM_SPEC_WIN.files +=  ["lib/amalgalite3.so"]
 
 Amalgalite::SPECS = [ Amalgalite::GEM_SPEC, Amalgalite::GEM_SPEC_WIN ]

data/lib/amalgalite.rb

@@ -16,6 +16,12 @@ module Amalgalite
   class Error < ::StandardError; end
 end
 
+# support for fat binaries on windows
+if RUBY_PLATFORM =~ /(mswin|mingw)/i then
+  require "amalgalite/#{RUBY_VERSION.sub(/\.\d$/,'')}/amalgalite3"
+else
+  require "amalgalite/amalgalite3"
+end
 require 'amalgalite/aggregate'
 require 'amalgalite/blob'
 require 'amalgalite/boolean'

data/lib/amalgalite/database.rb

@@ -2,7 +2,6 @@
 # Copyright (c) 2008 Jeremy Hinegardner
 # All rights reserved.  See LICENSE and/or COPYING for details.
 #++
-require 'amalgalite3'
 require 'amalgalite/statement'
 require 'amalgalite/trace_tap'
 require 'amalgalite/profile_tap'

data/lib/amalgalite/sqlite3.rb

@@ -1,4 +1,3 @@
-require 'amalgalite3'
 require 'amalgalite/version'
 require 'amalgalite/sqlite3/version'
 require 'amalgalite/sqlite3/constants'

data/lib/amalgalite/sqlite3/constants.rb

@@ -2,8 +2,6 @@
 # Copyright (c) 2008 Jeremy Hinegardner
 # All rights reserved.  See LICENSE and/or COPYING for details.
 #++
-
-require 'amalgalite3'
 module Amalgalite::SQLite3
   module Constants
     module Helpers

data/lib/amalgalite/sqlite3/database/status.rb

@@ -1,4 +1,3 @@
-require 'amalgalite3'
 require 'amalgalite/sqlite3/constants'
 module Amalgalite::SQLite3
   class Database

data/lib/amalgalite/sqlite3/status.rb

@@ -1,4 +1,3 @@
-require 'amalgalite3'
 require 'amalgalite/sqlite3/constants'
 module Amalgalite::SQLite3
 

data/lib/amalgalite/sqlite3/version.rb

@@ -2,7 +2,6 @@
 # Copyright (c) 2008 Jeremy Hinegardner
 # All rights reserved.  See LICENSE and/or COPYING for details.
 #++
-require 'amalgalite3'
 module Amalgalite 
   module SQLite3
     module Version

data/lib/amalgalite/statement.rb

@@ -3,7 +3,6 @@
 # All rights reserved.  See LICENSE and/or COPYING for details.
 #++
 #
-require 'amalgalite3'
 require 'date'
 require 'arrayfields'
 require 'ostruct'

data/lib/amalgalite/type_maps/default_map.rb

@@ -4,7 +4,6 @@
 #++
 
 require 'amalgalite/type_map'
-require 'amalgalite3'
 require 'time'
 require 'date'
 

data/lib/amalgalite/type_maps/storage_map.rb

@@ -4,7 +4,6 @@
 #++
 
 require 'amalgalite/type_map'
-require 'amalgalite3'
 
 module Amalgalite::TypeMaps
   ##

data/lib/amalgalite/type_maps/text_map.rb

@@ -4,7 +4,6 @@
 #++
 #
 require 'amalgalite/type_map'
-require 'amalgalite3'
 
 module Amalgalite::TypeMaps
   ##

data/lib/amalgalite/version.rb

@@ -8,7 +8,7 @@ module Amalgalite
   module Version
 
     MAJOR   = 0
-    MINOR   = 9
+    MINOR   = 10
     BUILD   = 0
 
     #

data/spec/aggregate_spec.rb

@@ -101,7 +101,7 @@ describe "Aggregate SQL Functions" do
       def name() "atest3"; end
       def arity() 128; end
     end
-    lambda { @iso_db.define_aggregate("atest3", AggregateTest3 ) }.should raise_error( ::Amalgalite::SQLite3::Error, /SQLITE_ERROR .* bad parameters/ )
+    lambda { @iso_db.define_aggregate("atest3", AggregateTest3 ) }.should raise_error( ::Amalgalite::SQLite3::Error, /SQLITE_ERROR .* Library used incorrectly/ )
   end
 
   it "does not allow registering a function which does not match the defined name " do

data/spec/function_spec.rb

@@ -65,6 +65,14 @@ describe "Scalar SQL Functions" do
     end
   end
 
+  it "does not allow outrageous arity" do
+    class FunctionTest3 < ::Amalgalite::Function
+      def name() "ftest3"; end
+      def arity() 128; end
+    end
+    lambda { @iso_db.define_aggregate("ftest3", FunctionTest3) }.should raise_error( ::Amalgalite::SQLite3::Error, /SQLITE_ERROR .* Library used incorrectly/ )
+  end
+
   it "raises an error if the function returns a complex Ruby object" do
     l = lambda { Hash.new }
     @iso_db.define_function("htest", l)

data/spec/sqlite3/version_spec.rb

@@ -5,10 +5,10 @@ describe "Amalgalite::SQLite3::Version" do
   it "should have the sqlite3 version" do
     Amalgalite::SQLite3::VERSION.should =~ /\d\.\d\.\d/
     Amalgalite::SQLite3::Version.to_s.should =~ /\d\.\d\.\d/
-    Amalgalite::SQLite3::Version.to_i.should eql(3006012)
+    Amalgalite::SQLite3::Version.to_i.should eql(3006016)
     Amalgalite::SQLite3::Version::MAJOR.should eql(3)
     Amalgalite::SQLite3::Version::MINOR.should eql(6)
-    Amalgalite::SQLite3::Version::RELEASE.should eql(12)
+    Amalgalite::SQLite3::Version::RELEASE.should eql(16)
     Amalgalite::SQLite3::Version.to_a.should have(3).items
   end
 end

data/tasks/announce.rake

@@ -17,16 +17,20 @@ namespace :announce do
       mail.puts
       mail.puts info[:title]
       mail.puts
-      mail.puts "  gem install #{Amalgalite::GEM_SPEC.name}"
+      mail.puts "{{ Release notes for Version #{Amalgalite::VERSION} }}"
       mail.puts
-      mail.puts info[:urls]
-      mail.puts 
-      mail.puts info[:description]
+      mail.puts info[:release_notes]
       mail.puts 
-      mail.puts "{{ Release notes for Version #{Amalgalite::VERSION} }}"
+      mail.puts "    #{info[:urls]}"
+      mail.puts
+      mail.puts "=== Installation"
+      mail.puts
+      mail.puts "  gem install #{Amalgalite::GEM_SPEC.name}"
       mail.puts 
-      mail.puts info[:release_notes]
+      mail.puts "=== Description"
       mail.puts
+      mail.puts info[:description]
+      mail.puts 
     end 
     puts "Created the following as email.txt:"
     puts "-" * 72

data/tasks/config.rb

@@ -27,7 +27,7 @@ Configuration.for('packaging') {
   proj_conf = Configuration.for('project')
   files {
     bin       FileList["bin/*"]
-    ext       FileList["ext/*.{c,h,rb}"]
+    ext       FileList["ext/amalgalite/*.{c,h,rb}"]
     examples  FileList["examples/*"]
     lib       FileList["lib/**/*.rb"]
     test      FileList["spec/**/*.rb", "test/**/*.rb"]
@@ -91,8 +91,8 @@ Configuration.for('rdoc') {
 # Extensions
 #-----------------------------------------------------------------------
 Configuration.for('extension') {
-  #configs   Configuration.for('packaging').files.ext.find_all { |x| %w[ mkrf_conf.rb extconf.rb ].include?(File.basename(x)) }
   configs   Configuration.for('packaging').files.ext.find_all { |x| %w[ extconf.rb ].include?(File.basename(x)) }
+  cross_rbconfig YAML.load_file( File.expand_path("~/.rake-compiler/config.yml"))
 }
 
 #-----------------------------------------------------------------------

data/tasks/distribution.rake

@@ -31,23 +31,44 @@ if pkg_config = Configuration.for_if_exist?("packaging") then
       puts Amalgalite::GEM_SPEC.to_ruby
     end
 
+    desc "dump gemspec for win"
+    task :gemspec_win do
+      puts Amalgalite::GEM_SPEC_WIN.to_ruby
+    end
+
     desc "reinstall gem"
     task :reinstall => [:uninstall, :repackage, :install]
 
-    desc "package the windows gem"
-    task :package_win => "ext:build_win" do
-      cp "ext/amalgalite3.so", "lib", :verbose => true
-      Gem::Builder.new( Amalgalite::GEM_SPEC_WIN ).build
+    desc "package up a windows gem"
+    task :package_win => :clean do
+      Configuration.for("extension").cross_rbconfig.keys.each do |rbconfig|
+        v = rbconfig.split("-").last
+        s = v.sub(/\.\d$/,'')
+        sh "rake ext:build_win-#{v}"
+        mkdir_p "lib/amalgalite/#{s}", :verbose => true
+        cp "ext/amalgalite/amalgalite3.so", "lib/amalgalite/#{s}/", :verbose => true
+      end
+
+      Amalgalite::GEM_SPEC_WIN.files += FileList["lib/amalgalite/{1.8,1.9}/**.{dll,so}"]
+      Gem::Builder.new( Amalgalite::GEM_SPEC_WIN ).build 
+      mkdir "pkg" unless File.directory?( 'pkg' )
       mv Dir["*.gem"].first, "pkg"
     end
 
+    task :clobber do
+      rm_rf 'lib/amalgalite/1.8'
+      rm_rf 'lib/amalgalite/1.9'
+    end
+
+    task :prep => [:clobber, :package, :package_win ]
+
     desc "distribute copiously"
-    task :copious => [:package, :package_win] do
-        gems = Amalgalite::SPECS.collect { |s| "#{s.full_name}.gem" }
-        Rake::SshFilePublisher.new('jeremy@copiousfreetime.org',
+    task :copious => :prep do
+      gems = Amalgalite::SPECS.collect { |s| "#{s.full_name}.gem" }
+      Rake::SshFilePublisher.new('jeremy@copiousfreetime.org',
                                '/var/www/vhosts/www.copiousfreetime.org/htdocs/gems/gems',
                                'pkg', *gems).upload
-        sh "ssh jeremy@copiousfreetime.org rake -f /var/www/vhosts/www.copiousfreetime.org/htdocs/gems/Rakefile"
+      sh "ssh jeremy@copiousfreetime.org rake -f /var/www/vhosts/www.copiousfreetime.org/htdocs/gems/Rakefile"
     end
- end
+  end
 end

data/tasks/extension.rake

@@ -24,7 +24,7 @@ if ext_config = Configuration.for_if_exist?('extension') then
     end
 
     desc "Build the SQLite extension version #{current_sqlite_version}"
-    task :build do
+    task :build => :clean do
       ext_config.configs.each do |extension|
         path  = Pathname.new(extension)
         parts = path.split
@@ -36,33 +36,38 @@ if ext_config = Configuration.for_if_exist?('extension') then
       end
     end
 
-    desc "Build the extensions for windows"
-    task :build_win => :clobber do
-      ext_config.configs.each do |extension|
-        path = Pathname.new( extension )
+    def build_win( version = "1.8.6" )
+      ext_config = Configuration.for("extension")
+      rbconfig = ext_config.cross_rbconfig["rbconfig-#{version}"]
+      raise ArgumentError, "No cross compiler for version #{version}, we have #{ext_config.cross_rbconfig.keys.join(",")}" unless rbconfig
+      ruby_exe = if version =~ /1\.8/ then
+                   "ruby"
+                 else
+                   "ruby1.9"
+                 end
+      Amalgalite::GEM_SPEC.extensions.each do |extension|
+        path = Pathname.new(extension)
         parts = path.split
         conf = parts.last
-        mingw_rbconfig = path.dirname.parent.realpath + "rbconfig-mingw.rb"
-        Dir.chdir( path.dirname ) do |d|
-          cp mingw_rbconfig, "rbconfig.rb"
-          sh "ruby -I. extconf.rb"
+        Dir.chdir(path.dirname) do |d| 
+          if File.exist?( "Makefile" ) then
+            sh "make clean distclean"
+          end
+          cp "#{rbconfig}", "rbconfig.rb"
+          sh "#{ruby_exe} -I. extconf.rb"
           sh "make"
-          rm_f "rbconfig.rb"
         end
       end
     end
 
-    desc "Build the extension for ruby1.9"
-    task :build19 => :clobber do
-      ext_config.configs.each do |extension|
-        path = Pathname.new( extension )
-        parts = path.split
-        conf = parts.last
-        Dir.chdir( path.dirname ) do |d|
-          sh "ruby1.9 -I. extconf.rb"
-          sh "make"
-        end
- 
+    win_builds = []
+    ext_config.cross_rbconfig.keys.each do |v|
+      s = v.split("-").last
+      desc "Build the extension for windows version #{s}"
+      win_bname = "build_win-#{s}"
+      win_builds << win_bname
+      task win_bname => :clean do
+        build_win( s )
       end
     end
 
@@ -72,8 +77,9 @@ if ext_config = Configuration.for_if_exist?('extension') then
         parts = path.split
         conf  = parts.last
         Dir.chdir(path.dirname) do |d| 
-          #sh "rake clean"
-          sh "make clean"
+          if File.exist?( "Makfeile" ) then
+            sh "make clean"
+          end
           rm_f "rbconfig.rb"
         end
       end
@@ -85,7 +91,6 @@ if ext_config = Configuration.for_if_exist?('extension') then
         parts = path.split
         conf  = parts.last
         Dir.chdir(path.dirname) do |d| 
-          #sh "rake clobber"
           if File.exist?( "Makefile") then
             sh "make distclean"
           end
@@ -114,7 +119,7 @@ if ext_config = Configuration.for_if_exist?('extension') then
           tar.each_entry do |entry|
             bname = File.basename( entry.full_name )
             if upstream_files.include?( bname ) then
-              dest_file = File.join( "ext", bname )
+              dest_file = File.join( "ext", "amalgalite", bname )
               puts "updating #{ dest_file }"
               File.open( dest_file, "wb" ) do |df|
                 while bytes = entry.read do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: amalgalite
 version: !ruby/object:Gem::Version 
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors: 
 - Jeremy Hinegardner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-05 00:00:00 -06:00
+date: 2009-06-28 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -52,12 +52,22 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.2.2
     version: 
+- !ruby/object:Gem::Dependency 
+  name: rake-compiler
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.5.0
+    version: 
 description: Amalgalite embeds the SQLite database engine in a ruby extension.  There is no need to install SQLite separately.    Look in the examples/ directory to see  * general usage * blob io * schema information * custom functions * custom aggregates * requiring ruby code from a database  Also Scroll through Amalgalite::Database for a quick example, and a general overview of the API.
 email: jeremy@hinegardner.org
 executables: 
 - amalgalite-pack
 extensions: 
-- ext/extconf.rb
+- ext/amalgalite/extconf.rb
 extra_rdoc_files: 
 - README
 - HISTORY
@@ -96,27 +106,21 @@ extra_rdoc_files:
 - lib/amalgalite/version.rb
 - lib/amalgalite/view.rb
 - lib/amalgalite.rb
-- ext/amalgalite3.c
-- ext/amalgalite3_blob.c
-- ext/amalgalite3_constants.c
-- ext/amalgalite3_database.c
-- ext/amalgalite3_requires_bootstrap.c
-- ext/amalgalite3_statement.c
 files: 
 - bin/amalgalite-pack
-- ext/amalgalite3.c
-- ext/amalgalite3_blob.c
-- ext/amalgalite3_constants.c
-- ext/amalgalite3_database.c
-- ext/amalgalite3_requires_bootstrap.c
-- ext/amalgalite3_statement.c
-- ext/sqlite3.c
-- ext/amalgalite3.h
-- ext/sqlite3.h
-- ext/sqlite3_options.h
-- ext/sqlite3ext.h
-- ext/extconf.rb
-- ext/gen_constants.rb
+- ext/amalgalite/amalgalite3.c
+- ext/amalgalite/amalgalite3_blob.c
+- ext/amalgalite/amalgalite3_constants.c
+- ext/amalgalite/amalgalite3_database.c
+- ext/amalgalite/amalgalite3_requires_bootstrap.c
+- ext/amalgalite/amalgalite3_statement.c
+- ext/amalgalite/sqlite3.c
+- ext/amalgalite/amalgalite3.h
+- ext/amalgalite/sqlite3.h
+- ext/amalgalite/sqlite3_options.h
+- ext/amalgalite/sqlite3ext.h
+- ext/amalgalite/extconf.rb
+- ext/amalgalite/gen_constants.rb
 - examples/a.rb
 - examples/blob.rb
 - examples/bootstrap.rb

data/ext/extconf.rb

@@ -1,23 +0,0 @@
-require 'mkmf'
-require 'rbconfig'
-
-# make available table and column meta data api
-$CFLAGS += " -DSQLITE_ENABLE_COLUMN_METADATA=1"  
-$CFLAGS += " -DSQLITE_ENABLE_RTREE=1"
-$CFLAGS += " -DSQLITE_OMIT_BUILTIN_TEST=1"
-
-# we compile sqlite the same way that the installation of ruby is compiled.
-if Config::CONFIG['configure_args'].include?( "--enable-pthread" ) then
-  $CFLAGS += " -DSQLITE_THREADSAFE=1"
-else
-  $CFLAGS += " -DSQLITE_THREADSAFE=0"
-end
-
-# remove the -g if it exists
-$CFLAGS = $CFLAGS.gsub(/-g/,'')
-
-# remove -Wall if it exists
-$CFLAGS = $CFLAGS.gsub(/-Wall/,'')
-#$CFLAGS += " -Wall"
-
-create_makefile('amalgalite3')