torquespec 0.2.0 → 0.2.1

data/lib/torque_spec/daemon.rb

@@ -0,0 +1 @@
+require 'torquespec/daemon'

data/lib/torquespec/daemon.rb

@@ -0,0 +1,75 @@
+require 'rspec/core'
+require 'drb'
+
+module TorqueSpec
+  class Daemon
+
+    def initialize(opts={})
+      puts "JC: create daemon opts=#{opts}"
+      @argv = opts['argv'].to_a
+
+      @options = RSpec::Core::ConfigurationOptions.new(@argv)
+      @options.parse_options
+
+      @configuration = RSpec::configuration
+      @world         = RSpec::world
+
+      @options.configure(@configuration)
+      @configuration.load_spec_files
+      @configuration.configure_mock_framework
+      @configuration.configure_expectation_framework
+    end
+
+    def start
+      puts "JC: start daemon"
+      DRb.start_service("druby://127.0.0.1:#{TorqueSpec.drb_port}", self)
+    end
+
+    def stop
+      puts "JC: stop daemon"
+      DRb.stop_service
+    end
+
+    def run(name, reporter)
+      puts "JC: run #{name}"
+      example_group = @world.example_groups.find { |g| g.name == name }
+      example_group.run( reporter )
+    end
+
+    # Intended to extend an RSpec::Core::ExampleGroup
+    module Client
+      # Delegate all examples (and nested groups) to remote daemon
+      def run_examples(reporter)
+        DRb.start_service("druby://127.0.0.1:0")
+        daemon = DRbObject.new_with_uri("druby://127.0.0.1:#{TorqueSpec.drb_port}")
+        begin
+          daemon.run( name, reporter )
+        rescue Exception
+          puts $!, $@
+        ensure
+          DRb.stop_service
+        end
+      end
+      # We have no nested groups locally, only remotely
+      def children
+        []
+      end
+    end
+  end
+end
+
+# We don't actually serialize Proc objects, but we prevent a TypeError
+# when an object containing a Proc is serialized, e.g. when an Example
+# is passed to a remote Reporter.  This works for us because the
+# Reporter doesn't use the Example's Proc objects.
+class Proc
+  def marshal_dump
+  end
+  def marshal_load *args
+  end
+  def _dump *args
+  end
+  def self._load *args
+    new {}
+  end
+end

data/lib/torquespec/rspec.rb

@@ -1,5 +1,3 @@
-require 'torquespec/server'
-
 begin
   # RSpec v2
   require 'rspec'
@@ -10,35 +8,64 @@ rescue Exception
   TorqueSpec::Configurator = Spec::Runner
 end
 
-# Global configuration
 TorqueSpec::Configurator.configure do |config|
-
   # Add :deploy method to ExampleGroups
   config.extend(TorqueSpec)
+end
 
-  config.before(:suite) do
-    Thread.current[:app_server] = TorqueSpec::Server.new
-    Thread.current[:app_server].start(:wait => 120)
+if ENV['TORQUEBOX_APP_NAME']
+  module TorqueSpec
+    def deploy(*descriptors)
+    end
   end
-  
-  config.before(:all) do
-    if self.class.respond_to?( :deploy_paths )
-      self.class.deploy_paths.each do |path|
-        Thread.current[:app_server].deploy(path)
+else
+  require 'torquespec/server'
+
+  TorqueSpec::Configurator.configure do |config|
+    config.before(:suite) do
+      Thread.current[:app_server] = TorqueSpec::Server.new
+      Thread.current[:app_server].start(:wait => 120)
+    end
+    
+    config.before(:all) do
+      if self.class.respond_to?( :deploy_paths )
+        self.class.deploy_paths.each do |path|
+          Thread.current[:app_server].deploy(path)
+        end
       end
     end
-  end
 
-  config.after(:all) do
-    if self.class.respond_to?( :deploy_paths )
-      self.class.deploy_paths.each do |path|
-        Thread.current[:app_server].undeploy(path)
+    config.after(:all) do
+      if self.class.respond_to?( :deploy_paths )
+        self.class.deploy_paths.each do |path|
+          Thread.current[:app_server].undeploy(path)
+        end
       end
     end
+
+    config.after(:suite) do
+      Thread.current[:app_server].stop
+    end
   end
+end
 
-  config.after(:suite) do
-    Thread.current[:app_server].stop
+require 'torquespec/daemon'
+
+module TorqueSpec
+  module ObjectExtensions
+    def remote_describe(*args, &example_group_block)
+      group = describe(*args, &example_group_block)
+      ENV['TORQUEBOX_APP_NAME'] ? group : group.extend( TorqueSpec::Daemon::Client )
+    end
   end
