amalgalite 1.1.2-x86-mswin32 → 1.3.0-x86-mswin32

data/spec/spec_helper.rb

@@ -1,10 +1,5 @@
-require 'rubygems'
 require 'rspec'
 
-$:.unshift File.expand_path(File.join(File.dirname(__FILE__),"..","lib"))
-require 'amalgalite/paths'
-$:.unshift Amalgalite::Paths.root_dir
-
 require 'amalgalite'
 require Amalgalite::Paths.spec_path( "iso_3166_database.rb" )
 
@@ -19,7 +14,7 @@ class SpecInfo
     end
 
     def make_clone_iso_db
-      new_path = make_master_iso_db.duplicate( 'testing' )
+      make_master_iso_db.duplicate( 'testing' )
     end
   end
 end
@@ -36,7 +31,7 @@ RSpec.configure do |config|
   config.before( :each ) do
     @iso_db_path = SpecInfo.make_clone_iso_db
     @iso_db      = Amalgalite::Database.new( @iso_db_path )
-    @schema     = IO.read( Amalgalite::Iso3166Database.schema_file )
+    @schema      = IO.read( Amalgalite::Iso3166Database.schema_file )
   end
 
   config.after( :each ) do

data/spec/sqlite3/constants_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__),%w[ .. spec_helper.rb ]))
+require 'spec_helper'
 
 require 'amalgalite/sqlite3/constants'
 

data/spec/sqlite3/database_status_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "..",  "spec_helper.rb"))
+require 'spec_helper'
 require 'amalgalite/sqlite3'
 require 'rbconfig'
 
@@ -18,14 +18,14 @@ describe "Amalgalite::SQLite3::Database::Status" do
 
 
   it "knows how much lookaside memory it has used" do
-    @db.api.status.lookaside_used.highwater.should > 0
-    @db.api.status.lookaside_used.current.should >= 0
+    @db.api.status.lookaside_used.highwater.should be > 0
+    @db.api.status.lookaside_used.current.should be >= 0
   end
 
   it "can reset the highwater value" do
     stat = @db.api.status.lookaside_used
     before = stat.highwater
-    before.should > 0
+    before.should be > 0
 
     stat.reset!
     after = stat.highwater

data/spec/sqlite3/status_spec.rb

@@ -1,20 +1,20 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "spec_helper.rb"))
+require 'spec_helper'
 require 'amalgalite/sqlite3'
 require 'rbconfig'
 
 describe "Amalgalite::SQLite3::Status" do
   it "knows how much memory it has used" do
-    Amalgalite::SQLite3.status.memory_used.current.should >= 0
-    Amalgalite::SQLite3.status.memory_used.highwater.should >= 0
+    Amalgalite::SQLite3.status.memory_used.current.should be >= 0
+    Amalgalite::SQLite3.status.memory_used.highwater.should be >= 0
   end
 
   it "can reset the highwater value" do
     before = Amalgalite::SQLite3.status.memory_used.highwater
-    before.should > 0
+    before.should be > 0
 
     current = Amalgalite::SQLite3.status.memory_used.current
     Amalgalite::SQLite3.status.memory_used.reset!
-    Amalgalite::SQLite3.status.memory_used.highwater.should == current
+    Amalgalite::SQLite3.status.memory_used.highwater.should be == current
 
     after = Amalgalite::SQLite3.status.memory_used.highwater
     after.should_not eql(before)

data/spec/sqlite3/version_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__),"..","spec_helper.rb"))
+require 'spec_helper'
 require 'amalgalite/sqlite3/version'
 
 describe "Amalgalite::SQLite3::Version" do
@@ -7,16 +7,16 @@ describe "Amalgalite::SQLite3::Version" do
     Amalgalite::SQLite3::Version.to_s.should =~ /\d\.\d\.\d/
     Amalgalite::SQLite3::Version.runtime_version.should =~ /\d\.\d\.\d/
 
-    Amalgalite::SQLite3::Version.to_i.should eql(3007005)
-    Amalgalite::SQLite3::Version.runtime_version_number.should eql(3007005)
+    Amalgalite::SQLite3::Version.to_i.should eql(3007015)
+    Amalgalite::SQLite3::Version.runtime_version_number.should eql(3007015)
 
     Amalgalite::SQLite3::Version::MAJOR.should eql(3)
     Amalgalite::SQLite3::Version::MINOR.should eql(7)
