CHANGELOG COPYING README bin/sequel doc/advanced_associations.rdoc doc/cheat_sheet.rdoc doc/dataset_filtering.rdoc lib/sequel.rb lib/sequel_core.rb lib/sequel_core/adapters/adapter_skeleton.rb lib/sequel_core/adapters/ado.rb lib/sequel_core/adapters/db2.rb lib/sequel_core/adapters/dbi.rb lib/sequel_core/adapters/informix.rb lib/sequel_core/adapters/jdbc.rb lib/sequel_core/adapters/mysql.rb lib/sequel_core/adapters/odbc.rb lib/sequel_core/adapters/odbc_mssql.rb lib/sequel_core/adapters/openbase.rb lib/sequel_core/adapters/oracle.rb lib/sequel_core/adapters/postgres.rb lib/sequel_core/adapters/sqlite.rb lib/sequel_core/connection_pool.rb lib/sequel_core/core_ext.rb lib/sequel_core/core_sql.rb lib/sequel_core/database.rb lib/sequel_core/database/schema.rb lib/sequel_core/dataset.rb lib/sequel_core/dataset/callback.rb lib/sequel_core/dataset/convenience.rb lib/sequel_core/dataset/pagination.rb lib/sequel_core/dataset/query.rb lib/sequel_core/dataset/schema.rb lib/sequel_core/dataset/sql.rb lib/sequel_core/deprecated.rb lib/sequel_core/exceptions.rb lib/sequel_core/migration.rb lib/sequel_core/object_graph.rb lib/sequel_core/pretty_table.rb lib/sequel_core/schema.rb lib/sequel_core/schema/generator.rb lib/sequel_core/schema/sql.rb lib/sequel_core/sql.rb lib/sequel_core/worker.rb lib/sequel_model.rb lib/sequel_model/association_reflection.rb lib/sequel_model/associations.rb lib/sequel_model/base.rb lib/sequel_model/caching.rb lib/sequel_model/dataset_methods.rb lib/sequel_model/eager_loading.rb lib/sequel_model/hooks.rb lib/sequel_model/inflector.rb lib/sequel_model/plugins.rb lib/sequel_model/record.rb lib/sequel_model/schema.rb lib/sequel_model/validations.rb spec/adapters/informix_spec.rb spec/adapters/mysql_spec.rb spec/adapters/oracle_spec.rb spec/adapters/postgres_spec.rb spec/adapters/spec_helper.rb spec/adapters/sqlite_spec.rb spec/rcov.opts spec/sequel_core/connection_pool_spec.rb spec/sequel_core/core_ext_spec.rb spec/sequel_core/core_sql_spec.rb spec/sequel_core/database_spec.rb spec/sequel_core/dataset_spec.rb spec/sequel_core/expression_filters_spec.rb spec/sequel_core/migration_spec.rb spec/sequel_core/object_graph_spec.rb spec/sequel_core/pretty_table_spec.rb spec/sequel_core/schema_generator_spec.rb spec/sequel_core/schema_spec.rb spec/sequel_core/spec_helper.rb spec/sequel_core/worker_spec.rb spec/sequel_model/association_reflection_spec.rb spec/sequel_model/associations_spec.rb spec/sequel_model/base_spec.rb spec/sequel_model/caching_spec.rb spec/sequel_model/dataset_methods_spec.rb spec/sequel_model/eager_loading_spec.rb spec/sequel_model/hooks_spec.rb spec/sequel_model/inflector_spec.rb spec/sequel_model/model_spec.rb spec/sequel_model/plugins_spec.rb spec/sequel_model/record_spec.rb spec/sequel_model/schema_spec.rb spec/sequel_model/spec_helper.rb spec/sequel_model/validations_spec.rb spec/spec.opts spec/spec_config.rb.example @@ -1,3 +1,3 @@ -sequel_core/spec/spec_config.rb +spec/spec_config.rb rdoc pkg .gitignore @@ -3,73 +3,73 @@ require "rake/clean" require "rake/gempackagetask" require "rake/rdoctask" require "fileutils" +require "spec/rake/spectask" include FileUtils -PROJECTS = %w{sequel_core sequel} -CLEAN.include ["rdoc", "coverage"] - -def with_each_project - PROJECTS.each do |p| - FileUtils.cd(p) - begin - yield p - ensure - FileUtils.cd('..') - end - end -end - -def sh_with_each_project(cmd) - with_each_project {sh cmd rescue nil} -end +NAME = 'sequel' +VERS = '2.2.0' +CLEAN.include ["**/.*.sw?", "pkg", ".config", "rdoc", "coverage"] +RDOC_OPTS = ["--quiet", "--line-numbers", "--inline-source", '--title', \ + 'Sequel: The Database Toolkit for Ruby', '--main', 'README'] ############################################################################## # gem packaging and release ############################################################################## -desc "Packages up sequel and sequel_core." -task :package do - sh_with_each_project "rake package" +desc "Packages sequel" +task :package=>[:clean] +spec = Gem::Specification.new do |s| + s.name = NAME + s.rubyforge_project = 'sequel' + s.version = VERS + s.platform = Gem::Platform::RUBY + s.has_rdoc = true + s.extra_rdoc_files = ["README", "CHANGELOG", "COPYING"] + Dir["doc/*.rdoc"] + s.rdoc_options += RDOC_OPTS + s.summary = "The Database Toolkit for Ruby" + s.description = s.summary + s.author = "Jeremy Evans" + s.email = "code@jeremyevans.net" + s.homepage = "http://sequel.rubyforge.org" + s.required_ruby_version = ">= 1.8.4" + s.files = %w(COPYING CHANGELOG README Rakefile) + Dir.glob("{bin,doc,spec,lib}/**/*") + s.require_path = "lib" + s.bindir = 'bin' end - -desc "Install sequel and sequel_core gems" -task :install do - sh_with_each_project "rake install" +Rake::GemPackageTask.new(spec) do |p| + p.need_tar = true + p.gem_spec = spec end -desc "Install sequel and sequel_core gems without RDoc" -task :install_no_docs do - sh_with_each_project "rake install_no_docs" +desc "Install sequel gem" +task :install=>[:package] do + sh %{sudo gem install pkg/#{NAME}-#{VERS} --local} end -desc "Uninstall sequel and sequel_core gems" -task :uninstall do - sh_with_each_project "rake uninstall" +desc "Install sequel gem without RDoc" +task :install_no_docs=>[:package] do + sh %{sudo gem install pkg/#{NAME}-#{VERS} --no-rdoc --no-ri --local} end -desc "Upload sequel and sequel_core gems to rubyforge" -task :release do - sh_with_each_project "rake release" +desc "Uninstall sequel gem" +task :uninstall=>[:clean] do + sh %{sudo gem uninstall #{NAME}} end -task :clean => [:clean_subdirs] -desc "Clean files from both subdirectories" -task :clean_subdirs do - sh_with_each_project "rake clean" +desc "Upload sequel and sequel_core gems to rubyforge" +task :release=>[:package] do + sh %{rubyforge login} + sh %{rubyforge add_release sequel #{NAME} #{VERS} pkg/#{NAME}-#{VERS}.tgz} + sh %{rubyforge add_file sequel #{NAME} #{VERS} pkg/#{NAME}-#{VERS}.gem} end ############################################################################## # rdoc ############################################################################## -RDOC_OPTS = ["--quiet", "--line-numbers", "--inline-source"] - Rake::RDocTask.new do |rdoc| rdoc.rdoc_dir = "rdoc" rdoc.options += RDOC_OPTS - rdoc.main = "sequel_core/README" - rdoc.title = "Sequel: The Database Toolkit for Ruby" - rdoc.rdoc_files.add ["sequel*/README", "sequel*/COPYING", "sequel*/lib/**/*.rb", \ - "sequel*/doc/*.rdoc"] + rdoc.rdoc_files.add %w"README CHANGELOG COPYING lib/**/*.rb doc/*.rdoc" end desc "Update docs and upload to rubyforge.org" @@ -82,25 +82,55 @@ end ############################################################################## # specs ############################################################################## -require "spec/rake/spectask" -sqcdir = File.join(File.dirname(__FILE__), 'sequel_core', 'lib') -fixRUBYLIB = Proc.new{ENV['RUBYLIB'] ? (ENV['RUBYLIB'] += ":#{sqcdir}") : (ENV['RUBYLIB'] = sqcdir)} +lib_dir = File.join(File.dirname(__FILE__), 'lib') +fixRUBYLIB = Proc.new{ENV['RUBYLIB'] ? (ENV['RUBYLIB'] += ":#{lib_dir}") : (ENV['RUBYLIB'] = lib_dir)} +sequel_core_specs = "spec/sequel_core/*_spec.rb" +sequel_model_specs = "spec/sequel_model/*_spec.rb" +spec_opts = proc{File.read("spec/spec.opts").split("\n")} +rcov_opts = proc{File.read("spec/rcov.opts").split("\n")} + +desc "Run core and model specs with coverage" +Spec::Rake::SpecTask.new("spec_coverage") do |t| + fixRUBYLIB.call + t.spec_files = FileList[sequel_core_specs, sequel_model_specs] + t.spec_opts = spec_opts.call + t.rcov_opts = rcov_opts.call + t.rcov = true +end -desc "Run specs with coverage" +desc "Run core and model specs" +task :default => [:spec] Spec::Rake::SpecTask.new("spec") do |t| fixRUBYLIB.call - t.spec_files = FileList["sequel_core/spec/*_spec.rb", "sequel/spec/*_spec.rb"] - t.spec_opts = File.read("sequel_core/spec/spec.opts").split("\n") - t.rcov_opts = File.read("sequel_core/spec/rcov.opts").split("\n") - t.rcov = true + t.spec_files = FileList[sequel_core_specs, sequel_model_specs] + t.spec_opts = spec_opts.call +end + +desc "Run core specs" +Spec::Rake::SpecTask.new("spec_core") do |t| + fixRUBYLIB.call + t.spec_files = FileList[sequel_core_specs] + t.spec_opts = spec_opts.call end -desc "Run specs without coverage" -task :default => [:spec_no_cov] -Spec::Rake::SpecTask.new("spec_no_cov") do |t| +desc "Run model specs" +Spec::Rake::SpecTask.new("spec_model") do |t| fixRUBYLIB.call - t.spec_files = FileList["sequel_core/spec/*_spec.rb", "sequel/spec/*_spec.rb"] - t.spec_opts = File.read("sequel_core/spec/spec.opts").split("\n") + t.spec_files = FileList[sequel_model_specs] + t.spec_opts = spec_opts.call +end + +%w'postgres sqlite mysql informix oracle'.each do |adapter| + desc "Run #{adapter} specs without coverage" + Spec::Rake::SpecTask.new("spec_#{adapter}") do |t| + t.spec_files = "spec/adapters/#{adapter}_spec.rb" + t.spec_opts = spec_opts.call + end +end + +desc "check documentation coverage" +task :dcov do + sh %{find lib -name '*.rb' | xargs dcov} end ############################################################################## @@ -108,10 +138,8 @@ end ############################################################################## STATS_DIRECTORIES = [ - %w(core_code sequel_core/lib/), - %w(core_spec sequel_core/spec/), - %w(model_code sequel/lib/), - %w(model_spec sequel/spec/) + %w(Code lib/), + %w(Spec spec), ].collect { |name, dir| [ name, "./#{dir}" ] }.select { |name, dir| File.directory?(dir) } desc "Report code statistics (KLOCs, etc) from the application" Rakefile sequel/CHANGELOG sequel/COPYING sequel/README sequel/Rakefile sequel/doc/advanced_associations.rdoc sequel/lib/sequel.rb sequel/lib/sequel_model.rb sequel/lib/sequel_model/association_reflection.rb sequel/lib/sequel_model/associations.rb sequel/lib/sequel_model/base.rb sequel/lib/sequel_model/caching.rb sequel/lib/sequel_model/dataset_methods.rb sequel/lib/sequel_model/eager_loading.rb sequel/lib/sequel_model/hooks.rb sequel/lib/sequel_model/inflector.rb sequel/lib/sequel_model/plugins.rb sequel/lib/sequel_model/record.rb sequel/lib/sequel_model/schema.rb sequel/lib/sequel_model/validations.rb sequel/spec/association_reflection_spec.rb sequel/spec/associations_spec.rb sequel/spec/base_spec.rb sequel/spec/caching_spec.rb sequel/spec/dataset_methods_spec.rb sequel/spec/eager_loading_spec.rb sequel/spec/hooks_spec.rb sequel/spec/inflector_spec.rb sequel/spec/model_spec.rb sequel/spec/plugins_spec.rb sequel/spec/rcov.opts sequel/spec/record_spec.rb sequel/spec/schema_spec.rb sequel/spec/spec.opts sequel/spec/spec_helper.rb sequel/spec/validations_spec.rb sequel_core/CHANGELOG sequel_core/COPYING sequel_core/README sequel_core/Rakefile sequel_core/bin/sequel sequel_core/doc/cheat_sheet.rdoc sequel_core/doc/dataset_filtering.rdoc sequel_core/lib/sequel_core.rb sequel_core/lib/sequel_core/adapters/adapter_skeleton.rb sequel_core/lib/sequel_core/adapters/ado.rb sequel_core/lib/sequel_core/adapters/db2.rb sequel_core/lib/sequel_core/adapters/dbi.rb sequel_core/lib/sequel_core/adapters/informix.rb sequel_core/lib/sequel_core/adapters/jdbc.rb sequel_core/lib/sequel_core/adapters/mysql.rb sequel_core/lib/sequel_core/adapters/odbc.rb sequel_core/lib/sequel_core/adapters/odbc_mssql.rb sequel_core/lib/sequel_core/adapters/openbase.rb sequel_core/lib/sequel_core/adapters/oracle.rb sequel_core/lib/sequel_core/adapters/postgres.rb sequel_core/lib/sequel_core/adapters/sqlite.rb sequel_core/lib/sequel_core/connection_pool.rb sequel_core/lib/sequel_core/core_ext.rb sequel_core/lib/sequel_core/core_sql.rb sequel_core/lib/sequel_core/database.rb sequel_core/lib/sequel_core/database/schema.rb sequel_core/lib/sequel_core/dataset.rb sequel_core/lib/sequel_core/dataset/callback.rb sequel_core/lib/sequel_core/dataset/convenience.rb sequel_core/lib/sequel_core/dataset/pagination.rb sequel_core/lib/sequel_core/dataset/query.rb sequel_core/lib/sequel_core/dataset/schema.rb sequel_core/lib/sequel_core/dataset/sql.rb sequel_core/lib/sequel_core/deprecated.rb sequel_core/lib/sequel_core/exceptions.rb sequel_core/lib/sequel_core/migration.rb sequel_core/lib/sequel_core/object_graph.rb sequel_core/lib/sequel_core/pretty_table.rb sequel_core/lib/sequel_core/schema.rb sequel_core/lib/sequel_core/schema/generator.rb sequel_core/lib/sequel_core/schema/sql.rb sequel_core/lib/sequel_core/sql.rb sequel_core/lib/sequel_core/worker.rb sequel_core/spec/adapters/informix_spec.rb sequel_core/spec/adapters/mysql_spec.rb sequel_core/spec/adapters/oracle_spec.rb sequel_core/spec/adapters/postgres_spec.rb sequel_core/spec/adapters/sqlite_spec.rb sequel_core/spec/connection_pool_spec.rb sequel_core/spec/core_ext_spec.rb sequel_core/spec/core_sql_spec.rb sequel_core/spec/database_spec.rb sequel_core/spec/dataset_spec.rb sequel_core/spec/expression_filters_spec.rb sequel_core/spec/migration_spec.rb sequel_core/spec/object_graph_spec.rb sequel_core/spec/pretty_table_spec.rb sequel_core/spec/rcov.opts sequel_core/spec/schema_generator_spec.rb sequel_core/spec/schema_spec.rb sequel_core/spec/spec.opts sequel_core/spec/spec_config.rb.example sequel_core/spec/spec_helper.rb sequel_core/spec/worker_spec.rb 0a5e41eb7ab8318efa3de776c6996890b75d760b Jeremy Evans code@jeremyevans.net http://github.com/jeremyevans/sequel/commit/778a032ea68193cf4c981a3177f06159fa5a1921 778a032ea68193cf4c981a3177f06159fa5a1921 2008-07-06T17:08:46-07:00 2008-07-06T17:08:46-07:00 Combine sequel and sequel_core into one gem For merging the READMEs, I put the model README at the bottom of the core README and used that. For merging the CHANGELOGs, I merged them manually back to 1.4.0, and copied the rest of the model CHANGELOG to the bottom of the file. Most of the Rakefile code was duplicative, but I think I got all tasks except spec_adapters. I figure few people have all 5 adapters necessary to run the adapter specs. I only have 3 of them, so I never used spec_adapters. The specs are still split up so they can be run independently. Additionally, the adapter specs are split off from the core specs, which helps if you want to put Sequel.connect lines in spec_config.rb. The only other spec changes were for path changes. There weren't conflicts merging anything else, IIRC. I hope there is no fallout from this. I haven't noticed any yet, running the specs and the test suites for all of my apps that use Sequel. 55b47dd3fa284cebf4277989f5edcab87be2ee9f Jeremy Evans code@jeremyevans.net