sunspot_test 0.1.2 → 0.2.0

data/HISTORY

@@ -0,0 +1,10 @@
+0.2.0 - May 26, 2011
+  * Moved requires from "sunspot_test" to "sunspot_test/cucumber" so we didn't conflict with bundler's autorequire.
+  * Added non-@search functionality which stubs out the session and consequently speeds up the non-searching tests.
+  * Added a configurable startup_timeout which defaults to 15 seconds.
+0.1.2 - May 25, 2011
+  * Wrote a more descriptive Readme for new users.
+0.1.1 - May 18, 2011
+  * Moved the repo to collectiveidea.
+0.1.0 - May 18, 2011
+  * Initial codebase to github.

data/README.rdoc

@@ -10,6 +10,11 @@ Or through bundler
   
   # in Gemfile
   gem "sunspot_test"
+  
+Then in Cucumber's env.rb:
+  
+  require 'sunspot_test/cucumber'
+  
 
 == What does it do?
 
@@ -22,13 +27,22 @@ This gem will automatically start and stop solr for cucumber tests when using th
       Given a book exists with a title of "Of Mice and Men"
   
 
-Starting solr will depend on your settings in <b>config/sunspot.yml</b>. If you run into issues remember to look for existing java processes, starting solr may conflict with existing instances. You can also check out http://collectiveidea.com/blog/archives/2011/05/25/testing-with-sunspot-and-cucumber/ which contains a little more information.
+If you feature is not tagged with @search the environment will use a sunspot test proxy object which will silently swallow all requests.
+      
+Starting solr will depend on your settings in <b>config/sunspot.yml</b> (though this configuration file is optional). If you run into issues remember to look for existing java processes, starting solr may conflict with existing instances. You can also check out http://collectiveidea.com/blog/archives/2011/05/25/testing-with-sunspot-and-cucumber/ which contains a little more information.
+
+== Configuring the timeout
+
+The test suite will try and launch a solr process and wait for 15 seconds for the process to launch. You can configure this timeout by setting the following in env.rb:
+
+  
+  SunspotTestHelper.startup_timeout = 60 # will wait 60 seconds for the solr process to start
+  
 
 == Note on Patches/Pull Requests
  
 * Fork the project.
 * Make your feature addition or bug fix.
-* Add tests for it. This is important so I don't break it in a
   future version unintentionally.
 * Commit, do not mess with rakefile, version, or history.
   (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)

data/Rakefile

@@ -6,7 +6,7 @@ begin
   Jeweler::Tasks.new do |gem|
     gem.name = "sunspot_test"
     gem.summary = %Q{Auto-starts solr for your cucumber tests}
-    gem.description = %Q{Testing sunspot with cucumber can be a pain. This gem will automatically start/stop solr with cucumber scenarios tagged with @solr}
+    gem.description = %Q{Testing sunspot with cucumber can be a pain. This gem will automatically start/stop solr with cucumber scenarios tagged with @search}
     gem.email = "zach@collectiveidea.com"
     gem.homepage = "https://github.com/collectiveidea/sunspot_test"
     gem.authors = ["Zach Moazeni"]

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

data/lib/sunspot_test.rb

@@ -1,43 +0,0 @@
-require 'net/http'
-
-Before("@searchrunning") do
-  $sunspot = true
-end
-
-Before("@search") do
-  unless $sunspot
-    $sunspot = Sunspot::Rails::Server.new
-    pid = fork do
-      STDERR.reopen('/dev/null')
-      STDOUT.reopen('/dev/null')
-      $sunspot.run
-    end
-    # shut down the Solr server
-    at_exit { Process.kill('TERM', pid) }
-    SunspotHelpers.wait_until_solr_starts
-  end
-  
-  Sunspot.remove_all!
-  Sunspot.commit
-end
-
-AfterStep('@search') do
-  Sunspot.commit
-end
-
-module SunspotHelpers
-  def self.wait_until_solr_starts
-    solr_started = false
-    ping_uri = URI.parse("#{Sunspot.session.config.solr.url}/ping")
-    150.times do
-      begin
-        Net::HTTP.get(ping_uri)
-        solr_started = true
-        break
-      rescue
-        sleep(0.1)
-      end
-    end
-    raise "Solr failed to start after 15 seconds" unless solr_started
-  end
-end

