amalgalite 0.15.0 → 1.0.0

data/spec/sqlite3/constants_spec.rb

@@ -7,13 +7,6 @@ describe Amalgalite::SQLite3::Constants do
   it "has Open constants" do
     Amalgalite::SQLite3::Constants::Open::READONLY.should > 0
   end
-  
-  it "has DataType constants" do
-    Amalgalite::SQLite3::Constants::DataType::BLOB.should > 0
-  end
-
-  it "has ResultCode constants" do
-  end
 
   describe 'ResultCode' do 
     it "has constants" do
@@ -31,6 +24,40 @@ describe Amalgalite::SQLite3::Constants do
     end
   end
 
+  describe "DataType" do
+    it "has constants" do
+      Amalgalite::SQLite3::Constants::DataType::NULL.should == 5
+    end
+
+    it "can return the constant from a number" do
+      c = Amalgalite::SQLite3::Constants::DataType.name_from_value( 5 )
+      c.should == "NULL"
+    end
+
+    it "can return the number from a name" do
+      v = Amalgalite::SQLite3::Constants::DataType.value_from_name( "Null" )
+      v.should == 5
+    end
+
+  end
+
+  describe "Config" do
+    it "has constants" do
+      Amalgalite::SQLite3::Constants::Config::HEAP.should == 8
+    end
+
+    it "can return the constant from a number" do
+      c = Amalgalite::SQLite3::Constants::Config.name_from_value( 8 )
+      c.should == "HEAP"
+    end
+
+    it "can return the number from a name" do
+      v = Amalgalite::SQLite3::Constants::Config.value_from_name( "heap" )
+      v.should == 8
+    end
+
+  end
+
   describe 'Status' do
     it "has constants" do
       Amalgalite::SQLite3::Constants::Status::MEMORY_USED.should == 0
@@ -40,7 +67,7 @@ describe Amalgalite::SQLite3::Constants do
       c = Amalgalite::SQLite3::Constants::Status.name_from_value( 3 )
       c.should == "SCRATCH_USED"
     end
-    
+
     it "can return the number from a name" do
       v = Amalgalite::SQLite3::Constants::Status.value_from_name( "memory_used" )
       v.should == 0
@@ -56,10 +83,26 @@ describe Amalgalite::SQLite3::Constants do
       c = Amalgalite::SQLite3::Constants::DBStatus.name_from_value( 0 )
       c.should == "LOOKASIDE_USED"
     end
-    
+
     it "can return the number from a name" do
       v = Amalgalite::SQLite3::Constants::DBStatus.value_from_name( "lookaside_used" )
       v.should == 0
     end
   end
+
+  describe "StatementStatus" do
+    it "has constants" do
+      Amalgalite::SQLite3::Constants::StatementStatus::AUTOINDEX.should == 3
+    end
+
+    it "can return the constant from a number" do
+      c = Amalgalite::SQLite3::Constants::StatementStatus.name_from_value( 3 )
+      c.should == "AUTOINDEX"
+    end
+
+    it "can return the number from a name" do
+      v = Amalgalite::SQLite3::Constants::StatementStatus.value_from_name( "autoindex" )
+      v.should == 3
+    end
+  end
 end

data/spec/sqlite3/database_status_spec.rb

@@ -13,7 +13,7 @@ describe "Amalgalite::SQLite3::Database::Status" do
 
   after(:each) do
     @db.close
-    FileUtils.rm_f "lookaside-test.db" 
+    ::FileUtils.rm_f "lookaside-test.db" 
   end
 
 

data/spec/sqlite3/version_spec.rb

@@ -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(3007003)
-    Amalgalite::SQLite3::Version.runtime_version_number.should eql(3007003)
+    Amalgalite::SQLite3::Version.to_i.should eql(3007004)
+    Amalgalite::SQLite3::Version.runtime_version_number.should eql(3007004)
 
     Amalgalite::SQLite3::Version::MAJOR.should eql(3)
     Amalgalite::SQLite3::Version::MINOR.should eql(7)
