Skip to content

Commit

Permalink
fix requires
Browse files Browse the repository at this point in the history
20080620063610-2f820-90797d1366c43fa2cf7b195e4a812255eab85480.gz
  • Loading branch information
copiousfreetime authored and git-darcs-import committed Jun 21, 2008
1 parent 2cccaf5 commit 7fc5955
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 8 deletions.
2 changes: 2 additions & 0 deletions README
Expand Up @@ -6,6 +6,8 @@

== DESCRIPTION

Amalgalite is an SQLite ruby extension that includes the SQLite database engine.

== FEATURES

== SYNOPSIS
Expand Down
2 changes: 2 additions & 0 deletions gemspec.rb
Expand Up @@ -27,6 +27,8 @@

if ext_conf = Configuration.for_if_exist?("extension") then
spec.extensions << ext_conf.configs
spec.extensions.flatten!
spec.require_paths << "ext"
end

if rdoc = Configuration.for_if_exist?('rdoc') then
Expand Down
21 changes: 17 additions & 4 deletions lib/amalgalite.rb
Expand Up @@ -9,7 +9,20 @@ module Amalgalite
#
class Error < ::StandardError; end
end
require 'amalgalite/version'
require 'amalgalite/sqlite3'
require 'amalgalite/paths'
require 'amalgalite/database'
%w[ blob
boolean
column
database
index
paths
profile_tap
schema
sqlite3
statement
table
trace_tap
type_map
version
view].each do |lib|
require "amalgalite/#{lib}"
end
1 change: 1 addition & 0 deletions lib/amalgalite/sqlite3.rb
@@ -1,3 +1,4 @@
require 'amalgalite3'
require 'amalgalite/version'
require 'amalgalite/sqlite3/version'
require 'amalgalite/sqlite3/constants'
4 changes: 2 additions & 2 deletions lib/amalgalite/statement.rb
Expand Up @@ -4,9 +4,9 @@
#++
#
require 'amalgalite3'
require 'amalgalite/blob'
require 'date'
require 'arrayfields'
require 'ostruct'

module Amalgalite
class Statement
Expand Down Expand Up @@ -249,7 +249,7 @@ def result_meta
unless @result_meta
meta = []
column_count.times do |idx|
column_meta = OpenStruct.new
column_meta = ::OpenStruct.new
column_meta.name = @stmt_api.column_name( idx )

db_name = @stmt_api.column_database_name( idx )
Expand Down
6 changes: 4 additions & 2 deletions tasks/config.rb
Expand Up @@ -27,16 +27,18 @@
proj_conf = Configuration.for('project')
files {
bin FileList["bin/*"]
ext FileList["ext/**/*"]
ext FileList["ext/*.{c,h,rb}"]
lib FileList["lib/**/*.rb"]
test FileList["spec/**/*.rb", "test/**/*.rb"]
data FileList["data/**/*"]
tasks FileList["tasks/**/*.r{ake,b}"]
rdoc FileList[proj_conf.readme, proj_conf.history,
proj_conf.license] + lib + FileList["ext/amalgalite3*.c"]
all bin + lib + test + data + rdoc + tasks
all bin + ext + lib + test + data + rdoc + tasks
}

puts "ext files = #{files.ext}"

# ways to package the results
formats {
tgz true
Expand Down

0 comments on commit 7fc5955

Please sign in to comment.