Better transport type exception handling

git-svn-id: http://rspec-ext.rubyforge.org/svn/distributed/branches/multi_transport@17 b9fc4567-813f-4f01-94b2-355dee807878
aslakhellesoy · Dec 20, 2007 · 2e17557 · 2e17557
1 parent bdd4b58
commit 2e17557
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/lib/spec/distributed/distributed_spec_runner.rb b/lib/spec/distributed/distributed_spec_runner.rb
@@ -1,7 +1,5 @@
 module Spec
   module Distributed
-    class NoSuchTransportException < ArgumentError; end
-
     class DistributedSpecRunner < Spec::Runner::ExampleGroupRunner
       def initialize(options, args="")
         super(options)
@@ -10,7 +8,6 @@ def initialize(options, args="")
 
       def process_args(args)
         manager_class = TransportManager.manager_for(args)
-        raise NoSuchTransportException.new("No such transport_type #{args}") unless manager_class
         @transport_manager = manager_class.new
       end
 

diff --git a/lib/spec/distributed/transport_manager.rb b/lib/spec/distributed/transport_manager.rb
@@ -1,5 +1,6 @@
 module Spec
   module Distributed
+    class NoSuchTransportException < ArgumentError; end
     class TransportManager
 
       def self.inherited(klass)
@@ -8,19 +9,23 @@ def self.inherited(klass)
       end
 
       def self.subclasses_by_type
-        @subclasses_by_type ||= @subclasses.inject({}) do |hash, klass|
+        @subclasses.inject({}) do |hash, klass|
           begin
             hash[klass.transport_type] = klass
           rescue NoMethodError => e
-            @subclasses.delete(klass)
-            raise e
+            # munch
           end
           hash
         end
       end
 
       def self.manager_for(transport_type)
-        subclasses_by_type[transport_type]
+        transport_types = subclasses_by_type.keys
+        manager = subclasses_by_type[transport_type]
+        if manager.nil?
+          raise NoSuchTransportException.new("No known transport_type #{transport_type}. Known transport_types are #{transport_types.join(' ' )}")
+        end
+        manager
       end
     end
   end

diff --git a/spec/spec/distributed/transport_manager_spec.rb b/spec/spec/distributed/transport_manager_spec.rb
@@ -5,10 +5,10 @@ module Distributed
     describe TransportManager do
 
 # this passed under autotest, but fails under 'rake spec'      
-#      it "should force subclasses to implement #transport_type" do
-#        Class.new(TransportManager)
-#        lambda { TransportManager.manager_for("foo") }.should raise_error(NoMethodError)
-#      end
+      it "should force subclasses to implement #transport_type" do
+        Class.new(TransportManager)
+        lambda { TransportManager.manager_for("foo") }.should raise_error(NoSuchTransportException, /No known transport_type/)
+      end
 
       it "should map distribution methods to classes" do
         Class.new(TransportManager) do