+end
+
+class Object
+  include TorqueSpec::ObjectExtensions
+end
 
+module TorqueSpec
+  def self.rubylib
+    Dir.glob(File.expand_path(File.join(File.dirname(__FILE__), "../../..", "*{spec,diff-lcs}*/lib"))).join(":")
+  end
 end

data/lib/torquespec/torquespec.rb

@@ -3,19 +3,21 @@ require 'torquespec/deployment_descriptor'
 module TorqueSpec
 
   # Accepts any combination of hashes, filenames, or heredocs
-  def deploy(*descriptors)
+  def deploy(*descriptors, &block)
     metaclass = class << self; self; end
     metaclass.send(:define_method, :deploy_paths) do
+      return @deploy_paths if @deploy_paths
       FileUtils.mkdir_p(TorqueSpec.knob_root) unless File.exist?(TorqueSpec.knob_root)
+      descriptors << block.call if block
       i = descriptors.size > 1 ? 0 : nil
-      descriptors.map do |descriptor| 
+      @deploy_paths = descriptors.map do |descriptor| 
         DeploymentDescriptor.new(descriptor, "#{self.display_name}#{i&&i-=1}").path
       end
     end
   end
 
   class << self
-    attr_accessor :knob_root, :jboss_home, :jvm_args, :max_heap, :lazy
+    attr_accessor :knob_root, :jboss_home, :jvm_args, :max_heap, :lazy, :drb_port
     def configure
       yield self
     end
@@ -31,8 +33,9 @@ end
 
 # Default TorqueSpec options
 TorqueSpec.configure do |config|
+  config.drb_port = 7772
   config.knob_root = ".torquespec"
   config.jboss_home = ENV['JBOSS_HOME']
-  config.jvm_args = "-Xms64m -Xmx1024m -XX:MaxPermSize=512m -XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:+CMSClassUnloadingEnabled -Djruby_home.env.ignore=true -Dgem.path=default"
+  config.jvm_args = "-Xms64m -Xmx1024m -XX:MaxPermSize=512m -XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:+CMSClassUnloadingEnabled -Dgem.path=default"
 end
 

data/lib/torquespec/version.rb

@@ -1,3 +1,3 @@
 module TorqueSpec
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/hello_world_spec.rb

@@ -5,7 +5,7 @@ TorqueSpec.lazy = false
 
 describe "simple knob deployment" do
   
-  deploy File.join( File.dirname(__FILE__), "../apps/simple.knob" )
+  deploy { File.join( File.dirname(__FILE__), "../apps/simple.knob" ) }
 
   it "should greet the world" do
     response = open("http://localhost:8080") {|f| f.read}

data/spec/remote_spec.rb

@@ -0,0 +1,24 @@
+require 'torquespec'
+
+remote_describe "in-container tests" do
+
+  deploy <<-END.gsub(/^ {4}/,'')
+    application:
+      root: #{File.dirname(__FILE__)}/../apps/simple
+    services:
+      TorqueSpec::Daemon:
+        argv: #{ARGV.map{|x|File.expand_path(x)}.inspect}
+    environment:
+      RUBYLIB: #{TorqueSpec.rubylib}
+  END
+
+  it "should work" do
+    require 'torquebox/messaging/queue'
+    queue = TorqueBox::Messaging::Queue.start('/queues/foo', :jndi => "")
+    queue.publish('bar')
+    queue.receive.should == 'bar'
+    queue.stop
+  end
+
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: torquespec
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Jim Crossley
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-23 00:00:00 -04:00
+date: 2011-06-05 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -63,15 +63,18 @@ files:
 - apps/node-info.war
 - apps/simple.knob
 - apps/simple/config.ru
+- lib/torque_spec/daemon.rb
 - lib/torquespec.rb
 - lib/torquespec/as6.rb
 - lib/torquespec/as7.rb
+- lib/torquespec/daemon.rb
 - lib/torquespec/deployment_descriptor.rb
 - lib/torquespec/rspec.rb
 - lib/torquespec/server.rb
 - lib/torquespec/torquespec.rb
 - lib/torquespec/version.rb
 - spec/hello_world_spec.rb
+- spec/remote_spec.rb
 - torquespec.gemspec
 has_rdoc: true
 homepage: http://github.com/torquebox/torquespec
@@ -109,3 +112,4 @@ specification_version: 3
 summary: Deploy TorqueBox knobs to a running JBoss instance
 test_files: 
 - spec/hello_world_spec.rb
+- spec/remote_spec.rb