lib/thinking_sphinx/tasks.rb tasks/distribution.rb tasks/rails.rake tasks/testing.rb @@ -1,147 +1,4 @@ -begin - require 'spec' -rescue LoadError - require 'rubygems' - require 'spec' -end +require 'rubygems' -require 'rake/rdoctask' -require 'spec/rake/spectask' -require 'rake/gempackagetask' -require 'cucumber/rake/task' - -# allow require of spec/spec_helper -$LOAD_PATH.unshift File.dirname(__FILE__) + '/../' -$LOAD_PATH.unshift File.dirname(__FILE__) + '/lib' - -require 'thinking_sphinx' - -desc 'Generate documentation' -Rake::RDocTask.new(:rdoc) do |rdoc| - rdoc.rdoc_dir = 'rdoc' - rdoc.title = 'Thinking Sphinx - ActiveRecord Sphinx Plugin' - rdoc.options << '--line-numbers' << '--inline-source' - rdoc.rdoc_files.include('README') - rdoc.rdoc_files.include('lib/**/*.rb') -end - -desc "Run the specs under spec" -Spec::Rake::SpecTask.new do |t| - t.spec_files = FileList['spec/**/*_spec.rb'] - t.spec_opts << "-c" -end - -desc "Run all feature-set configurations" -task :features do - # -end - -task :features do |t| - puts "rake features:mysql" - system "rake features:mysql" - puts "rake features:postgresql" - system "rake features:postgresql" -end - -namespace :features do - def add_task(name, description) - Cucumber::Rake::Task.new(name, description) do |t| - t.cucumber_opts = "--format pretty" - t.step_pattern = [ - "features/support/env", - "features/support/db/#{name}", - "features/support/db/active_record", - "features/support/post_database", - "features/step_definitions/**.rb" - ] - end - end - - add_task :mysql, "Run feature-set against MySQL" - add_task :postgresql, "Run feature-set against PostgreSQL" -end - -desc "Generate RCov reports" -Spec::Rake::SpecTask.new(:rcov) do |t| - t.libs << 'lib' - t.spec_files = FileList['spec/**/*_spec.rb'] - t.rcov = true - t.rcov_opts = ['--exclude', 'spec', '--exclude', 'gems', '--exclude', 'riddle'] -end - -namespace :rcov do - def add_task(name, description) - Cucumber::Rake::Task.new(name, description) do |t| - t.cucumber_opts = "--format pretty" - t.step_pattern = [ - "features/support/env", - "features/support/db/#{name}", - "features/support/db/active_record", - "features/support/post_database", - "features/step_definitions/**.rb" - ] - t.rcov = true - t.rcov_opts = [ - '--exclude', 'spec', - '--exclude', 'gems', - '--exclude', 'riddle', - '--exclude', 'features' - ] - end - end - - add_task :mysql, "Run feature-set against MySQL with rcov" - add_task :postgresql, "Run feature-set against PostgreSQL with rcov" -end - -spec = Gem::Specification.new do |s| - s.name = "thinking-sphinx" - s.version = ThinkingSphinx::Version::String - s.summary = "A concise and easy-to-use Ruby library that connects ActiveRecord to the Sphinx search daemon, managing configuration, indexing and searching." - s.description = "A concise and easy-to-use Ruby library that connects ActiveRecord to the Sphinx search daemon, managing configuration, indexing and searching." - s.author = "Pat Allan" - s.email = "pat@freelancing-gods.com" - s.homepage = "http://ts.freelancing-gods.com" - s.has_rdoc = true - s.rdoc_options << "--title" << "Thinking Sphinx -- Rails/Merb Sphinx Plugin" << - "--line-numbers" - s.rubyforge_project = "thinking-sphinx" - s.test_files = FileList["spec/**/*_spec.rb"] - s.files = FileList[ - "lib/**/*.rb", - "LICENCE", - "README", - "tasks/**/*.rb", - "tasks/**/*.rake", - "vendor/**/*" - ] -end - -Rake::GemPackageTask.new(spec) do |p| - p.gem_spec = spec - p.need_tar = true - p.need_zip = true -end - -desc "Build gemspec file" -task :build do - File.open('thinking-sphinx.gemspec', 'w') { |f| f.write spec.to_ruby } -end - -desc "Build cucumber.yml file" -task :cucumber_defaults do - default_requires = %w( - --require features/support/env.rb - --require features/support/db/mysql.rb - --require features/support/db/active_record.rb - --require features/support/post_database.rb - ).join(" ") - - step_definitions = FileList["features/step_definitions/**.rb"].collect { |path| - "--require #{path}" - }.join(" ") - - File.open('cucumber.yml', 'w') { |f| - f.write "default: \"#{default_requires} #{step_definitions}\"" - } -end +require 'tasks/distribution' +require 'tasks/testing' \ No newline at end of file Rakefile @@ -25,14 +25,14 @@ require 'thinking_sphinx/adapters/postgresql_adapter' ActiveRecord::Base.send(:include, ThinkingSphinx::ActiveRecord) Merb::Plugins.add_rakefiles( - File.join(File.dirname(__FILE__), "..", "tasks", "thinking_sphinx_tasks") + File.join(File.dirname(__FILE__), "thinking_sphinx", "tasks") ) if defined?(Merb) module ThinkingSphinx module Version #:nodoc: Major = 1 Minor = 1 - Tiny = 2 + Tiny = 3 String = [Major, Minor, Tiny].join('.') end lib/thinking_sphinx.rb @@ -2,14 +2,14 @@ Gem::Specification.new do |s| s.name = %q{thinking-sphinx} - s.version = "1.1.2" + s.version = "1.1.3" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Pat Allan"] - s.date = %q{2009-01-08} + s.date = %q{2009-01-17} s.description = %q{A concise and easy-to-use Ruby library that connects ActiveRecord to the Sphinx search daemon, managing configuration, indexing and searching.} s.email = %q{pat@freelancing-gods.com} - s.files = ["lib/thinking_sphinx/active_record/delta.rb", "lib/thinking_sphinx/active_record/has_many_association.rb", "lib/thinking_sphinx/active_record/search.rb", "lib/thinking_sphinx/active_record.rb", "lib/thinking_sphinx/adapters/abstract_adapter.rb", "lib/thinking_sphinx/adapters/mysql_adapter.rb", "lib/thinking_sphinx/adapters/postgresql_adapter.rb", "lib/thinking_sphinx/association.rb", "lib/thinking_sphinx/attribute.rb", "lib/thinking_sphinx/collection.rb", "lib/thinking_sphinx/configuration.rb", "lib/thinking_sphinx/deltas/datetime_delta.rb", "lib/thinking_sphinx/deltas/default_delta.rb", "lib/thinking_sphinx/deltas/delayed_delta/delta_job.rb", "lib/thinking_sphinx/deltas/delayed_delta/flag_as_deleted_job.rb", "lib/thinking_sphinx/deltas/delayed_delta/job.rb", "lib/thinking_sphinx/deltas/delayed_delta.rb", "lib/thinking_sphinx/deltas.rb", "lib/thinking_sphinx/field.rb", "lib/thinking_sphinx/index/builder.rb", "lib/thinking_sphinx/index/faux_column.rb", "lib/thinking_sphinx/index.rb", "lib/thinking_sphinx/rails_additions.rb", "lib/thinking_sphinx/search.rb", "lib/thinking_sphinx.rb", "LICENCE", "README", "tasks/thinking_sphinx_tasks.rb", "tasks/thinking_sphinx_tasks.rake", "vendor/after_commit", "vendor/after_commit/init.rb", "vendor/after_commit/lib", "vendor/after_commit/lib/after_commit", "vendor/after_commit/lib/after_commit/active_record.rb", "vendor/after_commit/lib/after_commit/connection_adapters.rb", "vendor/after_commit/lib/after_commit.rb", "vendor/after_commit/LICENSE", "vendor/after_commit/Rakefile", "vendor/after_commit/README", "vendor/after_commit/test", "vendor/after_commit/test/after_commit_test.rb", "vendor/delayed_job", "vendor/delayed_job/lib", "vendor/delayed_job/lib/delayed", "vendor/delayed_job/lib/delayed/job.rb", "vendor/delayed_job/lib/delayed/message_sending.rb", "vendor/delayed_job/lib/delayed/performable_method.rb", "vendor/delayed_job/lib/delayed/worker.rb", "vendor/riddle", "vendor/riddle/lib", "vendor/riddle/lib/riddle", "vendor/riddle/lib/riddle/client", "vendor/riddle/lib/riddle/client/filter.rb", "vendor/riddle/lib/riddle/client/message.rb", "vendor/riddle/lib/riddle/client/response.rb", "vendor/riddle/lib/riddle/client.rb", "vendor/riddle/lib/riddle/configuration", "vendor/riddle/lib/riddle/configuration/distributed_index.rb", "vendor/riddle/lib/riddle/configuration/index.rb", "vendor/riddle/lib/riddle/configuration/indexer.rb", "vendor/riddle/lib/riddle/configuration/remote_index.rb", "vendor/riddle/lib/riddle/configuration/searchd.rb", "vendor/riddle/lib/riddle/configuration/section.rb", "vendor/riddle/lib/riddle/configuration/source.rb", "vendor/riddle/lib/riddle/configuration/sql_source.rb", "vendor/riddle/lib/riddle/configuration/xml_source.rb", "vendor/riddle/lib/riddle/configuration.rb", "vendor/riddle/lib/riddle/controller.rb", "vendor/riddle/lib/riddle.rb", "spec/unit/thinking_sphinx/active_record/delta_spec.rb", "spec/unit/thinking_sphinx/active_record/has_many_association_spec.rb", "spec/unit/thinking_sphinx/active_record/search_spec.rb", "spec/unit/thinking_sphinx/active_record_spec.rb", "spec/unit/thinking_sphinx/association_spec.rb", "spec/unit/thinking_sphinx/attribute_spec.rb", "spec/unit/thinking_sphinx/collection_spec.rb", "spec/unit/thinking_sphinx/configuration_spec.rb", "spec/unit/thinking_sphinx/field_spec.rb", "spec/unit/thinking_sphinx/index/builder_spec.rb", "spec/unit/thinking_sphinx/index/faux_column_spec.rb", "spec/unit/thinking_sphinx/index_spec.rb", "spec/unit/thinking_sphinx/search_spec.rb", "spec/unit/thinking_sphinx_spec.rb"] + s.files = ["lib/thinking_sphinx/active_record/delta.rb", "lib/thinking_sphinx/active_record/has_many_association.rb", "lib/thinking_sphinx/active_record/search.rb", "lib/thinking_sphinx/active_record.rb", "lib/thinking_sphinx/adapters/abstract_adapter.rb", "lib/thinking_sphinx/adapters/mysql_adapter.rb", "lib/thinking_sphinx/adapters/postgresql_adapter.rb", "lib/thinking_sphinx/association.rb", "lib/thinking_sphinx/attribute.rb", "lib/thinking_sphinx/collection.rb", "lib/thinking_sphinx/configuration.rb", "lib/thinking_sphinx/core/string.rb", "lib/thinking_sphinx/deltas/datetime_delta.rb", "lib/thinking_sphinx/deltas/default_delta.rb", "lib/thinking_sphinx/deltas/delayed_delta/delta_job.rb", "lib/thinking_sphinx/deltas/delayed_delta/flag_as_deleted_job.rb", "lib/thinking_sphinx/deltas/delayed_delta/job.rb", "lib/thinking_sphinx/deltas/delayed_delta.rb", "lib/thinking_sphinx/deltas.rb", "lib/thinking_sphinx/field.rb", "lib/thinking_sphinx/index/builder.rb", "lib/thinking_sphinx/index/faux_column.rb", "lib/thinking_sphinx/index.rb", "lib/thinking_sphinx/rails_additions.rb", "lib/thinking_sphinx/search.rb", "lib/thinking_sphinx.rb", "LICENCE", "README", "tasks/distribution.rb", "tasks/testing.rb", "tasks/thinking_sphinx_tasks.rb", "tasks/thinking_sphinx_tasks.rake", "vendor/after_commit", "vendor/after_commit/init.rb", "vendor/after_commit/lib", "vendor/after_commit/lib/after_commit", "vendor/after_commit/lib/after_commit/active_record.rb", "vendor/after_commit/lib/after_commit/connection_adapters.rb", "vendor/after_commit/lib/after_commit.rb", "vendor/after_commit/LICENSE", "vendor/after_commit/Rakefile", "vendor/after_commit/README", "vendor/after_commit/test", "vendor/after_commit/test/after_commit_test.rb", "vendor/delayed_job", "vendor/delayed_job/lib", "vendor/delayed_job/lib/delayed", "vendor/delayed_job/lib/delayed/job.rb", "vendor/delayed_job/lib/delayed/message_sending.rb", "vendor/delayed_job/lib/delayed/performable_method.rb", "vendor/delayed_job/lib/delayed/worker.rb", "vendor/riddle", "vendor/riddle/lib", "vendor/riddle/lib/riddle", "vendor/riddle/lib/riddle/client", "vendor/riddle/lib/riddle/client/filter.rb", "vendor/riddle/lib/riddle/client/message.rb", "vendor/riddle/lib/riddle/client/response.rb", "vendor/riddle/lib/riddle/client.rb", "vendor/riddle/lib/riddle/configuration", "vendor/riddle/lib/riddle/configuration/distributed_index.rb", "vendor/riddle/lib/riddle/configuration/index.rb", "vendor/riddle/lib/riddle/configuration/indexer.rb", "vendor/riddle/lib/riddle/configuration/remote_index.rb", "vendor/riddle/lib/riddle/configuration/searchd.rb", "vendor/riddle/lib/riddle/configuration/section.rb", "vendor/riddle/lib/riddle/configuration/source.rb", "vendor/riddle/lib/riddle/configuration/sql_source.rb", "vendor/riddle/lib/riddle/configuration/xml_source.rb", "vendor/riddle/lib/riddle/configuration.rb", "vendor/riddle/lib/riddle/controller.rb", "vendor/riddle/lib/riddle.rb", "spec/unit/thinking_sphinx/active_record/delta_spec.rb", "spec/unit/thinking_sphinx/active_record/has_many_association_spec.rb", "spec/unit/thinking_sphinx/active_record/search_spec.rb", "spec/unit/thinking_sphinx/active_record_spec.rb", "spec/unit/thinking_sphinx/association_spec.rb", "spec/unit/thinking_sphinx/attribute_spec.rb", "spec/unit/thinking_sphinx/collection_spec.rb", "spec/unit/thinking_sphinx/configuration_spec.rb", "spec/unit/thinking_sphinx/core/string_spec.rb", "spec/unit/thinking_sphinx/field_spec.rb", "spec/unit/thinking_sphinx/index/builder_spec.rb", "spec/unit/thinking_sphinx/index/faux_column_spec.rb", "spec/unit/thinking_sphinx/index_spec.rb", "spec/unit/thinking_sphinx/search_spec.rb", "spec/unit/thinking_sphinx_spec.rb"] s.has_rdoc = true s.homepage = %q{http://ts.freelancing-gods.com} s.rdoc_options = ["--title", "Thinking Sphinx -- Rails/Merb Sphinx Plugin", "--line-numbers"] @@ -17,7 +17,7 @@ Gem::Specification.new do |s| s.rubyforge_project = %q{thinking-sphinx} s.rubygems_version = %q{1.3.0} s.summary = %q{A concise and easy-to-use Ruby library that connects ActiveRecord to the Sphinx search daemon, managing configuration, indexing and searching.} - s.test_files = ["spec/unit/thinking_sphinx/active_record/delta_spec.rb", "spec/unit/thinking_sphinx/active_record/has_many_association_spec.rb", "spec/unit/thinking_sphinx/active_record/search_spec.rb", "spec/unit/thinking_sphinx/active_record_spec.rb", "spec/unit/thinking_sphinx/association_spec.rb", "spec/unit/thinking_sphinx/attribute_spec.rb", "spec/unit/thinking_sphinx/collection_spec.rb", "spec/unit/thinking_sphinx/configuration_spec.rb", "spec/unit/thinking_sphinx/field_spec.rb", "spec/unit/thinking_sphinx/index/builder_spec.rb", "spec/unit/thinking_sphinx/index/faux_column_spec.rb", "spec/unit/thinking_sphinx/index_spec.rb", "spec/unit/thinking_sphinx/search_spec.rb", "spec/unit/thinking_sphinx_spec.rb"] + s.test_files = ["spec/unit/thinking_sphinx/active_record/delta_spec.rb", "spec/unit/thinking_sphinx/active_record/has_many_association_spec.rb", "spec/unit/thinking_sphinx/active_record/search_spec.rb", "spec/unit/thinking_sphinx/active_record_spec.rb", "spec/unit/thinking_sphinx/association_spec.rb", "spec/unit/thinking_sphinx/attribute_spec.rb", "spec/unit/thinking_sphinx/collection_spec.rb", "spec/unit/thinking_sphinx/configuration_spec.rb", "spec/unit/thinking_sphinx/core/string_spec.rb", "spec/unit/thinking_sphinx/field_spec.rb", "spec/unit/thinking_sphinx/index/builder_spec.rb", "spec/unit/thinking_sphinx/index/faux_column_spec.rb", "spec/unit/thinking_sphinx/index_spec.rb", "spec/unit/thinking_sphinx/search_spec.rb", "spec/unit/thinking_sphinx_spec.rb"] if s.respond_to? :specification_version then current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION thinking-sphinx.gemspec tasks/thinking_sphinx_tasks.rake tasks/thinking_sphinx_tasks.rb 10f2b96139953cb4cadb26821e6e5e658ebee168 Pat Allan pat@freelancing-gods.com http://github.com/methodmissing/thinking-sphinx/commit/6531f2879f270a04ac4fc43817b2faa3635553df 6531f2879f270a04ac4fc43817b2faa3635553df 2009-01-16T22:46:14-08:00 2009-01-16T22:46:14-08:00 Neatening up public and dev rake tasks - influenced by a patch from Ryan Bates 88ee6e9f50c0afc4984ce281ddcc05020096afc8 Pat Allan pat@freelancing-gods.com