-    Amalgalite::SQLite3::Version::RELEASE.should eql(3)
+    Amalgalite::SQLite3::Version::RELEASE.should eql(4)
     Amalgalite::SQLite3::Version.to_a.should have(3).items
 
-    Amalgalite::SQLite3::Version.compiled_version.should == "3.7.3"
-    Amalgalite::SQLite3::Version.compiled_version_number.should == 3007003
+    Amalgalite::SQLite3::Version.compiled_version.should == "3.7.4"
+    Amalgalite::SQLite3::Version.compiled_version_number.should == 3007004
     Amalgalite::SQLite3::Version.compiled_matches_runtime?.should == true
   end
 end

data/spec/storage_map_spec.rb

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

data/spec/tap_spec.rb

@@ -1,7 +1,5 @@
-require 'rubygems'
-require 'spec'
+require File.expand_path( File.join( File.dirname( __FILE__ ), "spec_helper.rb" ) )
 
-$: << File.expand_path(File.join(File.dirname(__FILE__),"..","lib"))
 require 'amalgalite'
 require 'amalgalite/trace_tap'
 require 'amalgalite/profile_tap'

data/spec/text_map_spec.rb

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

data/spec/type_map_spec.rb

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

data/tasks/announce.rake

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

data/tasks/config.rb

@@ -1,4 +1,5 @@
 require 'configuration'
+require 'yaml'
 
 require 'rake'
 require 'tasks/utils'
@@ -11,12 +12,12 @@ Configuration.for('project') {
   version       Amalgalite::Version.to_s
   author        "Jeremy Hinegardner"
   email         "jeremy at copiousfreetime dot org"
-  homepage      "http://copiousfreetime.rubyforge.org/amalgalite/"
-  description   Utils.section_of("README", "description")
+  homepage      "http://www.copiousfreetime.org/projects/amalgalite/"
+  description   Utils.section_of("README.rdoc", "description")
   summary       description.split(".").first
-  history       "HISTORY"
-  license       FileList["LICENSE"]
-  readme        "README"
+  history       "HISTORY.rdoc"
+  license       ::FileList["LICENSE"]
+  readme        "README.rdoc"
 }
 
 #-----------------------------------------------------------------------