-    Amalgalite::SQLite3::Version::RELEASE.should eql(5)
+    Amalgalite::SQLite3::Version::RELEASE.should eql(15)
     Amalgalite::SQLite3::Version.to_a.should have(3).items
 
-    Amalgalite::SQLite3::Version.compiled_version.should == "3.7.5"
-    Amalgalite::SQLite3::Version.compiled_version_number.should == 3007005
-    Amalgalite::SQLite3::Version.compiled_matches_runtime?.should == true
+    Amalgalite::SQLite3::Version.compiled_version.should be == "3.7.15.2"
+    Amalgalite::SQLite3::Version.compiled_version_number.should be == 3007015
+    Amalgalite::SQLite3::Version.compiled_matches_runtime?.should be == true
   end
 end

data/spec/sqlite3_spec.rb

@@ -1,10 +1,10 @@
-require File.expand_path(File.join(File.dirname(__FILE__),"spec_helper.rb"))
+require 'spec_helper'
 require 'amalgalite/sqlite3'
 require 'rbconfig'
 
 describe "Amalgalite::SQLite3" do
-  it "is threadsafe is ruby is compiled with pthread support, in this case that is (#{Config::CONFIG['configure_args'].include?( "--enable-pthread" )})" do
-    Amalgalite::SQLite3.threadsafe?.should eql(Config::CONFIG['configure_args'].include?( "--enable-pthread" ))
+  it "is threadsafe is ruby is compiled with pthread support, in this case that is (#{RbConfig::CONFIG['configure_args'].include?( "--enable-pthread" )})" do
+    Amalgalite::SQLite3.threadsafe?.should eql(RbConfig::CONFIG['configure_args'].include?( "--enable-pthread" ))
   end
 
   it "knows if an SQL statement is complete" do

data/spec/statement_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path( File.join( File.dirname( __FILE__ ), "spec_helper.rb" ) )
+require 'spec_helper'
 
 describe Amalgalite::Statement do
   before(:each) do
@@ -125,10 +125,9 @@ describe Amalgalite::Statement do
   end
 
   it "can execute a single sql command and say if there is remaining sql to execute" do
-    db = Amalgalite::Database.new( SpecInfo.test_db )
     stmt = @db.prepare( @schema )
     stmt.execute
-    stmt.remaining_sql.size.should > 0
+    stmt.remaining_sql.size.should be > 0
     stmt.close
   end
 
@@ -148,7 +147,7 @@ describe Amalgalite::Statement do
     db.execute( "create table t1(c1,c2,c3)" )
     db.execute("insert into t1(c1,c2,c3) values (1,2,'abc')")
     db.prepare( "select oid,* from t1" ) do |stmt|
-      rows = stmt.execute
+      stmt.execute
       stmt.should be_using_rowid_column
     end
 

data/spec/storage_map_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path( File.join( File.dirname( __FILE__ ), "spec_helper.rb" ) )
+require 'spec_helper'
 require 'amalgalite/type_maps/storage_map'
 
 describe Amalgalite::TypeMaps::StorageMap do

data/spec/tap_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path( File.join( File.dirname( __FILE__ ), "spec_helper.rb" ) )
+require 'spec_helper'
 
 require 'amalgalite'
 require 'amalgalite/trace_tap'
@@ -34,11 +34,11 @@ describe Amalgalite::Taps::StringIO do
   end
 
   it "has a stdout tap" do
-    s = ::Amalgalite::Taps::Stdout.new
+    ::Amalgalite::Taps::Stdout.new
   end
-  
+
   it "has a stderr tap" do
-    s = ::Amalgalite::Taps::Stderr.new
+    ::Amalgalite::Taps::Stderr.new
   end
 end
 

data/spec/text_map_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path( File.join( File.dirname( __FILE__ ), "spec_helper.rb" ) )
+require 'spec_helper'
 require 'amalgalite/type_maps/text_map'
 
 describe Amalgalite::TypeMaps::TextMap do

data/spec/type_map_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path( File.join( File.dirname( __FILE__ ), "spec_helper.rb" ) )
+require 'spec_helper'
 require 'amalgalite/type_map'
 
 describe Amalgalite::TypeMap do

data/spec/version_spec.rb

@@ -1,15 +1,8 @@
-require File.expand_path(File.join(File.dirname(__FILE__),"spec_helper.rb"))
+require 'spec_helper'
 require 'amalgalite/version'
 
-describe "Amalgalite::Version" do
+describe "Amalgalite::VERSION" do
   it "should have a version string" do
