tasks/zentest.rake @@ -11,6 +11,7 @@ Tanning Bed provides a Ruby interface for the Solr (http://lucene.apache.org/sol * Incredibly simple in design, no fancy hooks * Very Ruby +* {Ruby 1.9 Compatible}[http://notch8.github.com/files/Ruby19Badge.png] == SYNOPSIS: README.rdoc @@ -56,7 +56,7 @@ module TanningBed if TanningBed.on_solr_exception TanningBed.on_solr_exception.call(e) else - $stderr.puts("SOLR - " + e) + $stderr.puts("SOLR - " + e.to_s) end end @@ -110,18 +110,18 @@ module TanningBed end def search_fields - fields = {} + @fields = {} self.solr_keys.each do |key| if self.respond_to?(key) value = self.send(key) key_type = lookup_key_type(key, value.class) - fields["#{key}#{key_type}"] = value + @fields["#{key}#{key_type}"] = value end end - fields[:search_id] = solr_id - fields[:type_t] = self.class.to_s - fields[:id_t] = self.id - return fields + @fields[:search_id] = solr_id + @fields[:type_t] = self.class.to_s + @fields[:id_t] = self.id + return @fields end def lookup_key_type(key, klass) lib/tanning_bed.rb @@ -25,7 +25,7 @@ describe "TanningBed" do end it "should enable adding a record to solr" do - @tanning.methods.include?("solr_add").should be_true + @tanning.respond_to?("solr_add").should be_true @tanning.solr_add.should be_true end @@ -50,7 +50,7 @@ describe "TanningBed" do @tanning.solr_add @burnt.solr_add result = TanningBed.solr_search("Big") - result.total_hits.should == 2 + result.total_hits.should be_equal(2) result.hits.first["search_id"].should eql(["TanningModel 666"]) result.hits.last["search_id"].should eql(["BurntModel 666"]) end @@ -59,7 +59,7 @@ describe "TanningBed" do @tanning.solr_add @burnt.solr_add result = TanningModel.solr_search("Big") - result.total_hits.should == 1 + result.total_hits.should be_equal(1) result.hits.first["search_id"].should eql(["TanningModel 666"]) end spec/tanning_bed_spec.rb @@ -6,11 +6,11 @@ Gem::Specification.new do |s| s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Rob Kaufman"] - s.date = %q{2009-01-19} + s.date = %q{2009-04-29} s.description = %q{Tanning Bed is Solr for models. Tanning Bed provides a Ruby interface for the Solr (http://lucene.apache.org/solr/) search engine to use in you're models not matter whether they are Datamapper, Active Record, Couchrest or just general Ruby classes.} s.email = %q{rob@notch8.com} - s.extra_rdoc_files = ["History.txt", "vendor/solr-ruby/test/unit/tab_delimited.txt", "vendor/solr/CHANGES.txt", "vendor/solr/LICENSE.txt", "vendor/solr/NOTICE.txt", "vendor/solr/solr/README.txt", "vendor/solr/solr/conf/protwords.txt", "vendor/solr/solr/conf/stopwords.txt", "vendor/solr/solr/conf/synonyms.txt"] - s.files = [".gitignore", "History.txt", "Manifest.txt", "README.rdoc", "Rakefile", "lib/tanning_bed.rb", "spec/fixtures/burnt_model.rb", "spec/fixtures/tanning_model.rb", "spec/spec_helper.rb", "spec/tanning_bed_spec.rb", "tanning_bed.gemspec", "tasks/ann.rake", "tasks/bones.rake", "tasks/gem.rake", "tasks/git.rake", "tasks/manifest.rake", "tasks/notes.rake", "tasks/post_load.rake", "tasks/rdoc.rake", "tasks/rubyforge.rake", "tasks/setup.rb", "tasks/solr.rake", "tasks/solr.rb", "tasks/spec.rake", "tasks/svn.rake", "tasks/test.rake", "vendor/solr-ruby/lib/solr.rb", "vendor/solr-ruby/lib/solr/connection.rb", "vendor/solr-ruby/lib/solr/document.rb", "vendor/solr-ruby/lib/solr/exception.rb", "vendor/solr-ruby/lib/solr/field.rb", "vendor/solr-ruby/lib/solr/importer.rb", "vendor/solr-ruby/lib/solr/importer/array_mapper.rb", "vendor/solr-ruby/lib/solr/importer/delimited_file_source.rb", "vendor/solr-ruby/lib/solr/importer/hpricot_mapper.rb", "vendor/solr-ruby/lib/solr/importer/mapper.rb", "vendor/solr-ruby/lib/solr/importer/solr_source.rb", "vendor/solr-ruby/lib/solr/importer/xpath_mapper.rb", "vendor/solr-ruby/lib/solr/indexer.rb", "vendor/solr-ruby/lib/solr/request.rb", "vendor/solr-ruby/lib/solr/request/add_document.rb", "vendor/solr-ruby/lib/solr/request/base.rb", "vendor/solr-ruby/lib/solr/request/commit.rb", "vendor/solr-ruby/lib/solr/request/delete.rb", "vendor/solr-ruby/lib/solr/request/dismax.rb", "vendor/solr-ruby/lib/solr/request/index_info.rb", "vendor/solr-ruby/lib/solr/request/modify_document.rb", "vendor/solr-ruby/lib/solr/request/optimize.rb", "vendor/solr-ruby/lib/solr/request/ping.rb", "vendor/solr-ruby/lib/solr/request/select.rb", "vendor/solr-ruby/lib/solr/request/spellcheck.rb", "vendor/solr-ruby/lib/solr/request/standard.rb", "vendor/solr-ruby/lib/solr/request/update.rb", "vendor/solr-ruby/lib/solr/response.rb", "vendor/solr-ruby/lib/solr/response/add_document.rb", "vendor/solr-ruby/lib/solr/response/base.rb", "vendor/solr-ruby/lib/solr/response/commit.rb", "vendor/solr-ruby/lib/solr/response/delete.rb", "vendor/solr-ruby/lib/solr/response/dismax.rb", "vendor/solr-ruby/lib/solr/response/index_info.rb", "vendor/solr-ruby/lib/solr/response/modify_document.rb", "vendor/solr-ruby/lib/solr/response/optimize.rb", "vendor/solr-ruby/lib/solr/response/ping.rb", "vendor/solr-ruby/lib/solr/response/ruby.rb", "vendor/solr-ruby/lib/solr/response/select.rb", "vendor/solr-ruby/lib/solr/response/spellcheck.rb", "vendor/solr-ruby/lib/solr/response/standard.rb", "vendor/solr-ruby/lib/solr/response/xml.rb", "vendor/solr-ruby/lib/solr/solrtasks.rb", "vendor/solr-ruby/lib/solr/util.rb", "vendor/solr-ruby/lib/solr/xml.rb", "vendor/solr-ruby/test/unit/add_document_test.rb", "vendor/solr-ruby/test/unit/array_mapper_test.rb", "vendor/solr-ruby/test/unit/changes_yaml_test.rb", "vendor/solr-ruby/test/unit/commit_test.rb", "vendor/solr-ruby/test/unit/connection_test.rb", "vendor/solr-ruby/test/unit/data_mapper_test.rb", "vendor/solr-ruby/test/unit/delete_test.rb", "vendor/solr-ruby/test/unit/delimited_file_source_test.rb", "vendor/solr-ruby/test/unit/dismax_request_test.rb", "vendor/solr-ruby/test/unit/document_test.rb", "vendor/solr-ruby/test/unit/field_test.rb", "vendor/solr-ruby/test/unit/hpricot_mapper_test.rb", "vendor/solr-ruby/test/unit/hpricot_test_file.xml", "vendor/solr-ruby/test/unit/indexer_test.rb", "vendor/solr-ruby/test/unit/modify_document_test.rb", "vendor/solr-ruby/test/unit/ping_test.rb", "vendor/solr-ruby/test/unit/request_test.rb", "vendor/solr-ruby/test/unit/response_test.rb", "vendor/solr-ruby/test/unit/select_test.rb", "vendor/solr-ruby/test/unit/solr_mock_base.rb", "vendor/solr-ruby/test/unit/spellcheck_response_test.rb", "vendor/solr-ruby/test/unit/spellchecker_request_test.rb", "vendor/solr-ruby/test/unit/standard_request_test.rb", "vendor/solr-ruby/test/unit/standard_response_test.rb", "vendor/solr-ruby/test/unit/suite.rb", "vendor/solr-ruby/test/unit/tab_delimited.txt", "vendor/solr-ruby/test/unit/util_test.rb", "vendor/solr-ruby/test/unit/xpath_mapper_test.rb", "vendor/solr-ruby/test/unit/xpath_test_file.xml", "vendor/solr/CHANGES.txt", "vendor/solr/LICENSE.txt", "vendor/solr/NOTICE.txt", "vendor/solr/etc/jetty.xml", "vendor/solr/etc/webdefault.xml", "vendor/solr/lib/commons-codec-1.3.jar", "vendor/solr/lib/commons-csv-0.1-SNAPSHOT.jar", "vendor/solr/lib/commons-fileupload-1.2.jar", "vendor/solr/lib/commons-io-1.2.jar", "vendor/solr/lib/easymock.jar", "vendor/solr/lib/jetty-6.1.3.jar", "vendor/solr/lib/jetty-util-6.1.3.jar", "vendor/solr/lib/jsp-2.1/ant-1.6.5.jar", "vendor/solr/lib/jsp-2.1/core-3.1.1.jar", "vendor/solr/lib/jsp-2.1/jsp-2.1.jar", "vendor/solr/lib/jsp-2.1/jsp-api-2.1.jar", "vendor/solr/lib/lucene-analyzers-2007-05-20_00-04-53.jar", "vendor/solr/lib/lucene-core-2007-05-20_00-04-53.jar", "vendor/solr/lib/lucene-highlighter-2007-05-20_00-04-53.jar", "vendor/solr/lib/lucene-snowball-2007-05-20_00-04-53.jar", "vendor/solr/lib/lucene-spellchecker-2007-05-20_00-04-53.jar", "vendor/solr/lib/servlet-api-2.4.jar", "vendor/solr/lib/servlet-api-2.5-6.1.3.jar", "vendor/solr/lib/xpp3-1.1.3.4.O.jar", "vendor/solr/logs/.keep", "vendor/solr/solr/README.txt", "vendor/solr/solr/bin/abc", "vendor/solr/solr/bin/abo", "vendor/solr/solr/bin/backup", "vendor/solr/solr/bin/backupcleaner", "vendor/solr/solr/bin/commit", "vendor/solr/solr/bin/optimize", "vendor/solr/solr/bin/readercycle", "vendor/solr/solr/bin/rsyncd-disable", "vendor/solr/solr/bin/rsyncd-enable", "vendor/solr/solr/bin/rsyncd-start", "vendor/solr/solr/bin/rsyncd-stop", "vendor/solr/solr/bin/scripts-util", "vendor/solr/solr/bin/snapcleaner", "vendor/solr/solr/bin/snapinstaller", "vendor/solr/solr/bin/snappuller", "vendor/solr/solr/bin/snappuller-disable", "vendor/solr/solr/bin/snappuller-enable", "vendor/solr/solr/bin/snapshooter", "vendor/solr/solr/conf/admin-extra.html", "vendor/solr/solr/conf/protwords.txt", "vendor/solr/solr/conf/schema.xml", "vendor/solr/solr/conf/scripts.conf", "vendor/solr/solr/conf/solrconfig.xml", "vendor/solr/solr/conf/stopwords.txt", "vendor/solr/solr/conf/synonyms.txt", "vendor/solr/solr/conf/xslt/example.xsl", "vendor/solr/solr/conf/xslt/example_atom.xsl", "vendor/solr/solr/conf/xslt/example_rss.xsl", "vendor/solr/start.jar", "vendor/solr/webapps/solr.war"] + s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.rdoc", "vendor/solr-ruby/test/unit/tab_delimited.txt", "vendor/solr/CHANGES.txt", "vendor/solr/LICENSE.txt", "vendor/solr/NOTICE.txt", "vendor/solr/solr/README.txt", "vendor/solr/solr/conf/protwords.txt", "vendor/solr/solr/conf/stopwords.txt", "vendor/solr/solr/conf/synonyms.txt"] + s.files = [".gitignore", "History.txt", "Manifest.txt", "README.rdoc", "Rakefile", "lib/tanning_bed.rb", "spec/fixtures/burnt_model.rb", "spec/fixtures/tanning_model.rb", "spec/spec_helper.rb", "spec/tanning_bed_spec.rb", "tasks.archive/ann.rake", "tasks.archive/bones.rake", "tasks.archive/gem.rake", "tasks.archive/git.rake", "tasks.archive/manifest.rake", "tasks.archive/notes.rake", "tasks.archive/post_load.rake", "tasks.archive/rdoc.rake", "tasks.archive/rubyforge.rake", "tasks.archive/setup.rb", "tasks.archive/solr.rake", "tasks.archive/solr.rb", "tasks.archive/spec.rake", "tasks.archive/svn.rake", "tasks.archive/test.rake", "tasks/ann.rake", "tasks/bones.rake", "tasks/gem.rake", "tasks/git.rake", "tasks/notes.rake", "tasks/post_load.rake", "tasks/rdoc.rake", "tasks/rubyforge.rake", "tasks/setup.rb", "tasks/solr.rake", "tasks/solr.rb", "tasks/spec.rake", "tasks/svn.rake", "tasks/test.rake", "tasks/zentest.rake", "vendor/solr-ruby/lib/solr.rb", "vendor/solr-ruby/lib/solr/connection.rb", "vendor/solr-ruby/lib/solr/document.rb", "vendor/solr-ruby/lib/solr/exception.rb", "vendor/solr-ruby/lib/solr/field.rb", "vendor/solr-ruby/lib/solr/importer.rb", "vendor/solr-ruby/lib/solr/importer/array_mapper.rb", "vendor/solr-ruby/lib/solr/importer/delimited_file_source.rb", "vendor/solr-ruby/lib/solr/importer/hpricot_mapper.rb", "vendor/solr-ruby/lib/solr/importer/mapper.rb", "vendor/solr-ruby/lib/solr/importer/solr_source.rb", "vendor/solr-ruby/lib/solr/importer/xpath_mapper.rb", "vendor/solr-ruby/lib/solr/indexer.rb", "vendor/solr-ruby/lib/solr/request.rb", "vendor/solr-ruby/lib/solr/request/add_document.rb", "vendor/solr-ruby/lib/solr/request/base.rb", "vendor/solr-ruby/lib/solr/request/commit.rb", "vendor/solr-ruby/lib/solr/request/delete.rb", "vendor/solr-ruby/lib/solr/request/dismax.rb", "vendor/solr-ruby/lib/solr/request/index_info.rb", "vendor/solr-ruby/lib/solr/request/modify_document.rb", "vendor/solr-ruby/lib/solr/request/optimize.rb", "vendor/solr-ruby/lib/solr/request/ping.rb", "vendor/solr-ruby/lib/solr/request/select.rb", "vendor/solr-ruby/lib/solr/request/spellcheck.rb", "vendor/solr-ruby/lib/solr/request/standard.rb", "vendor/solr-ruby/lib/solr/request/update.rb", "vendor/solr-ruby/lib/solr/response.rb", "vendor/solr-ruby/lib/solr/response/add_document.rb", "vendor/solr-ruby/lib/solr/response/base.rb", "vendor/solr-ruby/lib/solr/response/commit.rb", "vendor/solr-ruby/lib/solr/response/delete.rb", "vendor/solr-ruby/lib/solr/response/dismax.rb", "vendor/solr-ruby/lib/solr/response/index_info.rb", "vendor/solr-ruby/lib/solr/response/modify_document.rb", "vendor/solr-ruby/lib/solr/response/optimize.rb", "vendor/solr-ruby/lib/solr/response/ping.rb", "vendor/solr-ruby/lib/solr/response/ruby.rb", "vendor/solr-ruby/lib/solr/response/select.rb", "vendor/solr-ruby/lib/solr/response/spellcheck.rb", "vendor/solr-ruby/lib/solr/response/standard.rb", "vendor/solr-ruby/lib/solr/response/xml.rb", "vendor/solr-ruby/lib/solr/solrtasks.rb", "vendor/solr-ruby/lib/solr/util.rb", "vendor/solr-ruby/lib/solr/xml.rb", "vendor/solr-ruby/test/unit/add_document_test.rb", "vendor/solr-ruby/test/unit/array_mapper_test.rb", "vendor/solr-ruby/test/unit/changes_yaml_test.rb", "vendor/solr-ruby/test/unit/commit_test.rb", "vendor/solr-ruby/test/unit/connection_test.rb", "vendor/solr-ruby/test/unit/data_mapper_test.rb", "vendor/solr-ruby/test/unit/delete_test.rb", "vendor/solr-ruby/test/unit/delimited_file_source_test.rb", "vendor/solr-ruby/test/unit/dismax_request_test.rb", "vendor/solr-ruby/test/unit/document_test.rb", "vendor/solr-ruby/test/unit/field_test.rb", "vendor/solr-ruby/test/unit/hpricot_mapper_test.rb", "vendor/solr-ruby/test/unit/hpricot_test_file.xml", "vendor/solr-ruby/test/unit/indexer_test.rb", "vendor/solr-ruby/test/unit/modify_document_test.rb", "vendor/solr-ruby/test/unit/ping_test.rb", "vendor/solr-ruby/test/unit/request_test.rb", "vendor/solr-ruby/test/unit/response_test.rb", "vendor/solr-ruby/test/unit/select_test.rb", "vendor/solr-ruby/test/unit/solr_mock_base.rb", "vendor/solr-ruby/test/unit/spellcheck_response_test.rb", "vendor/solr-ruby/test/unit/spellchecker_request_test.rb", "vendor/solr-ruby/test/unit/standard_request_test.rb", "vendor/solr-ruby/test/unit/standard_response_test.rb", "vendor/solr-ruby/test/unit/suite.rb", "vendor/solr-ruby/test/unit/tab_delimited.txt", "vendor/solr-ruby/test/unit/util_test.rb", "vendor/solr-ruby/test/unit/xpath_mapper_test.rb", "vendor/solr-ruby/test/unit/xpath_test_file.xml", "vendor/solr/CHANGES.txt", "vendor/solr/LICENSE.txt", "vendor/solr/NOTICE.txt", "vendor/solr/etc/jetty.xml", "vendor/solr/etc/webdefault.xml", "vendor/solr/lib/commons-codec-1.3.jar", "vendor/solr/lib/commons-csv-0.1-SNAPSHOT.jar", "vendor/solr/lib/commons-fileupload-1.2.jar", "vendor/solr/lib/commons-io-1.2.jar", "vendor/solr/lib/easymock.jar", "vendor/solr/lib/jetty-6.1.3.jar", "vendor/solr/lib/jetty-util-6.1.3.jar", "vendor/solr/lib/jsp-2.1/ant-1.6.5.jar", "vendor/solr/lib/jsp-2.1/core-3.1.1.jar", "vendor/solr/lib/jsp-2.1/jsp-2.1.jar", "vendor/solr/lib/jsp-2.1/jsp-api-2.1.jar", "vendor/solr/lib/lucene-analyzers-2007-05-20_00-04-53.jar", "vendor/solr/lib/lucene-core-2007-05-20_00-04-53.jar", "vendor/solr/lib/lucene-highlighter-2007-05-20_00-04-53.jar", "vendor/solr/lib/lucene-snowball-2007-05-20_00-04-53.jar", "vendor/solr/lib/lucene-spellchecker-2007-05-20_00-04-53.jar", "vendor/solr/lib/servlet-api-2.4.jar", "vendor/solr/lib/servlet-api-2.5-6.1.3.jar", "vendor/solr/lib/xpp3-1.1.3.4.O.jar", "vendor/solr/logs/.keep", "vendor/solr/logs/2009_04_29.request.log", "vendor/solr/solr/README.txt", "vendor/solr/solr/bin/abc", "vendor/solr/solr/bin/abo", "vendor/solr/solr/bin/backup", "vendor/solr/solr/bin/backupcleaner", "vendor/solr/solr/bin/commit", "vendor/solr/solr/bin/optimize", "vendor/solr/solr/bin/readercycle", "vendor/solr/solr/bin/rsyncd-disable", "vendor/solr/solr/bin/rsyncd-enable", "vendor/solr/solr/bin/rsyncd-start", "vendor/solr/solr/bin/rsyncd-stop", "vendor/solr/solr/bin/scripts-util", "vendor/solr/solr/bin/snapcleaner", "vendor/solr/solr/bin/snapinstaller", "vendor/solr/solr/bin/snappuller", "vendor/solr/solr/bin/snappuller-disable", "vendor/solr/solr/bin/snappuller-enable", "vendor/solr/solr/bin/snapshooter", "vendor/solr/solr/conf/admin-extra.html", "vendor/solr/solr/conf/protwords.txt", "vendor/solr/solr/conf/schema.xml", "vendor/solr/solr/conf/scripts.conf", "vendor/solr/solr/conf/solrconfig.xml", "vendor/solr/solr/conf/stopwords.txt", "vendor/solr/solr/conf/synonyms.txt", "vendor/solr/solr/conf/xslt/example.xsl", "vendor/solr/solr/conf/xslt/example_atom.xsl", "vendor/solr/solr/conf/xslt/example_rss.xsl", "vendor/solr/solr/data/index/_32.fdt", "vendor/solr/solr/data/index/_32.fdx", "vendor/solr/solr/data/index/_32.fnm", "vendor/solr/solr/data/index/_32.frq", "vendor/solr/solr/data/index/_32.nrm", "vendor/solr/solr/data/index/_32.prx", "vendor/solr/solr/data/index/_32.tii", "vendor/solr/solr/data/index/_32.tis", "vendor/solr/solr/data/index/_32_2.del", "vendor/solr/solr/data/index/_33.fdt", "vendor/solr/solr/data/index/_33.fdx", "vendor/solr/solr/data/index/_33.fnm", "vendor/solr/solr/data/index/_33.frq", "vendor/solr/solr/data/index/_33.nrm", "vendor/solr/solr/data/index/_33.prx", "vendor/solr/solr/data/index/_33.tii", "vendor/solr/solr/data/index/_33.tis", "vendor/solr/solr/data/index/_33_1.del", "vendor/solr/solr/data/index/_34.fdt", "vendor/solr/solr/data/index/_34.fdx", "vendor/solr/solr/data/index/_34.fnm", "vendor/solr/solr/data/index/_34.frq", "vendor/solr/solr/data/index/_34.nrm", "vendor/solr/solr/data/index/_34.prx", "vendor/solr/solr/data/index/_34.tii", "vendor/solr/solr/data/index/_34.tis", "vendor/solr/solr/data/index/_34_1.del", "vendor/solr/solr/data/index/_35.fdt", "vendor/solr/solr/data/index/_35.fdx", "vendor/solr/solr/data/index/_35.fnm", "vendor/solr/solr/data/index/_35.frq", "vendor/solr/solr/data/index/_35.nrm", "vendor/solr/solr/data/index/_35.prx", "vendor/solr/solr/data/index/_35.tii", "vendor/solr/solr/data/index/_35.tis", "vendor/solr/solr/data/index/_35_1.del", "vendor/solr/solr/data/index/_36.fdt", "vendor/solr/solr/data/index/_36.fdx", "vendor/solr/solr/data/index/_36.fnm", "vendor/solr/solr/data/index/_36.frq", "vendor/solr/solr/data/index/_36.nrm", "vendor/solr/solr/data/index/_36.prx", "vendor/solr/solr/data/index/_36.tii", "vendor/solr/solr/data/index/_36.tis", "vendor/solr/solr/data/index/_36_1.del", "vendor/solr/solr/data/index/_37.fdt", "vendor/solr/solr/data/index/_37.fdx", "vendor/solr/solr/data/index/_37.fnm", "vendor/solr/solr/data/index/_37.frq", "vendor/solr/solr/data/index/_37.nrm", "vendor/solr/solr/data/index/_37.prx", "vendor/solr/solr/data/index/_37.tii", "vendor/solr/solr/data/index/_37.tis", "vendor/solr/solr/data/index/_37_1.del", "vendor/solr/solr/data/index/_38.fdt", "vendor/solr/solr/data/index/_38.fdx", "vendor/solr/solr/data/index/_38.fnm", "vendor/solr/solr/data/index/_38.frq", "vendor/solr/solr/data/index/_38.nrm", "vendor/solr/solr/data/index/_38.prx", "vendor/solr/solr/data/index/_38.tii", "vendor/solr/solr/data/index/_38.tis", "vendor/solr/solr/data/index/_38_1.del", "vendor/solr/solr/data/index/_39.fdt", "vendor/solr/solr/data/index/_39.fdx", "vendor/solr/solr/data/index/_39.fnm", "vendor/solr/solr/data/index/_39.frq", "vendor/solr/solr/data/index/_39.nrm", "vendor/solr/solr/data/index/_39.prx", "vendor/solr/solr/data/index/_39.tii", "vendor/solr/solr/data/index/_39.tis", "vendor/solr/solr/data/index/_3a.fdt", "vendor/solr/solr/data/index/_3a.fdx", "vendor/solr/solr/data/index/_3a.fnm", "vendor/solr/solr/data/index/_3a.frq", "vendor/solr/solr/data/index/_3a.nrm", "vendor/solr/solr/data/index/_3a.prx", "vendor/solr/solr/data/index/_3a.tii", "vendor/solr/solr/data/index/_3a.tis", "vendor/solr/solr/data/index/segments.gen", "vendor/solr/solr/data/index/segments_3f", "vendor/solr/start.jar", "vendor/solr/webapps/solr.war"] s.has_rdoc = true s.homepage = %q{notch8.com} s.rdoc_options = ["--main", "README.rdoc"] @@ -24,8 +24,11 @@ Gem::Specification.new do |s| s.specification_version = 2 if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then + s.add_development_dependency(%q<bones>, [">= 2.5.0"]) else + s.add_dependency(%q<bones>, [">= 2.5.0"]) end else + s.add_dependency(%q<bones>, [">= 2.5.0"]) end end tanning_bed.gemspec @@ -1,4 +1,3 @@ -# $Id$ begin require 'bones/smtp_tls' @@ -43,7 +42,7 @@ namespace :ann do desc "Send an email announcement" task :email => ['ann:prereqs', PROJ.ann.file] do ann = PROJ.ann - from = ann.email[:from] || PROJ.email + from = ann.email[:from] || Array(PROJ.authors).first || PROJ.email to = Array(ann.email[:to]) ### build a mail header for RFC 822 tasks/ann.rake @@ -1,4 +1,3 @@ -# $Id$ if HAVE_BONES tasks/bones.rake @@ -1,6 +1,94 @@ -# $Id$ -require 'rake/gempackagetask' +require 'find' +require 'rake/packagetask' +require 'rubygems/user_interaction' +require 'rubygems/builder' + +module Bones +class GemPackageTask < Rake::PackageTask + # Ruby GEM spec containing the metadata for this package. The + # name, version and package_files are automatically determined + # from the GEM spec and don't need to be explicitly provided. + # + attr_accessor :gem_spec + + # Tasks from the Bones gem directory + attr_reader :bones_files + + # Create a GEM Package task library. Automatically define the gem + # if a block is given. If no block is supplied, then +define+ + # needs to be called to define the task. + # + def initialize(gem_spec) + init(gem_spec) + yield self if block_given? + define if block_given? + end + + # Initialization tasks without the "yield self" or define + # operations. + # + def init(gem) + super(gem.name, gem.version) + @gem_spec = gem + @package_files += gem_spec.files if gem_spec.files + @bones_files = [] + + local_setup = File.join(Dir.pwd, %w[tasks setup.rb]) + if !test(?e, local_setup) + Dir.glob(::Bones.path(%w[lib bones tasks *])).each {|fn| bones_files << fn} + end + end + + # Create the Rake tasks and actions specified by this + # GemPackageTask. (+define+ is automatically called if a block is + # given to +new+). + # + def define + super + task :prereqs + task :package => ['gem:prereqs', "#{package_dir_path}/#{gem_file}"] + file "#{package_dir_path}/#{gem_file}" => [package_dir_path] + package_files + bones_files do + when_writing("Creating GEM") { + chdir(package_dir_path) do + Gem::Builder.new(gem_spec).build + verbose(true) { + mv gem_file, "../#{gem_file}" + } + end + } + end + + file package_dir_path => bones_files do + mkdir_p package_dir rescue nil + + gem_spec.files = (gem_spec.files + + bones_files.map {|fn| File.join('tasks', File.basename(fn))}).sort + + bones_files.each do |fn| + base_fn = File.join('tasks', File.basename(fn)) + f = File.join(package_dir_path, base_fn) + fdir = File.dirname(f) + mkdir_p(fdir) if !File.exist?(fdir) + if File.directory?(fn) + mkdir_p(f) + else + raise "file name conflict for '#{base_fn}' (conflicts with '#{fn}')" if test(?e, f) + safe_ln(fn, f) + end + end + end + end + + def gem_file + if @gem_spec.platform == Gem::Platform::RUBY + "#{package_name}.gem" + else + "#{package_name}-#{@gem_spec.platform}.gem" + end + end +end # class GemPackageTask +end # module Bones namespace :gem do @@ -19,6 +107,10 @@ namespace :gem do s.add_dependency(*dep) end + PROJ.gem.development_dependencies.each do |dep| + s.add_development_dependency(*dep) + end + s.files = PROJ.gem.files s.executables = PROJ.gem.executables.map {|fn| File.basename(fn)} s.extensions = PROJ.gem.files.grep %r/extconf\.rb$/ @@ -57,46 +149,23 @@ namespace :gem do end end # Gem::Specification.new - # A prerequisites task that all other tasks depend upon - task :prereqs + Bones::GemPackageTask.new(PROJ.gem._spec) do |pkg| + pkg.need_tar = PROJ.gem.need_tar + pkg.need_zip = PROJ.gem.need_zip + end desc 'Show information about the gem' task :debug => 'gem:prereqs' do puts PROJ.gem._spec.to_ruby end - - desc 'Write gemspec file' + + desc 'Write the gemspec ' task :spec => 'gem:prereqs' do - File.open(PROJ.name + ".gemspec", "w") do |f| + File.open("#{PROJ.name}.gemspec", 'w') do |f| f.write PROJ.gem._spec.to_ruby end end - pkg = Rake::PackageTask.new(PROJ.name, PROJ.version) do |pkg| - pkg.need_tar = PROJ.gem.need_tar - pkg.need_zip = PROJ.gem.need_zip - pkg.package_files += PROJ.gem._spec.files - end - Rake::Task['gem:package'].instance_variable_set(:@full_comment, nil) - - gem_file = if PROJ.gem._spec.platform == Gem::Platform::RUBY - "#{pkg.package_name}.gem" - else - "#{pkg.package_name}-#{PROJ.gem._spec.platform}.gem" - end - - desc "Build the gem file #{gem_file}" - task :package => ['gem:prereqs', "#{pkg.package_dir}/#{gem_file}"] - - file "#{pkg.package_dir}/#{gem_file}" => [pkg.package_dir] + PROJ.gem._spec.files do - when_writing("Creating GEM") { - Gem::Builder.new(PROJ.gem._spec).build - verbose(true) { - mv gem_file, "#{pkg.package_dir}/#{gem_file}" - } - } - end - desc 'Install the gem' task :install => [:clobber, 'gem:package'] do sh "#{SUDO} #{GEM} install --local pkg/#{PROJ.gem._spec.full_name}" @@ -120,14 +189,13 @@ namespace :gem do task :cleanup do sh "#{SUDO} #{GEM} cleanup #{PROJ.gem._spec.name}" end - end # namespace :gem + desc 'Alias to gem:package' task :gem => 'gem:package' task :clobber => 'gem:clobber_package' - -remove_desc_for_task %w(gem:clobber_package) +remove_desc_for_task 'gem:clobber_package' # EOF tasks/gem.rake @@ -1,4 +1,3 @@ -# $Id$ if HAVE_GIT tasks/git.rake @@ -1,4 +1,3 @@ -# $Id$ if HAVE_BONES tasks/notes.rake @@ -1,16 +1,16 @@ -# $Id$ # This file does not define any rake tasks. It is used to load some project # settings if they are not defined by the user. -PROJ.rdoc.exclude << "^#{Regexp.escape(PROJ.manifest_file)}$" PROJ.exclude << ["^#{Regexp.escape(PROJ.ann.file)}$", + "^#{Regexp.escape(PROJ.ignore_file)}$", "^#{Regexp.escape(PROJ.rdoc.dir)}/", "^#{Regexp.escape(PROJ.rcov.dir)}/"] flatten_arrays = lambda do |this,os| os.instance_variable_get(:@table).each do |key,val| - next if key == :dependencies + next if key == :dependencies \ + or key == :development_dependencies case val when Array; val.flatten! when OpenStruct; this.call(this,val) @@ -25,12 +25,7 @@ PROJ.description ||= paragraphs_of(PROJ.readme_file, 'description').join("\n\n") PROJ.summary ||= PROJ.description.split('.').first -PROJ.gem.files ||= - if test(?f, PROJ.manifest_file) - files = File.readlines(PROJ.manifest_file).map {|fn| fn.chomp.strip} - files.delete '' - files - else [] end +PROJ.gem.files ||= manifest PROJ.gem.executables ||= PROJ.gem.files.find_all {|fn| fn =~ %r/^bin/} tasks/post_load.rake @@ -1,4 +1,3 @@ -# $Id$ require 'rake/rdoctask' @@ -20,10 +19,11 @@ namespace :doc do end rd.rdoc_files.push(*files) - title = "#{PROJ.name}-#{PROJ.version} Documentation" - + name = PROJ.name rf_name = PROJ.rubyforge.name - title = "#{rf_name}'s " + title if rf_name.valid? and rf_name != title + + title = "#{name}-#{PROJ.version} Documentation" + title = "#{rf_name}'s " + title if rf_name.valid? and rf_name != name rd.options << "-t #{title}" rd.options.concat(rdoc.opts) tasks/rdoc.rake @@ -6,7 +6,7 @@ require 'rake/contrib/sshpublisher' namespace :gem do desc 'Package and upload to RubyForge' - task :release => [:clobber, 'gem:package'] do |t| + task :release => [:clobber, 'gem'] do |t| v = ENV['VERSION'] or abort 'Must supply VERSION=x.y.z' abort "Versions don't match #{v} vs #{PROJ.version}" if v != PROJ.version pkg = "pkg/#{PROJ.gem._spec.full_name}" @@ -26,9 +26,7 @@ namespace :gem do c['release_changes'] = PROJ.changes if PROJ.changes c['preformatted'] = true - files = [(PROJ.gem.need_tar ? "#{pkg}.tgz" : nil), - (PROJ.gem.need_zip ? "#{pkg}.zip" : nil), - "#{pkg}.gem"].compact + files = Dir.glob("#{pkg}*.*") puts "Releasing #{PROJ.name} v. #{PROJ.version}" rf.add_release PROJ.rubyforge.name, PROJ.name, PROJ.version, *files tasks/rubyforge.rake @@ -1,12 +1,15 @@ -# $Id$ require 'rubygems' require 'rake' require 'rake/clean' require 'fileutils' require 'ostruct' +require 'find' -class OpenStruct; undef :gem; end +class OpenStruct; undef :gem if defined? :gem; end + +# TODO: make my own openstruct type object that includes descriptions +# TODO: use the descriptions to output help on the available bones options PROJ = OpenStruct.new( # Project Defaults @@ -25,8 +28,8 @@ PROJ = OpenStruct.new( :ruby_opts => %w(), :libs => [], :history_file => 'History.txt', - :manifest_file => 'Manifest.txt', :readme_file => 'README.rdoc', + :ignore_file => '.bnsignore', # Announce :ann => OpenStruct.new( @@ -48,6 +51,7 @@ PROJ = OpenStruct.new( # Gem Packaging :gem => OpenStruct.new( :dependencies => [], + :development_dependencies => [], :executables => nil, :extensions => FileList['ext/**/extconf.rb'], :files => nil, @@ -74,7 +78,7 @@ PROJ = OpenStruct.new( # Rdoc :rdoc => OpenStruct.new( :opts => [], - :include => %w(^lib/ ^bin/ ^ext/ \.txt$), + :include => %w(^lib/ ^bin/ ^ext/ \.txt$ \.rdoc$), :exclude => %w(extconf\.rb$), :main => nil, :dir => 'doc', @@ -110,17 +114,17 @@ PROJ = OpenStruct.new( ) # Load the other rake files in the tasks folder -rakefiles = Dir.glob('tasks/*.rake').sort -rakefiles.unshift(rakefiles.delete('tasks/post_load.rake')).compact! +tasks_dir = File.expand_path(File.dirname(__FILE__)) +post_load_fn = File.join(tasks_dir, 'post_load.rake') +rakefiles = Dir.glob(File.join(tasks_dir, '*.rake')).sort +rakefiles.unshift(rakefiles.delete(post_load_fn)).compact! import(*rakefiles) # Setup the project libraries %w(lib ext).each {|dir| PROJ.libs << dir if test ?d, dir} # Setup some constants -WIN32 = %r/djgpp|(cyg|ms|bcc)win|mingw/ =~ RUBY_PLATFORM unless defined? WIN32 - -DEV_NULL = WIN32 ? 'NUL:' : '/dev/null' +DEV_NULL = File.exist?('/dev/null') ? '/dev/null' : 'NUL:' def quiet( &block ) io = [STDOUT.dup, STDERR.dup] @@ -133,23 +137,17 @@ ensure $stdout, $stderr = STDOUT, STDERR end -DIFF = if WIN32 then 'diff.exe' - else - if quiet {system "gdiff", __FILE__, __FILE__} then 'gdiff' - else 'diff' end - end unless defined? DIFF +DIFF = if system("gdiff '#{__FILE__}' '#{__FILE__}' > #{DEV_NULL} 2>&1") then 'gdiff' + else 'diff' end unless defined? DIFF -SUDO = if WIN32 then '' - else - if quiet {system 'which sudo'} then 'sudo' - else '' end - end +SUDO = if system("which sudo > #{DEV_NULL} 2>&1") then 'sudo' + else '' end unless defined? SUDO -RCOV = WIN32 ? 'rcov.bat' : 'rcov' -RDOC = WIN32 ? 'rdoc.bat' : 'rdoc' -GEM = WIN32 ? 'gem.bat' : 'gem' +RCOV = "#{RUBY} -S rcov" +RDOC = "#{RUBY} -S rdoc" +GEM = "#{RUBY} -S gem" -%w(rcov spec/rake/spectask rubyforge bones facets/ansicode).each do |lib| +%w(rcov spec/rake/spectask rubyforge bones facets/ansicode zentest).each do |lib| begin require lib Object.instance_eval {const_set "HAVE_#{lib.tr('/','_').upcase}", true} @@ -162,6 +160,12 @@ HAVE_SVN = (Dir.entries(Dir.pwd).include?('.svn') and HAVE_GIT = (Dir.entries(Dir.pwd).include?('.git') and system("git --version 2>&1 > #{DEV_NULL}")) +# Add bones as a development dependency +# +if HAVE_BONES + PROJ.gem.development_dependencies << ['bones', ">= #{Bones::VERSION}"] +end + # Reads a file at +path+ and spits out an array of the +paragraphs+ # specified. # @@ -243,9 +247,29 @@ end # Scans the current working directory and creates a list of files that are # candidates to be in the manifest. # -def manifest_files +def manifest files = [] - exclude = Regexp.new(PROJ.exclude.join('|')) + exclude = PROJ.exclude.dup + comment = %r/^\s*#/ + + # process the ignore file and add the items there to the exclude list + if test(?f, PROJ.ignore_file) + ary = [] + File.readlines(PROJ.ignore_file).each do |line| + next if line =~ comment + line.chomp! + line.strip! + next if line.nil? or line.empty? + + glob = line =~ %r/\*\./ ? File.join('**', line) : line + Dir.glob(glob).each {|fn| ary << "^#{Regexp.escape(fn)}"} + end + exclude.concat ary + end + + # generate a regular expression from the exclude list + exclude = Regexp.new(exclude.join('|')) + Find.find '.' do |path| path.sub! %r/^(\.\/|\/)/o, '' next unless test ?f, path tasks/setup.rb @@ -1,6 +1,5 @@ -# $Id$ -if HAVE_SPEC_RAKE_SPECTASK +if HAVE_SPEC_RAKE_SPECTASK and not PROJ.spec.files.to_a.empty? require 'spec/rake/verify_rcov' namespace :spec do tasks/spec.rake @@ -1,4 +1,3 @@ -# $Id$ if HAVE_SVN tasks/svn.rake @@ -1,5 +1,5 @@ -# $Id$ +if test(?e, PROJ.test.file) or not PROJ.test.files.to_a.empty? require 'rake/testtask' namespace :test do @@ -35,4 +35,6 @@ task :test => 'test:run' task :clobber => 'test:clobber_rcov' if HAVE_RCOV +end + # EOF tasks/test.rake tasks/manifest.rake 8b548d14041101fde71ed8362f0bcb3c5d0a4478 Rob Kaufman rob@notch8.com http://github.com/notch8/tanning_bed/commit/4701443a40fdbc46fe419cf9bf3c2fc0f35f6435 4701443a40fdbc46fe419cf9bf3c2fc0f35f6435 2009-04-29T16:00:23-07:00 2009-04-29T16:00:23-07:00 updated to Ruby 1.9 compatibility b92f0175e11a3972574d50845b162f3720683389 Rob Kaufman rob@notch8.com