torquespec 0.2.5 → 0.2.6

data/Rakefile

@@ -1,2 +1,7 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/lib/torquespec/daemon.rb

@@ -39,10 +39,21 @@ module TorqueSpec
 
     # Intended to extend an RSpec::Core::ExampleGroup
     module Client
+
+      def run(reporter)
+        begin
+          eval_before_alls(new)
+          run_remotely(reporter)
+        ensure
+          eval_after_alls(new)
+        end
+      end
+
       # Delegate all examples (and nested groups) to remote daemon
-      def run_examples(reporter)
+      def run_remotely(reporter)
         DRb.start_service("druby://127.0.0.1:0")
         daemon = DRbObject.new_with_uri("druby://127.0.0.1:#{TorqueSpec.drb_port}")
+        # TODO: maybe fall back to local if can't run?
         begin
           daemon.run( name, reporter )
         rescue Exception
@@ -51,9 +62,19 @@ module TorqueSpec
           DRb.stop_service
         end
       end
-      # We have no nested groups locally, only remotely
-      def children
-        []
+
+    end
+  end
+end
+
+module RSpec
+  module Core
+    class Example
+      def marshal_dump
+        @metadata
+      end
+      def marshal_load metadata
+        @metadata = metadata
       end
     end
   end
@@ -68,9 +89,4 @@ class Proc
   end
   def marshal_load *args
   end
-  def _dump *args
-  end
-  def self._load *args
-    new {}
-  end
 end

data/lib/torquespec/torquespec.rb

@@ -30,10 +30,20 @@ module TorqueSpec
   end
 
   # A somewhat hackish way of exposing client-side gems to the server-side daemon
+  #
+  # TODO: Fix it so I don't include old versions of TorqueSpec
+  #
   def self.rubylib
     Dir.glob(File.expand_path(File.join(File.dirname(__FILE__), "../../..", "*{spec,diff-lcs}*/lib"))).join(":")
   end
-  # The way client-side specs are passed to the daemon
+
+  # The way client-side specs are passed to the daemon 
+  #
+  # TODO: This won't work because we need to pass ARGV to the daemon,
+  # and we can't just map its items to their expanded path, e.g. -l
+  # 42, so we must pass (ARGV || spec) and Dir.pwd so that the daemon
+  # may initialize itself within that directory.
+  #
   def self.specs
     RSpec::configuration.files_to_run.map {|f| File.expand_path(f) }.inspect
   end

data/lib/torquespec/version.rb

@@ -1,3 +1,3 @@
 module TorqueSpec
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/spec/remote_spec.rb

@@ -20,5 +20,15 @@ remote_describe "in-container tests" do
     queue.stop
   end
 
+  context "nested example group" do
+    it "should work" do
+      true.should be_true
+    end
+
+    it "should also work" do
+      false.should be_false
+    end
+  end
+
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: torquespec
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 2
-  - 5
-  version: 0.2.5
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - Jim Crossley
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-07 00:00:00 -04:00
+date: 2011-06-08 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency