spec/packer_spec.rb @@ -74,8 +74,8 @@ begin if options[:self] then - options[:table_name] = Amalgalite::Requires::Bootstrap::DEFAULT_TABLE - core_libs = (amalgalite_needs - Amalgalite::Requires.require_order).delete_if { |l| l.index(".rb").nil? } + options[:table_name] = Amalgalite::Requires::Bootstrap::DEFAULT_BOOTSTRAP_TABLE + core_libs = (amalgalite_needs - Amalgalite::Packer.amalgalite_require_order).delete_if { |l| l.index(".rb").nil? } # # check and make sure nothing is missed @@ -83,11 +83,10 @@ begin core_libs.each do |l| if l.index("malgalite") then STDERR.puts "ERROR! require_order needs an update #{l}" - STDERR.puts "Tell jeremy he needs to run rake test:check_requires and fix" exit 2 end end - file_list = core_libs.concat( Amalgalite::Requires.require_order ) + file_list = core_libs.concat( Amalgalite::Packer.amalgalite_require_order ) if options[:compressed] then STDERR.puts "Compressing --self is not allowed, reverting to uncompressed" options[:compressed] = false bin/amalgalite-pack @@ -20,7 +20,7 @@ require 'rubygems' $: << "../lib" $: << "../ext" require 'amalgalite' -require 'amalgalite/requires' +require 'amalgalite/packer' VALID_ACTIONS = %w[ list retrieve store ] def usage STDERR.puts "Usage: #{File.basename($0)} ( #{VALID_ACTIONS.join(' | ')} ) file(s)" @@ -66,7 +66,7 @@ when 'store' require 'amalgalite/packer' packer = Amalgalite::Packer.new( :dbfile => 'filestore.db', - :compressed => true ) + :compressed => false ) packer.pack( file_list ) # @@ -79,7 +79,7 @@ when 'retrieve' STDERR.puts "Dumping #{row['filename']} to stdout" if row['compressed'] then s = row['contents'].to_s - STDOUT.puts Amalgalite::Requires.gunzip( s ) + STDOUT.puts Amalgalite::Packer.gunzip( s ) else row['contents'].write_to_io( STDOUT ) end examples/blob.rb @@ -22,10 +22,10 @@ puts "Before $\" : #{$".inspect}" # table 'files' orderd by column 'id'. The 'path' column is added to $" and the # code in 'data' is evaled. Amalgalite::Requires::Bootstrap.lift( "dbfile" => "filestore.db", - "table_name" => "files", + "table_name" => "rubylibs", "rowid_column" => "id", - "filename_column" => "path", - "contents_column" => "data" ) + "filename_column" => "filename", + "contents_column" => "contents" ) # Notice that a.rb is in the list of files that has been required puts "After $\" : #{$".inspect}" examples/bootstrap.rb @@ -1,3 +1,4 @@ +CONSTANT = "bad" class RequireMe def initialize( msg ) @msg = msg examples/require_me.rb @@ -11,7 +11,7 @@ $: << "../ext" require 'rubygems' require 'amalgalite' -style = ARGV.shift +style = ARGV.shift || "normal" # # create the database @@ -19,7 +19,7 @@ style = ARGV.shift dbfile = Amalgalite::Requires::Bootstrap::DEFAULT_DB File.unlink( dbfile ) if File.exist?( dbfile ) require 'amalgalite/packer' -options = {} +options = { :verbose => true } if style == "compressed" then options[:compressed] = true end @@ -27,12 +27,16 @@ p = Amalgalite::Packer.new( options ) p.pack( [ "require_me.rb" ] ) require 'amalgalite/requires' -Amalgalite::Requires.new( :dbfile_name => p.dbfile ) -FileUtils.mv 'require_me.rb', 'rm.rb' -require 'require_me' -e = RequireMe.new( "#{style} style works!" ) -e.foo -require 'require_me' +begin + Amalgalite::Requires.new( :dbfile_name => p.dbfile ) + FileUtils.mv 'require_me.rb', 'rm.rb', :verbose => true + require 'require_me' + e = RequireMe.new( "#{style} require style works!" ) + e.foo + require 'require_me' + puts -puts -FileUtils.mv 'rm.rb', 'require_me.rb' +ensure + FileUtils.mv 'rm.rb', 'require_me.rb', :verbose => true + File.unlink( dbfile ) if File.exist?( dbfile ) +end examples/requires.rb @@ -69,11 +69,11 @@ VALUE am_bootstrap_lift( VALUE self, VALUE args ) int last_row_good; char raise_msg[BUFSIZ]; - VALUE am_db_c = rb_const_get( cARB, rb_intern("DEFAULT_DB") ); - VALUE am_tbl_c = rb_const_get( cARB, rb_intern("DEFAULT_TABLE") ); - VALUE am_pk_c = rb_const_get( cARB, rb_intern("DEFAULT_ROWID_COLUMN") ); - VALUE am_fname_c = rb_const_get( cARB, rb_intern("DEFAULT_FILENAME_COLUMN") ); - VALUE am_content_c = rb_const_get( cARB, rb_intern("DEFAULT_CONTENTS_COLUMN") ); + VALUE am_db_c = rb_const_get( cARB, rb_intern("DEFAULT_DB") ); + VALUE am_tbl_c = rb_const_get( cARB, rb_intern("DEFAULT_BOOTSTRAP_TABLE") ); + VALUE am_pk_c = rb_const_get( cARB, rb_intern("DEFAULT_ROWID_COLUMN") ); + VALUE am_fname_c = rb_const_get( cARB, rb_intern("DEFAULT_FILENAME_COLUMN") ); + VALUE am_content_c = rb_const_get( cARB, rb_intern("DEFAULT_CONTENTS_COLUMN") ); char* dbfile = NULL; char* tbl_name = NULL; @@ -199,11 +199,13 @@ void Init_amalgalite3_requires_bootstrap() rb_define_module_function(cARB, "lift", am_bootstrap_lift, -2); /* constants for default db, table, column, rowid, contents */ - rb_define_const(cARB, "DEFAULT_DB", rb_str_new2( "lib.db" )); - rb_define_const(cARB, "DEFAULT_TABLE", rb_str_new2( "bootstrap" )); - rb_define_const(cARB, "DEFAULT_ROWID_COLUMN", rb_str_new2( "id" )); - rb_define_const(cARB, "DEFAULT_FILENAME_COLUMN", rb_str_new2( "filename" )); - rb_define_const(cARB, "DEFAULT_CONTENTS_COLUMN", rb_str_new2( "contents" )); + rb_define_const(cARB, "DEFAULT_DB", rb_str_new2( "lib.db" )); + rb_define_const(cARB, "DEFAULT_TABLE", rb_str_new2( "rubylibs" )); + rb_define_const(cARB, "DEFAULT_BOOTSTRAP_TABLE", rb_str_new2( "bootstrap" )); + rb_define_const(cARB, "DEFAULT_ROWID_COLUMN", rb_str_new2( "id" )); + rb_define_const(cARB, "DEFAULT_FILENAME_COLUMN", rb_str_new2( "filename" )); + rb_define_const(cARB, "DEFAULT_CONTENTS_COLUMN", rb_str_new2( "contents" )); + rb_define_const(cARB, "DEFAULT_COMPRESSED_COLUMN", rb_str_new2( "compressed" )); return; } ext/amalgalite3_requires_bootstrap.c @@ -1,6 +1,9 @@ require 'optparse' require 'ostruct' -require 'amalgalite/requires' +require 'pathname' +require 'zlib' + +require 'amalgalite' module Amalgalite # # Pack items into an amalgalite database. @@ -13,23 +16,82 @@ module Amalgalite class << self def default_options { - :table_name => Requires.default_table_name, - :filename_column => Requires.default_filename_column, - :contents_column => Requires.default_contents_column, - :compressed_column => Requires.default_compressed_column, + :table_name => Requires::Bootstrap::DEFAULT_TABLE, + :filename_column => Requires::Bootstrap::DEFAULT_FILENAME_COLUMN, + :contents_column => Requires::Bootstrap::DEFAULT_CONTENTS_COLUMN, + :compressed_column => Requires::Bootstrap::DEFAULT_COMPRESSED_COLUMN, :strip_prefix => Dir.pwd, :compressed => false, :verbose => false, } end + + # + # compress data + # + def gzip( data ) + zipped = StringIO.new + Zlib::GzipWriter.wrap( zipped ) do |io| + io.write( data ) + end + return zipped.string + end + + # + # uncompress gzip data + # + def gunzip( data ) + data = StringIO.new( data ) + Zlib::GzipReader.new( data ).read + end + + + # + # return the files in their dependency order for use for packing into a + # database + # + def amalgalite_require_order + @require_order ||= %w[ + amalgalite.rb + amalgalite/blob.rb + amalgalite/boolean.rb + amalgalite/column.rb + amalgalite/statement.rb + amalgalite/trace_tap.rb + amalgalite/profile_tap.rb + amalgalite/type_map.rb + amalgalite/type_maps/storage_map.rb + amalgalite/type_maps/text_map.rb + amalgalite/type_maps/default_map.rb + amalgalite/database.rb + amalgalite/index.rb + amalgalite/paths.rb + amalgalite/table.rb + amalgalite/view.rb + amalgalite/schema.rb + amalgalite/version.rb + amalgalite/sqlite3/version.rb + amalgalite/sqlite3/constants.rb + amalgalite/sqlite3/status.rb + amalgalite/sqlite3/database/status.rb + amalgalite/sqlite3.rb + amalgalite/taps/io.rb + amalgalite/taps/console.rb + amalgalite/taps.rb + amalgalite/packer.rb + amalgalite/core_ext/kernel/require.rb + amalgalite/requires.rb + ] + end end # # Create a new packer instance with the list of items to pack and all the # options + # def initialize( options = {} ) - @options = Packer.default_options.merge( options ) - @dbfile = options[:dbfile] || Amalgalite::Requires::Bootstrap::DEFAULT_DB + @options = Packer.default_options.merge( options ) + @dbfile = @options[:dbfile] || Requires::Bootstrap::DEFAULT_DB end # @@ -63,6 +125,7 @@ module Amalgalite end + # # Stores all the .rb files in the list into the given database. The prefix # is the file system path to remove from the front of the path on each file @@ -90,7 +153,7 @@ module Amalgalite contents = contents.join if options[:compressed] then - contents = Requires.gzip( contents ) + contents = Packer.gzip( contents ) end content_io = StringIO.new( contents ) stmt.execute( "$filename" => file_info.require_path, @@ -123,10 +186,10 @@ module Amalgalite # def make_manifest( file_list ) manifest = [] - prefix_path = Pathname.new( options[:strip_prefix] ) + prefix_path = ::Pathname.new( options[:strip_prefix] ) file_list.each do |f| - file_path = Pathname.new( File.expand_path( f ) ) - m = OpenStruct.new + file_path = ::Pathname.new( File.expand_path( f ) ) + m = ::OpenStruct.new # if it is a directory then grab all the .rb files from it if File.directory?( file_path ) then manifest.concat( make_manifest( Dir.glob( File.join( f, "**", "*.rb" ) ) ) ) lib/amalgalite/packer.rb @@ -1,5 +1,6 @@ require 'amalgalite' require 'pathname' +require 'zlib' module Amalgalite # @@ -14,6 +15,20 @@ module Amalgalite @load_path ||= [] end + # + # Global option to say whether to fall back to the original ruby requires + # or not + def fallback_to_ruby_requires + @fallback_to_ruby_requires ||= true + end + + # + # Set whether or not to fallback to the original ruby requires or not. + # + def fallback_to_ruby_requires=( fallback ) + @fallback_to_ruby_requires = fallback + end + def db_connection_to( dbfile_name ) unless connection = load_path_db_connections[ dbfile_name ] connection = ::Amalgalite::Database.new( dbfile_name ) @@ -31,42 +46,23 @@ module Amalgalite end def default_dbfile_name - "lib.db" + Bootstrap::DEFAULT_DB end def default_table_name - "rubylibs" + Bootstrap::DEFAULT_TABLE end def default_filename_column - "filename" + Bootstrap::DEFAULT_FILENAME_COLUMN end def default_compressed_column - "compressed" + Bootstrap::DEFAULT_COMPRESSED_COLUMN end def default_contents_column - "contents" - end - - # - # uncompress gzip data - # - def gunzip( data ) - data = StringIO.new( data ) - Zlib::GzipReader.new( data ).read - end - - # - # compress data - # - def gzip( data ) - zipped = StringIO.new - Zlib::GzipWriter.wrap( zipped ) do |io| - io.write( data ) - end - return zipped.string + Bootstrap::DEFAULT_CONTENTS_COLUMN end def require( filename ) @@ -89,44 +85,7 @@ module Amalgalite end end - # - # return the files in their dependency order for use for packing into a - # database - # - def require_order - @require_roder ||= %w[ - amalgalite.rb - amalgalite/blob.rb - amalgalite/boolean.rb - amalgalite/column.rb - amalgalite/statement.rb - amalgalite/trace_tap.rb - amalgalite/profile_tap.rb - amalgalite/type_map.rb - amalgalite/type_maps/storage_map.rb - amalgalite/type_maps/text_map.rb - amalgalite/type_maps/default_map.rb - amalgalite/database.rb - amalgalite/index.rb - amalgalite/paths.rb - amalgalite/table.rb - amalgalite/view.rb - amalgalite/schema.rb - amalgalite/version.rb - amalgalite/sqlite3/version.rb - amalgalite/sqlite3/constants.rb - amalgalite/sqlite3/status.rb - amalgalite/sqlite3/database/status.rb - amalgalite/sqlite3.rb - amalgalite/taps/io.rb - amalgalite/taps/console.rb - amalgalite/taps.rb - amalgalite/core_ext/kernel/require.rb - amalgalite/requires.rb - amalgalite/packer.rb - ] - end - end + end attr_reader :dbfile_name attr_reader :table_name @@ -136,11 +95,11 @@ module Amalgalite attr_reader :db_connection def initialize( opts = {} ) - @dbfile_name = opts[:dbfile_name] || Requires.default_dbfile_name - @table_name = opts[:table_name] || Requires.default_table_name - @filename_column = opts[:filename_column] || Requires.default_filename_column - @contents_column = opts[:contents_column] || Requires.default_contents_column - @compressed_column = opts[:compressed_column] || Requires.default_compressed_column + @dbfile_name = opts[:dbfile_name] || Bootstrap::DEFAULT_DB + @table_name = opts[:table_name] || Bootstrap::DEFAULT_TABLE + @filename_column = opts[:filename_column] || Bootstrap::DEFAULT_FILENAME_COLUMN + @contents_column = opts[:contents_column] || Bootstrap::DEFAULT_CONTENTS_COLUMN + @compressed_column = opts[:compressed_column] || Bootstrap::DEFAULT_COMPRESSED_COLUMN @db_connection = Requires.db_connection_to( dbfile_name ) Requires.load_path << self end lib/amalgalite/requires.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 == 3006004 + Amalgalite::SQLite3::Version.to_i.should == 3006005 Amalgalite::SQLite3::Version::MAJOR.should == 3 Amalgalite::SQLite3::Version::MINOR.should == 6 - Amalgalite::SQLite3::Version::RELEASE.should == 4 + Amalgalite::SQLite3::Version::RELEASE.should == 5 Amalgalite::SQLite3::Version.to_a.should have(3).items end end spec/sqlite3/version_spec.rb @@ -44,14 +44,14 @@ Configuration.for('packaging') { formats { tgz true zip true - gem Configuration::Table.has_key?('gem') + rubygem Configuration::Table.has_key?('rubygem') } } #----------------------------------------------------------------------- # Gem packaging #----------------------------------------------------------------------- -Configuration.for("gem") { +Configuration.for("rubygem") { spec "gemspec.rb" Configuration.for('packaging').files.all << spec } tasks/config.rb 97cbdf0edd03ec03afaebd771c63a5aa12a39088 Jeremy Hinegardner jeremy@hinegardner.org http://github.com/copiousfreetime/amalgalite/commit/9103ecebd07ee4f04fdf07c1b137bca15b7e7b83 9103ecebd07ee4f04fdf07c1b137bca15b7e7b83 2008-11-16T14:43:32-08:00 2008-11-16T14:43:32-08:00 Refactor gzip, gunzip and amalgalite require files list into packer * added DEFAULT_BOOTSTRAP_DB constant * updated examples * added packer tests b94d22a3837e340284c9e577a44d5bc29e629c8c Jeremy Hinegardner jeremy@hinegardner.org