-    Amalgalite::Version.to_s.should =~ /\d+\.\d+\.\d+/
     Amalgalite::VERSION.should =~ /\d+\.\d+\.\d+/
   end
-  it "should have a version hash" do
-    h = Amalgalite::Version.to_hash
-    [ :major, :minor, :build ].each do |k|
-      h[k].should_not be_nil
-    end
-  end
 end

data/tasks/custom.rake

@@ -0,0 +1,99 @@
+#-----------------------------------------------------------------------
+# Custom tasks for this project
+#-----------------------------------------------------------------------
+require 'pathname'
+namespace :util do
+  desc "List the sqlite api calls that are not implemented"
+  task :todo do
+
+    not_implementing = %w[
+      sqlite3_exec
+      sqlite3_open
+      sqlite3_os_end
+      sqlite3_os_init
+      sqlite3_malloc
+      sqlite3_realloc
+      sqlite3_free
+      sqlite3_get_table
+      sqlite3_free_table
+      sqlite3_key
+      sqlite3_rekey
+      sqlite3_next_stmt
+      sqlite3_release_memory
+      sqlite3_sleep
+      sqlite3_snprintf
+      sqlite3_vmprintf
+      sqlite3_strnicmp
+      sqlite3_test_control
+      sqlite3_unlock_notify
+      sqlite3_vfs_find
+      sqlite3_vfs_register
+      sqlite3_vfs_unregister
+    ]
+
+    sqlite_h = File.join( *%w[ ext amalgalite c sqlite3.h ] )
+    api_todo = {}
+    IO.readlines( sqlite_h ).each do |line|
+      if line =~ /\ASQLITE_API/ then
+        if line !~ /SQLITE_DEPRECATED/ and line !~ /SQLITE_EXPERIMENTAL/ then
+          if md = line.match( /(sqlite3_[^(\s]+)\(/ ) then
+                                next if not_implementing.include?(md.captures[0])
+                                api_todo[md.captures[0]] = true
+          end
+        end
+      end
+    end
+
+    Dir.glob("ext/amalgalite/c/amalgalite*.c").each do |am_file|
+      IO.readlines( am_file ).each do |am_line|
+        if md = am_line.match( /(sqlite3_[^(\s]+)\(/ ) then
+                                 api_todo.delete( md.captures[0] )
+        end
+      end
+    end
+
+    puts "#{api_todo.keys.size} functions to still implement"
+    puts api_todo.keys.sort.join("\n")
+  end
+
+  desc "Download and integrate the next version of sqlite (use VERSION=x.y.z)"
+  task :update_sqlite do
+    require 'uri'
+    require 'net/http'
+    require 'zip'
+
+    parts = ENV['VERSION'].split(".")
+    next_version = [ parts.shift.to_s ]
+    parts.each do |p|
+      next_version << "#{"%02d" % p }"
+    end
+    next_version << "00" if next_version.size == 3
+
+    next_version = next_version.join('')
+
+    raise "VERSION env variable must be set" unless next_version
+    url = ::URI.parse("http://sqlite.org/sqlite-amalgamation-#{next_version}.zip")
+    puts "downloading #{url.to_s} ..."
+    file = "tmp/#{File.basename( url.path ) }"
+    FileUtils.mkdir "tmp" unless File.directory?( "tmp" )
+    File.open( file, "wb+") do |f|
+      res = Net::HTTP.get_response( url )
+      f.write( res.body )
+    end
+
+    puts "extracting..."
+    upstream_files = %w[ sqlite3.h sqlite3.c sqlite3ext.h ]
+    Zip::ZipInputStream.open( file ) do |io|
+      loop do
+        entry = io.get_next_entry
+        break unless entry
+        bname = File.basename( entry.name )
+        if upstream_files.include?( bname ) then
+          dest_file = File.join( "ext", "amalgalite", "c", bname )
+          puts "updating #{dest_file}"
+          entry.extract( dest_file ) { true }
+        end
+      end
+    end
+  end
+end

data/tasks/default.rake

@@ -0,0 +1,277 @@
+# vim: syntax=ruby
+require 'rake/clean'
+#------------------------------------------------------------------------------
+# If you want to Develop on this project just run 'rake develop' and you'll
+# have all you need to get going. If you want to use bundler for development,
+# then run 'rake develop:using_bundler'
+#------------------------------------------------------------------------------
+namespace :develop do
+
+  # Install all the development and runtime dependencies of this gem using the
+  # gemspec.
+  task :default do
+    require 'rubygems/dependency_installer'
+    installer = Gem::DependencyInstaller.new
+
+    This.set_coverage_gem
+
+    puts "Installing gem depedencies needed for development"
+    This.platform_gemspec.dependencies.each do |dep|
+      if dep.matching_specs.empty? then
+        puts "Installing : #{dep}"
+        installer.install dep
+      else
+        puts "Skipping   : #{dep} -> already installed #{dep.matching_specs.first.full_name}"
+      end
+    end
+    puts "\n\nNow run 'rake test'"
+  end
+
+  # Create a Gemfile that just references the gemspec
+  file 'Gemfile' => :gemspec do
+    File.open( "Gemfile", "w+" ) do |f|
+      f.puts 'source :rubygems'
+      f.puts 'gemspec'
+    end
+  end
+
+  desc "Create a bundler Gemfile"
+  task :using_bundler => 'Gemfile' do
+    puts "Now you can 'bundle'"
+  end
+
+  # Gemfiles are build artifacts
+  CLOBBER << FileList['Gemfile*']
+end
+desc "Boostrap development"
+task :develop => "develop:default"
+
+#------------------------------------------------------------------------------
+# Minitest - standard TestTask
+#------------------------------------------------------------------------------
+begin
+  require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new( :test ) do |t|
+    t.ruby_opts    = %w[ -w ]
+    t.rspec_opts   = %w[ --color --format documentation ]
+  end
+
+# require 'rake/testtask'
+# Rake::TestTask.new( :test ) do |t|
+#   t.ruby_opts    = %w[ -w -rubygems ]
+#   t.libs         = %w[ lib spec ]
+#   t.pattern      = "spec/**/*_spec.rb"
+# end
+#
+  task :test_requirements
+  task :test => :test_requirements
+  task :default => :test
+rescue LoadError
+  This.task_warning( 'test' )
+end
+
+#------------------------------------------------------------------------------
+# RDoc - standard rdoc rake task, although we must make sure to use a more
+#        recent version of rdoc since it is the one that has 'tomdoc' markup
+#------------------------------------------------------------------------------
+begin
+  gem 'rdoc' # otherwise we get the wrong task from stdlib
+  require 'rdoc/task'
+  RDoc::Task.new do |t|
+    t.markup   = 'tomdoc'
+    t.rdoc_dir = 'doc'
+    t.main     = 'README.md'
+    t.title    = "#{This.name} #{This.version}"
+    t.rdoc_files.include( FileList['*.{rdoc,md,txt}'], FileList['ext/**/*.c'],
+                          FileList['lib/**/*.rb'] )
+  end
+rescue LoadError => le
+  This.task_warning( 'rdoc' )
+end
+
+#------------------------------------------------------------------------------
+# Coverage - optional code coverage, rcov for 1.8 and simplecov for 1.9, so
+#            for the moment only rcov is listed.
+#------------------------------------------------------------------------------
+if RUBY_VERSION < "1.9.0"
+  begin
+   require 'rcov/rcovtask'
+   Rcov::RcovTask.new( 'coverage' ) do |t|
+     t.libs      << 'spec'
+     t.pattern   = 'spec/**/*_spec.rb'
+     t.verbose   = true
+     t.rcov_opts << "-x ^/"           # remove all the global files
+     t.rcov_opts << "--sort coverage" # so we see the worst files at the top
+   end
+  rescue LoadError
+   This.task_warning( 'rcov' )
+  end
+else
+  begin
+    require 'simplecov'
+    desc 'Run tests with code coverage'
+    task :coverage do
+      ENV['COVERAGE'] = 'true'
+      Rake::Task[:test].execute
+    end
+    CLOBBER << FileList["coverage"]
+  rescue LoadError
+    This.task_warning( 'simplecov' )
+  end
+end
+
+#------------------------------------------------------------------------------
+# Manifest - We want an explicit list of thos files that are to be packaged in
+#            the gem. Most of this is from Hoe.
+#------------------------------------------------------------------------------
+namespace 'manifest' do
+  desc "Check the manifest"
+  task :check => :clean do
+    files = FileList["**/*", ".*"].exclude( This.exclude_from_manifest ).to_a.sort
+    files = files.select{ |f| File.file?( f ) }
+
+    tmp = "Manifest.tmp"
+    File.open( tmp, 'w' ) do |f|
+      f.puts files.join("\n")
+    end
+
+    begin
+      sh "diff -du Manifest.txt #{tmp}"
+    ensure
+      rm tmp
+    end
+    puts "Manifest looks good"
+  end
+
+  desc "Generate the manifest"
+  task :generate => :clean do
+    files = %x[ git ls-files ].split("\n").sort
+    files.reject! { |f| f =~ This.exclude_from_manifest }
+    File.open( "Manifest.txt", "w" ) do |f|
+      f.puts files.join("\n")
+    end
+  end
+end
+
+#------------------------------------------------------------------------------
+# Fixme - look for fixmes and report them
+#------------------------------------------------------------------------------
+namespace :fixme do
+  task :default => 'manifest:check' do
+    This.manifest.each do |file|
+      next if file == __FILE__
+      next unless file =~ %r/(txt|rb|md|rdoc|css|html|xml|css)\Z/
+      puts "FIXME: Rename #{file}" if file =~ /fixme/i
+      IO.readlines( file ).each_with_index do |line, idx|
+        prefix = "FIXME: #{file}:#{idx+1}".ljust(42)
+        puts "#{prefix} => #{line.strip}" if line =~ /fixme/i
+      end
+    end
+  end
+
+  def fixme_project_root
+    This.project_path( '../fixme' )
+  end
+
+  def fixme_project_path( subtree )
+    fixme_project_root.join( subtree )
+  end
+
+  def local_fixme_files
+    This.manifest.select { |p| p =~ %r|^tasks/| }
+  end
+
+  def outdated_fixme_files
+    local_fixme_files.reject do |local|
+      upstream     = fixme_project_path( local )
+      Digest::SHA256.file( local ) == Digest::SHA256.file( upstream )
+    end
+  end
+
+  def fixme_up_to_date?
+    outdated_fixme_files.empty?
+  end
+
+  desc "See if the fixme tools are outdated"
+  task :outdated => :release_check do
+    if fixme_up_to_date? then
+      puts "Fixme files are up to date."
+    else
+      outdated_fixme_files.each do |f|
+        puts "#{f} is outdated"
+      end
+    end
+  end
+
+  desc "Update outdated fixme files"
+  task :update => :release_check do
+    if fixme_up_to_date? then
+      puts "Fixme files are already up to date."
+    else
+      puts "Updating fixme files:"
+      outdated_fixme_files.each do |local|
+        upstream = fixme_project_path( local )
+        puts "  * #{local}"
+        FileUtils.cp( upstream, local )
+      end
+      puts "Use your git commands as appropriate."
+    end
+  end
+end
+desc "Look for fixmes and report them"
+task :fixme => "fixme:default"
+
+#------------------------------------------------------------------------------
+# Gem Specification
+#------------------------------------------------------------------------------
+# Really this is only here to support those who use bundler
+desc "Build the #{This.name}.gemspec file"
+task :gemspec do
+  File.open( This.gemspec_file, "wb+" ) do |f|
+    f.write This.platform_gemspec.to_ruby
+  end
+end
+
+# the gemspec is also a dev artifact and should not be kept around.
+CLOBBER << This.gemspec_file.to_s
+
+# .rbc files from ruby 2.0
+CLOBBER << FileList["**/*.rbc"]
+
+# The standard gem packaging task, everyone has it.
+require 'rubygems/package_task'
+Gem::PackageTask.new( This.platform_gemspec ) do
+  # nothing
+end
+
+#------------------------------------------------------------------------------
+# Release - the steps we go through to do a final release, this is pulled from
+#           a compbination of mojombo's rakegem, hoe and hoe-git
+#
+# 1) make sure we are on the master branch
+# 2) make sure there are no uncommitted items
+# 3) check the manifest and make sure all looks good
+# 4) build the gem
+# 5) do an empty commit to have the commit message of the version
+# 6) tag that commit as the version
+# 7) push master
+# 8) push the tag
+# 7) pus the gem
+#------------------------------------------------------------------------------
+task :release_check do
+  unless `git branch` =~ /^\* master$/
+    abort "You must be on the master branch to release!"
+  end
+  unless `git status` =~ /^nothing to commit/m
+    abort "Nope, sorry, you have unfinished business"
+  end
+end
+
+desc "Create tag v#{This.version}, build and push #{This.platform_gemspec.full_name} to rubygems.org"
+task :release => [ :release_check, 'manifest:check', :gem ] do
+  sh "git commit --allow-empty -a -m 'Release #{This.version}'"
+  sh "git tag -a -m 'v#{This.version}' v#{This.version}"
+  sh "git push origin master"
+  sh "git push origin v#{This.version}"
+  sh "gem push pkg/#{This.platform_gemspec.full_name}.gem"
+end