torquespec 0.3.3 → 0.3.4

data/Gemfile

@@ -2,3 +2,7 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in torquespec.gemspec
 gemspec
+
+group :development, :test do
+  gem 'torquebox'
+end

data/README.org

@@ -84,7 +84,8 @@
     TorqueSpec supports "in container" testing via the
     =remote_describe= method.  It behaves exactly like the RSpec
     =describe= method, but the resulting =ExampleGroup= will be run
-    inside the TorqueBox server.
+    inside the TorqueBox server, which is /remote/ relative to the
+    /local/ RSpec process.
 
     If your spec calls =remote_describe=, TorqueSpec will deploy a
     small daemon with your application.  This daemon will act as an
@@ -100,6 +101,7 @@
     available to the process that needs them.
 
     : require 'torquespec'
+    : require 'torquebox-core'
     : 
     : TorqueSpec.local {
     :   require 'capybara'
@@ -120,6 +122,7 @@
     : end
     : 
     : remote_describe "remote test" do
+    :   include TorqueBox::Injectors
     :   deploy(app)
     : 
     :   it "should work" do
@@ -129,16 +132,67 @@
     : end
     
     The above spec shows two example groups, one local and one remote.
-    But this spec will be processed by both the local test runner and
-    the remote daemon.  The local one uses =capybara= so its require
-    is guarded in a =TorqueSpec.local= block, which won't be run
-    remotely.  There's a complementary =TorqueSpec.remote= method
-    available, too.
-
-    Note also that the remote example is injecting a service that
-    wouldn't be available in the local runtime, only in the remote
-    TorqueBox server.  Hence, the convenience, if not potential
-    confusion, of in-container testing. :)
+    There are a few things to note:
+      - This spec will be processed by both the local test runner and
+        the remote daemon.
+      - The local example needs the =visit()= method and =page=
+        objects from =capybara= so its require statemtent is guarded
+        in a =TorqueSpec.local= block, which won't be run remotely,
+        since the =capybara= won't be available in the daemon's
+        runtime.  Similarly, put statements that should *only* run
+        remotely in a =TorqueSpec.remote= block.
+      - TorqueBox injection is supported in remote examples as long as
+        =TorqueBox::Injectors= is included in their group.
+      - Because the =remote_describe= block is evaluated locally (but
+        not executed), we must require 'torquebox-core' to refer to
+        =TorqueBox::Injectors= both locally and remotely, even though
+        the injection will only be performed remotely.
+
+*** Nesting Example Groups
+
+    The above example is not very efficient because the same
+    application is being deployed twice: once for the local =describe=
+    and again for the =remote_describe=.  We can do better by taking
+    advantage of RSpec's support for nested groups:
+
+    : describe "outside the container" do
+    : 
+    :   before(:each) do
+    :     puts "runs both locally and remotely"
+    :   end
+    : 
+    :   deploy <<-END.gsub(/^ {4}/,'')
+    :     application:
+    :       root: #{File.dirname(__FILE__)}/../app
+    :   END
+    : 
+    :   it "should handle web requests" do
+    :     visit "/"
+    :   end
+    : 
+    :   remote_describe "inside the container" do
+    : 
+    :     before(:each) do
+    :       puts "runs only remotely"
+    :     end
+    : 
+    :     it "should handle injection" do
+    :       inject( 'service-registry' ).should_not be_nil
+    :     end
+    : 
+    :   end
+    : 
+    : end
+
+    Example groups may be arbitrarily nested, but remember that *ALL*
+    subgroups of a =remote_describe= will be executed remotely by the
+    TorqueSpec daemon.
+
+    Also note that =before= and =after= blocks should work as you
+    expect, but the fact that the parent's =before= block in the above
+    example will run remotely might mean you'll need to guard certain
+    statements in either a =TorqueSpec.local= or =TorqueSpec.remote=
+    block.
 
 ** Configuration 
 

data/lib/torquespec/daemon.rb

@@ -34,9 +34,12 @@ module TorqueSpec
       DRb.stop_service
     end
 
-    def run(name, reporter)
-      puts "daemon: run #{name}"
-      example_group = @world.example_groups.find { |g| g.name == name }
+    def run(alien, reporter)
+      puts "daemon: run #{alien}"
+      simple_name = alien.name.split("::").last
+      example_group = @world.example_groups.inject([]) {|all,g| all + g.descendants}.find do |group| 
+        group.name.split("::").last == simple_name && group.description == alien.description
+      end
       example_group.run( reporter )
     end
 
@@ -60,7 +63,7 @@ module TorqueSpec
         daemon = DRbObject.new_with_uri("druby://127.0.0.1:#{TorqueSpec.drb_port}")
         attempts = 10
         begin
-          daemon.run( name, reporter )
+          daemon.run( self, reporter )
         rescue DRb::DRbConnError
           # Overcome DRb.start_service() race condition
           raise unless (attempts-=1) > 0

data/lib/torquespec/torquespec.rb

@@ -12,7 +12,7 @@ module TorqueSpec
       @deploy_paths = descriptors.map do |descriptor| 
         DeploymentDescriptor.new(descriptor, 
                                  "#{self.display_name}#{i&&i-=1}", 
-                                 self.is_a?(TorqueSpec::Daemon::Client)
+                                 descendants.any? {|x| x.is_a?(TorqueSpec::Daemon::Client)}
                                  ).path
       end
     end

data/lib/torquespec/version.rb

@@ -1,3 +1,3 @@
 module TorqueSpec
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/spec/nested_remote_spec.rb

@@ -0,0 +1,56 @@
+require 'torquespec'
+require 'open-uri'
+require 'torquebox-core'
+
+require 'jruby'
+JRuby.objectspace = true
+
+describe "out of the container" do
+
+  deploy <<-END.gsub(/^ {4}/,'')
+    application:
+      root: #{File.dirname(__FILE__)}/../apps/simple
+  END
+
+  it "should still greet the world" do
+    response = open("http://localhost:8080") {|f| f.read}
+    response.strip.should == "Hello World!"
+  end
+
+  def blocks
+    @blocks ||= []
+  end
+
+  before(:each) do
+    blocks.push :anything
+  end
+
+  after(:each) do
+    blocks.pop
+    blocks.should be_empty
+  end
+
+  remote_describe "in container of the same deployed app" do
+    include TorqueBox::Injectors
+
+    before(:each) do
+      blocks.push :anything
+    end
+
+    after(:each) do
+      blocks.pop
+      blocks.size.should == 1
+    end
+
+    it "remote? should work" do
+      TorqueSpec.remote{true}.should be_true
+      TorqueSpec.local{true}.should be_false
+    end
+
+    it "injection should work" do
+      inject( 'service-registry' ).should_not be_nil
+    end
+  end
+
+end
+

metadata

@@ -2,7 +2,7 @@
 name: torquespec
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors: 
   - Jim Crossley
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-14 00:00:00 -04:00
+date: 2011-06-15 00:00:00 -04:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -66,6 +66,7 @@ files:
   - spec/empty_spec.rb
   - spec/guard_spec.rb
   - spec/hello_world_spec.rb
+  - spec/nested_remote_spec.rb
   - spec/remote_spec.rb
   - torquespec.gemspec
 has_rdoc: true
@@ -100,4 +101,5 @@ test_files:
   - spec/empty_spec.rb
   - spec/guard_spec.rb
   - spec/hello_world_spec.rb
+  - spec/nested_remote_spec.rb
   - spec/remote_spec.rb