culerity 0.2.14 → 0.2.15

data/README.md

@@ -48,6 +48,10 @@ When you have finished running culerity/cucumber you can turn off the Rails inst
 NOTE: The default port for this server is 3001. You can change this in features/step_definitions/common_celerity.rb
 
     rake culerity:rails:stop
+    
+### RVM
+
+If you are using RVM there's an [integration guide for culerity](http://rvm.beginrescueend.com/integration/culerity/) on their website.
 
 ## How does it work
 

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :minor: 2
 :build: 
-:patch: 14
+:patch: 15
 :major: 0

data/lib/culerity.rb

@@ -41,7 +41,7 @@ module Culerity
   end
   
   def self.run_server
-    IO.popen(%{#{jruby_invocation} "#{celerity_invocation}"}, 'r+').extend(ServerCommands)
+    IO.popen(%{RUBYOPT="" #{jruby_invocation} "#{celerity_invocation}"}, 'r+').extend(ServerCommands)
   end
   
   def self.run_rails(options = {})

data/lib/start_celerity.rb

@@ -1,3 +1,3 @@
 require 'rubygems'
-require 'culerity/celerity_server'
+require File.dirname(__FILE__) + '/culerity/celerity_server'
 Culerity::CelerityServer.new(STDIN, STDOUT)

data/rails_generators/culerity/templates/features/step_definitions/culerity_steps.rb

@@ -21,7 +21,7 @@ end
 
 at_exit do
   $browser.exit if $browser
-  $server.close if $server
+  $server.exit_server if $server
   Process.kill(6, $rails_server_pid) if $rails_server_pid
 end
 

data/spec/culerity_spec.rb

@@ -95,7 +95,7 @@ describe Culerity do
     it "shells out and sparks up jruby with the correct invocation" do
       Culerity.stub!(:celerity_invocation).and_return('/path/to/start_celerity.rb')
       
-      IO.should_receive(:popen).with('jruby "/path/to/start_celerity.rb"', 'r+')
+      IO.should_receive(:popen).with('RUBYOPT="" jruby "/path/to/start_celerity.rb"', 'r+')
       
       Culerity.run_server
     end
@@ -103,10 +103,10 @@ describe Culerity do
     it "allows a more complex situation, e.g. using RVM + named gemset" do
       Culerity.stub!(:celerity_invocation).and_return('/path/to/start_celerity.rb')
       
-      IO.should_receive(:popen).with('rvm jruby@culerity ruby "/path/to/start_celerity.rb"', 'r+')
+      IO.should_receive(:popen).with('RUBYOPT="" rvm jruby@culerity ruby "/path/to/start_celerity.rb"', 'r+')
       
       Culerity.jruby_invocation = "rvm jruby@culerity ruby"
       Culerity.run_server
     end
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: culerity
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 2
-  - 14
-  version: 0.2.14
+  - 15
+  version: 0.2.15
 platform: ruby
 authors: 
 - Alexander Lang
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-04 00:00:00 +01:00
+date: 2011-01-21 00:00:00 +01:00
 default_executable: run_celerity_server.rb
 dependencies: 
 - !ruby/object:Gem::Dependency