@@ -26,15 +27,15 @@ Configuration.for('packaging') {
   # files in the project 
   proj_conf = Configuration.for('project')
   files {
-    bin       FileList["bin/*"]
-    ext       FileList["ext/amalgalite/*.{c,h,rb}"]
-    examples  FileList["examples/*"]
-    lib       FileList["lib/**/*.rb"]
-    test      FileList["spec/**/*.rb", "test/**/*.rb",  ]
-    data      FileList["data/**/*", "spec/data/*.{sql,txt,sh}"]
-    tasks     FileList["tasks/**/*.r{ake,b}"]
-    rdoc      FileList[proj_conf.readme, proj_conf.history,
-                       proj_conf.license] + lib + FileList["ext/amalgalite3*.c"]
+    bin       ::FileList["bin/*"]
+    ext       ::FileList["ext/amalgalite/*.{c,h,rb}"]
+    examples  ::FileList["examples/*"]
+    lib       ::FileList["lib/**/*.rb"]
+    test      ::FileList["spec/**/*.rb", "test/**/*.rb",  ]
+    data      ::FileList["data/**/*", "spec/data/*.{sql,txt,sh}"]
+    tasks     ::FileList["tasks/**/*.r{ake,b}"]
+    rdoc      ::FileList[proj_conf.readme, proj_conf.history,
+      proj_conf.license] + lib + ::FileList["ext/amalgalite3*.c"]
     all       bin + ext + examples + lib + test + data + rdoc + tasks 
   }
 
@@ -61,7 +62,7 @@ Configuration.for("rubygem") {
 Configuration.for('test') {
   mode      "spec"
   files     Configuration.for("packaging").files.test
-  options   %w[ --format profile --color ]
+  options   %w[ --format documentation --color ]
   ruby_opts %w[  ]
 }
 
@@ -69,9 +70,8 @@ Configuration.for('test') {
 # Rcov 
 #-----------------------------------------------------------------------
 Configuration.for('rcov') {
-  output_dir  "coverage"
   libs        %w[ lib ]
-  rcov_opts   %w[ --html ]
+  rcov_opts   %w[ --html -o coverage ]
   ruby_opts   %w[  ]
   test_files  Configuration.for('packaging').files.test
 }
@@ -92,7 +92,7 @@ Configuration.for('rdoc') {
 #-----------------------------------------------------------------------
 Configuration.for('extension') {
   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"))
+  cross_rbconfig ::YAML.load_file( File.expand_path("~/.rake-compiler/config.yml"))
 }
 
 #-----------------------------------------------------------------------

data/tasks/extension.rake

@@ -1,7 +1,10 @@
 require 'tasks/config'
 require 'pathname'
-require 'zlib'
-require 'archive/tar/minitar'
+begin
+  require 'zip/zipfilesystem'
+rescue
+  abort "rake development_dependencies"
+end
 
 #-----------------------------------------------------------------------
 # Extensions
@@ -42,7 +45,17 @@ if ext_config = Configuration.for_if_exist?('extension') then
       end
     end
 
-    def build_win( version = "1.8.6" )
+    def myruby
+      require 'rbconfig'
+      x = File.join(
+        RbConfig::CONFIG['bindir'],
+        RbConfig::CONFIG['ruby_install_name']
+      )
+      #puts "myruby = #{x}"
+      return x
+    end
+
+    def build_win( version = "1.8.7" )
       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
@@ -58,7 +71,7 @@ if ext_config = Configuration.for_if_exist?('extension') then
           cp "#{rbconfig}", "rbconfig.rb"
           rubylib = ENV['RUBYLIB']
           ENV['RUBYLIB'] = "."
-          sh %[ #{rvm} #{version} -S extconf.rb ]
+          sh %[ #{rvm} #{version} -S extconf.rb #{myruby} ]
           ENV['RUBYLIB'] = rubylib
           sh "make"
         end
@@ -159,10 +172,18 @@ if ext_config = Configuration.for_if_exist?('extension') then
 
     desc "Download and integrate the next version of sqlite (use VERSION=x.y.z)"
     task :update_sqlite do
-      next_version = ENV['VERSION']
+      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
-      puts "downloading ..."
-      url = URI.parse("http://sqlite.org/sqlite-amalgamation-#{next_version}.tar.gz")
+      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|
@@ -172,19 +193,15 @@ if ext_config = Configuration.for_if_exist?('extension') then
 
       puts "extracting..."
       upstream_files = %w[ sqlite3.h sqlite3.c sqlite3ext.h ]
-      Zlib::GzipReader.open( file ) do |tgz|
-        Archive::Tar::Minitar::Reader.open( tgz ) do |tar|
-          tar.each_entry do |entry|
-            bname = File.basename( entry.full_name )
-            if upstream_files.include?( bname ) then
-              dest_file = File.join( "ext", "amalgalite", bname )
-              puts "updating #{ dest_file }"
-              File.open( dest_file, "wb" ) do |df|
-                while bytes = entry.read do
-                  df.write bytes
-                end
-              end
-            end
+      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", bname )
+            puts "updating #{dest_file}"
+            entry.extract( dest_file ) { true }
           end
         end
       end

data/tasks/rspec.rake

@@ -10,19 +10,16 @@ if spec_config = Configuration.for_if_exist?("test") then
 
       task :default => :spec
 
-      require 'spec/rake/spectask'
-      rs = Spec::Rake::SpecTask.new do |r| 
+      require 'rspec/core/rake_task'
+      rs = RSpec::Core::RakeTask.new do |r|
         r.ruby_opts   = spec_config.ruby_opts 
-        r.libs        = [ Amalgalite::Paths.lib_path, 
-                          Amalgalite::Paths.ext_path,
-                          Amalgalite::Paths.root_dir ]
-        r.spec_files  = spec_config.files 
-        r.spec_opts   = spec_config.options
-        #r.warning     = true
+        #r.rspec_path  = [ Amalgalite::Paths.lib_path, 
+                          #Amalgalite::Paths.ext_path,
+                          #Amalgalite::Paths.root_dir ]
+        r.rspec_opts  = spec_config.options
 
         if rcov_config = Configuration.for_if_exist?('rcov') then
-          r.rcov      = true
-          r.rcov_dir  = rcov_config.output_dir
+          r.rcov      = false
           r.rcov_opts = rcov_config.rcov_opts
         end
       end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: amalgalite
 version: !ruby/object:Gem::Version 
-  hash: 35
   prerelease: false
   segments: 
+  - 1
   - 0
-  - 15
   - 0
-  version: 0.15.0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Jeremy Hinegardner
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-30 00:00:00 -06:00
+date: 2011-01-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +25,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 35
         segments: 
         - 4
         - 7
-        - 0
-        version: 4.7.0
+        - 4
+        version: 4.7.4
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -42,12 +40,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
         segments: 
         - 1
         - 5
-        - 3
-        version: 1.5.3
+        - 4
+        version: 1.5.4
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -58,12 +55,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 55
         segments: 
         - 0
         - 8
-        - 4
-        version: 0.8.4
+        - 7
+        version: 0.8.7
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -74,12 +70,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
         segments: 
+        - 1
+        - 2
         - 0
-        - 0
-        - 5
-        version: 0.0.5
+        version: 1.2.0
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -90,12 +85,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
         segments: 
-        - 1
-        - 2
         - 2
-        version: 1.2.2
+        - 4
+        - 0
+        version: 2.4.0
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -106,28 +100,26 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
         segments: 
         - 0
+        - 7
         - 5
-        - 0
-        version: 0.5.0
+        version: 0.7.5
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: archive-tar-minitar
+  name: zip
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
+        - 2
         - 0
-        - 5
         - 2
-        version: 0.5.2
+        version: 2.0.2
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
@@ -138,14 +130,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 63
         segments: 
         - 0
-        - 8
-        - 1
-        - 2
-        - 0
-        version: 0.8.1.2.0
+        - 9
+        - 9
+        version: 0.9.9
   type: :development
   version_requirements: *id008
 description: |-
@@ -173,8 +162,8 @@ executables:
 extensions: 
 - ext/amalgalite/extconf.rb
 extra_rdoc_files: 
-- README
-- HISTORY
+- README.rdoc
+- HISTORY.rdoc
 - LICENSE
 - lib/amalgalite/aggregate.rb
 - lib/amalgalite/blob.rb
@@ -232,6 +221,7 @@ files:
 - examples/bootstrap.rb
 - examples/define_aggregate.rb
 - examples/define_function.rb
+- examples/filestore.db
 - examples/gem-db.rb
 - examples/gems.db
 - examples/require_me.rb
@@ -305,15 +295,14 @@ files:
 - spec/data/iso-3166-country.txt
 - spec/data/iso-3166-subcountry.txt
 - spec/data/make-iso-db.sh
-- README
-- HISTORY
+- README.rdoc
+- HISTORY.rdoc
 - LICENSE
 - tasks/announce.rake
 - tasks/distribution.rake
 - tasks/documentation.rake
 - tasks/extension.rake
 - tasks/rspec.rake
-- tasks/rubyforge.rake
 - tasks/config.rb
 - tasks/utils.rb
 - gemspec.rb
@@ -324,7 +313,7 @@ licenses: []
 post_install_message: 
 rdoc_options: 
 - --main
-- README
+- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -332,7 +321,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -341,7 +329,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"