torquespec 0.2.8 → 0.3.0

data/lib/torquespec/daemon.rb

@@ -65,11 +65,29 @@ module TorqueSpec
           DRb.stop_service
         end
       end
+      
+      def deploy_paths
+        descriptor = <<-END.gsub(/^ {10}/,'')
+          application:
+            root: #{TorqueSpec.app_root}
+          ruby:
+            version: #{RUBY_VERSION[0,3]}
+          services:
+            TorqueSpec::Daemon:
+              argv: #{TorqueSpec.argv}
+              pwd:  #{Dir.pwd}
+          environment:
+            RUBYLIB: #{TorqueSpec.rubylib}
+        END
+        [ DeploymentDescriptor.new(descriptor, display_name).path ]
+      end
 
     end
   end
 end
 
+# Reporters really only care about metadata, which is good since not
+# much else is serializable.
 module RSpec
   module Core
     class Example
@@ -93,3 +111,18 @@ class Proc
   def marshal_load *args
   end
 end
+
+# We want any Java exceptions tossed on the server to be passed back
+# to the Reporter on the client, and NativeExceptions have no
+# allocator, hence they're not marshalable.
+class NativeException
+  def _dump(*)
+    Marshal.dump( [cause, backtrace] )
+  end
+  def self._load(str)
+    exception, trace = Marshal.load(str)
+    meta = class << exception; self; end
+    meta.send(:define_method, :backtrace) { trace }
+    exception
+  end
+end

data/lib/torquespec/deployment_descriptor.rb

@@ -9,6 +9,7 @@ module TorqueSpec
       @descriptor = descriptor
       @path = Pathname.new( name.gsub(/\W/,'_') + "-knob.yml" ).expand_path( TorqueSpec.knob_root )
       @daemonify = daemonify
+      FileUtils.mkdir_p(TorqueSpec.knob_root) unless File.exist?(TorqueSpec.knob_root)
     end
     def path
       daemonify( hash || filename || heredoc )

data/lib/torquespec/torquespec.rb

@@ -7,7 +7,6 @@ module TorqueSpec
     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
       @deploy_paths = descriptors.map do |descriptor| 
@@ -44,6 +43,27 @@ module TorqueSpec
   def self.argv
     ( ARGV.empty? ? [ 'spec' ] : ARGV )
   end
+
+  # The location of an empty app used for deploying the daemon
+  def self.app_root
+    File.expand_path( File.join( File.dirname(__FILE__), "../..", "apps", "empty" ) )
+  end
+
+  # Whether we're running locally or in the daemon
+  def self.remote?
+    !!ENV['TORQUEBOX_APP_NAME']
+  end
+  
+  # Guard those things you only want to do in the container
+  def self.remote
+    yield if remote?
+  end
+  
+  # Guard those things you only want done locally
+  def self.local
+    yield unless remote?
+  end
+
 end
 
 # Default TorqueSpec options

data/lib/torquespec/version.rb

@@ -1,3 +1,3 @@
 module TorqueSpec
-  VERSION = "0.2.8"
+  VERSION = "0.3.0"
 end

data/spec/empty_spec.rb

@@ -0,0 +1,14 @@
+require 'torquespec'
+
+remote_describe "in-container tests without a deploy call" do
+
+  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
+

data/spec/guard_spec.rb

@@ -0,0 +1,20 @@
+require 'torquespec'
+
+remote_describe "remote guard test" do
+
+  it "should work" do
+    TorqueSpec.remote { true }.should be_true
+    TorqueSpec.local { true }.should be_false
+  end
+
+end
+
+describe "local guard test" do
+
+  it "should work" do
+    TorqueSpec.remote { true }.should be_false
+    TorqueSpec.local { true }.should be_true
+  end
+
+end
+

data/spec/remote_spec.rb

@@ -1,4 +1,5 @@
 require 'torquespec'
+require 'open-uri'
 
 remote_describe "in-container tests" do
 
@@ -7,6 +8,11 @@ remote_describe "in-container tests" do
       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
+
   it "should work" do
     require 'torquebox/messaging/queue'
     queue = TorqueBox::Messaging::Queue.start('/queues/foo', :jndi => "")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: torquespec
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 8
-  version: 0.2.8
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Jim Crossley
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-09 00:00:00 -04:00
+date: 2011-06-10 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,6 +60,7 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- apps/empty/torquebox.yml
 - apps/node-info.war
 - apps/simple.knob
 - apps/simple/config.ru
@@ -73,6 +74,8 @@ files:
 - lib/torquespec/server.rb
 - lib/torquespec/torquespec.rb
 - lib/torquespec/version.rb
+- spec/empty_spec.rb
+- spec/guard_spec.rb
 - spec/hello_world_spec.rb
 - spec/remote_spec.rb
 - torquespec.gemspec
@@ -111,5 +114,7 @@ signing_key:
 specification_version: 3
 summary: Deploy TorqueBox knobs to a running JBoss instance
 test_files: 
+- spec/empty_spec.rb
+- spec/guard_spec.rb
 - spec/hello_world_spec.rb
 - spec/remote_spec.rb