culerity 0.2.10 → 0.2.12

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
 :minor: 2
-:patch: 10
+:patch: 12
 :build: 

data/culerity.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{culerity}
-  s.version = "0.2.10"
+  s.version = "0.2.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexander Lang"]
-  s.date = %q{2010-04-28}
+  s.date = %q{2010-08-20}
   s.default_executable = %q{run_celerity_server.rb}
   s.description = %q{Culerity integrates Cucumber and Celerity in order to test your application's full stack.}
   s.email = %q{alex@upstream-berlin.com}
@@ -43,6 +43,7 @@ Gem::Specification.new do |s|
      "lib/culerity/persistent_delivery.rb",
      "lib/culerity/remote_browser_proxy.rb",
      "lib/culerity/remote_object_proxy.rb",
+     "lib/start_celerity.rb",
      "lib/tasks/rspec.rake",
      "rails/init.rb",
      "rails_generators/culerity/culerity_generator.rb",

data/features/installing_culerity.feature

@@ -5,15 +5,17 @@ Feature: Installing culerity
 
   Background:
     Given a Rails app
-      And I run executable "script/generate" with arguments "cucumber"
-      And I delete file "features/step_definitions/webrat_steps.rb"
+      And I run executable "script/generate" with arguments "cucumber --rspec --webrat"
+      And I delete file "features/step_definitions/web_steps.rb"
       And I delete file "features/support/env.rb"
       And culerity is installed as a plugin
       And I invoke task "rake db:migrate"
     When I run executable "script/generate" with arguments "culerity"
       And I setup load path to local code
       And I setup the culerity javascript helpers
-  
+      And I add the JRUBY_INVOCATION check to "features/support/env.rb"
+      And I add an rvm_verbose_flag=0-wielding .rvmrc to the home folder  
+      
   Scenario: Install culerity and test the rails start + stop tasks
     When I invoke task "rake culerity:rails:start"
     Then file "tmp/culerity_rails_server.pid" is created
@@ -23,7 +25,7 @@ Feature: Installing culerity
   Scenario: Install culerity into a Rails app and check it works
     Then file "features/step_definitions/culerity_steps.rb" is created
     Then file "config/environments/culerity.rb" is created
-
+  
     When I run executable "cucumber" with arguments "features/"
     Then I should see "0 scenarios"
       And I should see "0 steps"
@@ -32,4 +34,4 @@ Feature: Installing culerity
       And I run executable "cucumber" with arguments "features/"
     Then I should see "1 scenario"
       And I should see "5 steps (5 passed)"
-      And I should not see "WARNING: Speed up executing by running 'rake culerity:rails:start'"
+      And I should not see "WARNING: Speed up executing by running 'rake culerity:rails:start'"

data/features/running_cucumber_without_explicitly_running_external_services.feature

@@ -5,14 +5,16 @@ Feature: Running cucumber without explicitly running external services
 
   Background:
     Given a Rails app
-      And I run executable "script/generate" with arguments "cucumber"
-      And I delete file "features/step_definitions/webrat_steps.rb"
+      And I run executable "script/generate" with arguments "cucumber --rspec --webrat"
+      And I delete file "features/step_definitions/web_steps.rb"
       And I delete file "features/support/env.rb"
       And culerity is installed as a plugin
       And I invoke task "rake db:migrate"
     When I run executable "script/generate" with arguments "culerity"
       And I setup load path to local code
       And I setup the culerity javascript helpers
+      And I add the JRUBY_INVOCATION check to "features/support/env.rb"
+      And I add an rvm_verbose_flag=0-wielding .rvmrc to the home folder  
   
   Scenario: Successfully run scenarios without requiring celerity or rails processes running
     When I add a feature file to test Rails index.html default file

data/features/step_definitions/rails_setup_steps.rb

@@ -26,6 +26,14 @@ When /^I add a feature file to test Rails index.html default file$/ do
   end
 end
 
+When /^(?:I )?add an rvm_verbose_flag=0-wielding \.rvmrc to the home folder$/ do
+  in_home_folder do
+    File.open('.rvmrc', 'w+') do |f|
+      f.puts "rvm_verbose_flag=0"
+    end
+  end
+end
+
 When /^I setup the culerity javascript helpers$/ do
   `cp #{File.dirname(__FILE__) + "/../fixtures/jquery"} #{File.join(@active_project_folder, 'public', 'javascripts', 'jquery.js')}`
   in_project_folder do

data/features/support/env.rb

@@ -21,3 +21,4 @@ include RubiGen::GeneratorTestHelper
 SOURCES = Dir[File.dirname(__FILE__) + "/../../generators"].map do |f|
   RubiGen::PathSource.new(:test, File.expand_path(f))
 end
+

data/lib/culerity.rb

@@ -23,9 +23,25 @@ module Culerity
       self.puts '["_clear_proxies_"]'      
     end
   end
-
+  
+  def self.culerity_root
+    File.expand_path('../../', __FILE__)
+  end
+  
+  def self.celerity_invocation
+    %{#{culerity_root}/lib/start_celerity.rb}
+  end
+  
+  def self.jruby_invocation
+    @jruby_invocation ||= (ENV["JRUBY_INVOCATION"] || "jruby")
+  end
+  
+  def self.jruby_invocation=(invocation)
+    @jruby_invocation = invocation
+  end
+  
   def self.run_server
-    IO.popen(File.dirname(__FILE__) + "/../bin/run_celerity_server.rb", 'r+').extend(ServerCommands)
+    IO.popen(%{#{jruby_invocation} "#{celerity_invocation}"}, 'r+').extend(ServerCommands)
   end
   
   def self.run_rails(options = {})

data/lib/start_celerity.rb

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

data/rails_generators/culerity/templates/config/environments/culerity.rb

@@ -1,4 +1,4 @@
-config.cache_classes = false
+config.cache_classes = true # set because of https://rspec.lighthouseapp.com/projects/16211/tickets/165
 
 # Log error messages when you accidentally call methods on nil.
 config.whiny_nils = true

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

@@ -146,14 +146,11 @@ Then /^the "([^\"]*)" checkbox should not be checked$/ do |label|
 end
 
 Then /I should see "([^\"]*)"/ do |text|
-  # if we simply check for the browser.html content we don't find content that has been added dynamically, e.g. after an ajax call
-  div = $browser.div(:text, /#{Regexp::escape(text)}/)
-  div.should be_exist
+  $browser.text.include?(text).should be_true
 end
 
 Then /I should not see "([^\"]*)"/ do |text|
-  div = $browser.div(:text, /#{Regexp::escape(text)}/)
-  div.should_not be_exist
+  $browser.text.include?(text).should_not be_true
 end
 
 def find_by_label_or_id(element, attribute)

data/spec/culerity_spec.rb

@@ -1,47 +1,112 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe Culerity, 'run_rails' do
-  before(:each) do
-    Kernel.stub!(:sleep)
-    IO.stub!(:popen)
-    Culerity.stub!(:fork).and_yield.and_return(3200)
-    Culerity.stub!(:exec)
-    Culerity.stub!(:sleep)
-    [$stdin, $stdout, $stderr].each{|io| io.stub(:reopen)}
+describe Culerity do
+  describe 'run_rails' do
+    def stub_rails_root!
+      unless defined?(::Rails)
+        Kernel.const_set "Rails", stub()
+      end
+      Rails.stub!(:root).and_return(Dir.pwd)
+    end
+    
+    before(:each) do
+      Kernel.stub!(:sleep)
+      IO.stub!(:popen)
+      Culerity.stub!(:fork).and_yield.and_return(3200)
+      Culerity.stub!(:exec)
+      Culerity.stub!(:sleep)
+      [$stdin, $stdout, $stderr].each{|io| io.stub(:reopen)}
+    end
+    
+    it "should not run rails if we are not using rails" do
+      Culerity.should_not_receive(:exec)
+      Culerity.run_rails :port => 4000, :environment => 'culerity'
+    end
+    
+    describe "when Rails is being used" do
+      before(:each) do
+        stub_rails_root!
+      end
+      
+      it "should run rails with default values" do
+        Culerity.should_receive(:exec).with("script/server -e culerity -p 3001")
+        Culerity.run_rails
+      end
+      
+      it "should run rails with the given values" do
+        Culerity.should_receive(:exec).with("script/server -e culerity -p 4000")
+        Culerity.run_rails :port => 4000, :environment => 'culerity'
+      end
+      
+      it "should change into the rails root directory" do
+        Dir.should_receive(:chdir).with(Dir.pwd)
+        Culerity.run_rails :port => 4000, :environment => 'culerity'
+      end
+      
+      it "should wait for the server to start up" do
+        Culerity.should_receive(:sleep)
+        Culerity.run_rails :port => 4000, :environment => 'culerity'
+      end
+      
+      it "should reopen the i/o channels to /dev/null" do
+        [$stdin, $stdout, $stderr].each{|io| io.should_receive(:reopen).with("/dev/null")}
+        Culerity.run_rails :port => 4000, :environment => 'culerity'
+      end
+    end
   end
   
-  it "should not run rails if we are not using rails" do
-    Culerity.should_not_receive(:exec)
-    Culerity.run_rails :port => 4000, :environment => 'culerity'
-  end
-  
-  it "should run rails with default values" do
-    Rails ||= stub(:rails, :root => Dir.pwd)
-    Culerity.should_receive(:exec).with("script/server -e culerity -p 3001")
-    Culerity.run_rails
-  end
-  
-  it "should run rails with the given values" do
-    Rails ||= stub(:rails, :root => Dir.pwd)
-    Culerity.should_receive(:exec).with("script/server -e culerity -p 4000")
-    Culerity.run_rails :port => 4000, :environment => 'culerity'
-  end
-
-  it "should change into the rails root directory" do
-    Rails ||= stub(:rails, :root => Dir.pwd)
-    Dir.should_receive(:chdir).with(Dir.pwd)
-    Culerity.run_rails :port => 4000, :environment => 'culerity'
-  end
-  
-  it "should wait for the server to start up" do
-    Rails ||= stub(:rails, :root => Dir.pwd)
-    Culerity.should_receive(:sleep)
-    Culerity.run_rails :port => 4000, :environment => 'culerity'
-  end
-  
-  it "should reopen the i/o channels to /dev/null" do
-    Rails ||= stub(:rails, :root => Dir.pwd)
-    [$stdin, $stdout, $stderr].each{|io| io.should_receive(:reopen).with("/dev/null")}
-    Culerity.run_rails :port => 4000, :environment => 'culerity'
+  describe "run_server" do
+    before(:each) do
+      IO.stub!(:popen)
+    end
+    
+    after(:each) do
+      Culerity.jruby_invocation = nil
+    end
+    
+    it "knows where it is located" do
+      Culerity.culerity_root.should == File.expand_path(File.dirname(__FILE__) + '/../')
+    end
+    
+    it "has access to the Celerity invocation" do
+      Culerity.stub!(:culerity_root).and_return('/path/to/culerity')
+      
+      Culerity.celerity_invocation.should == "/path/to/culerity/lib/start_celerity.rb"
+    end
+    
+    describe "invoking JRuby" do
+      it "knows how to invoke it" do
+        Culerity.jruby_invocation.should == 'jruby'
+      end
+      
+      it "allows for the invocation to be overridden directly" do
+        Culerity.jruby_invocation = '/opt/local/bin/jruby'
+        
+        Culerity.jruby_invocation.should == '/opt/local/bin/jruby'
+      end
+      
+      it "allows for the invocation to be overridden from an environment variable" do
+        ENV['JRUBY_INVOCATION'] = 'rvm jruby ruby'
+        
+        Culerity.jruby_invocation.should == 'rvm jruby ruby'
+      end
+    end
+    
+    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+')
+      
+      Culerity.run_server
+    end
+    
+    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+')
+      
+      Culerity.jruby_invocation = "rvm jruby@culerity ruby"
+      Culerity.run_server
+    end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 10
-  version: 0.2.10
+  - 12
+  version: 0.2.12
 platform: ruby
 authors: 
 - Alexander Lang
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-28 00:00:00 +02:00
+date: 2010-08-20 00:00:00 +02:00
 default_executable: run_celerity_server.rb
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -75,6 +75,7 @@ files:
 - lib/culerity/persistent_delivery.rb
 - lib/culerity/remote_browser_proxy.rb
 - lib/culerity/remote_object_proxy.rb
+- lib/start_celerity.rb
 - lib/tasks/rspec.rake
 - rails/init.rb
 - rails_generators/culerity/culerity_generator.rb