data/lib/sunspot_test/cucumber.rb

@@ -0,0 +1,54 @@
+require 'net/http'
+
+$original_sunspot_session = Sunspot.session
+
+Before("@searchrunning") do
+  $sunspot = true
+end
+
+Before("~@search") do
+  Sunspot.session = Sunspot::Rails::StubSessionProxy.new($original_sunspot_session)
+end
+
+Before("@search") do
+  unless $sunspot
+    $sunspot = Sunspot::Rails::Server.new
+    pid = fork do
+      STDERR.reopen('/dev/null')
+      STDOUT.reopen('/dev/null')
+      $sunspot.run
+    end
+    # shut down the Solr server
+    at_exit { Process.kill('TERM', pid) }
+    SunspotTestHelper.wait_until_solr_starts
+  end
+  
+  Sunspot.session = $original_sunspot_session
+  Sunspot.remove_all!
+  Sunspot.commit
+end
+
+AfterStep('@search') do
+  Sunspot.commit
+end
+
+module SunspotTestHelper
+  @@startup_timeout = 15
+  def self.startup_timeout; @@startup_timeout; end
+  def self.startup_timeout=(seconds); @@startup_timeout = seconds; end
+  
+  def self.wait_until_solr_starts
+    solr_started = false
+    ping_uri = URI.parse("#{Sunspot.session.config.solr.url}/ping")
+    (@@startup_timeout * 10).times do
+      begin
+        Net::HTTP.get(ping_uri)
+        solr_started = true
+        break
+      rescue
+        sleep(0.1)
+      end
+    end
+    raise "Solr failed to start after 15 seconds" unless solr_started
+  end
+end

data/sunspot_test.gemspec

@@ -1,44 +1,40 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{sunspot_test}
-  s.version = "0.1.2"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Zach Moazeni"]
-  s.date = %q{2011-05-25}
-  s.description = %q{Testing sunspot with cucumber can be a pain. This gem will automatically start/stop solr with cucumber scenarios tagged with @solr}
+  s.date = %q{2011-05-26}
+  s.description = %q{Testing sunspot with cucumber can be a pain. This gem will automatically start/stop solr with cucumber scenarios tagged with @search}
   s.email = %q{zach@collectiveidea.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "features/support/env.rb",
-     "lib/sunspot_test.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb",
-     "spec/sunspot_test_spec.rb",
-     "sunspot_test.gemspec"
+    "HISTORY",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "features/support/env.rb",
+    "lib/sunspot_test.rb",
+    "lib/sunspot_test/cucumber.rb",
+    "spec/spec.opts",
+    "spec/spec_helper.rb",
+    "spec/sunspot_test_spec.rb",
+    "sunspot_test.gemspec"
   ]
   s.homepage = %q{https://github.com/collectiveidea/sunspot_test}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.4.2}
   s.summary = %q{Auto-starts solr for your cucumber tests}
-  s.test_files = [
-    "spec/spec_helper.rb",
-     "spec/sunspot_test_spec.rb"
-  ]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sunspot_test
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
   - 2
-  version: 0.1.2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Zach Moazeni
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-25 00:00:00 -04:00
+date: 2011-05-26 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,7 +50,7 @@ dependencies:
         version: 1.2.9
   type: :development
   version_requirements: *id002
-description: Testing sunspot with cucumber can be a pain. This gem will automatically start/stop solr with cucumber scenarios tagged with @solr
+description: Testing sunspot with cucumber can be a pain. This gem will automatically start/stop solr with cucumber scenarios tagged with @search
 email: zach@collectiveidea.com
 executables: []
 
@@ -61,13 +61,14 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
+- HISTORY
 - LICENSE
 - README.rdoc
 - Rakefile
 - VERSION
 - features/support/env.rb
 - lib/sunspot_test.rb
+- lib/sunspot_test/cucumber.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/sunspot_test_spec.rb
@@ -77,8 +78,8 @@ homepage: https://github.com/collectiveidea/sunspot_test
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -106,6 +107,5 @@ rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Auto-starts solr for your cucumber tests
-test_files: 
-- spec/spec_helper.rb
-- spec/sunspot_test_spec.rb
+test_files: []
+

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC