closes #55 Fix require of stream protocol

BallAerospace · Feb 12, 2015 · bde12fa · bde12fa
1 parent f4070ee
commit bde12fa
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 36 deletions.
diff --git a/lib/cosmos.rb b/lib/cosmos.rb
@@ -40,7 +40,7 @@
 saved_verbose = $VERBOSE; $VERBOSE = nil
 begin
   require 'dl'
-rescue LoadError
+rescue Exception
 end
 $VERBOSE = saved_verbose
 
@@ -58,6 +58,6 @@
 
 begin
   require 'user_version'
-rescue LoadError
+rescue Exception
   # Not defined
 end
diff --git a/lib/cosmos/interfaces/stream_interface.rb b/lib/cosmos/interfaces/stream_interface.rb
@@ -34,27 +34,7 @@ def initialize(stream_protocol_type, *stream_protocol_args)
       super()
 
       stream_protocol_class = stream_protocol_type.to_s.capitalize << 'StreamProtocol'
-      klass = stream_protocol_class.to_class
-      unless klass
-        begin
-          require stream_protocol_class.class_name_to_filename
-        # If the stream protocol doesn't exist require will throw a LoadError
-        rescue LoadError => err
-          msg = "Unable to require " \
-            "#{stream_protocol_class.class_name_to_filename} due to #{err.message}. " \
-            "Ensure #{stream_protocol_class.class_name_to_filename} "\
-            "is in the COSMOS lib directory."
-          Logger.instance.error msg
-          raise msg
-        # If the stream protocol exists but has problems we rescue those here
-        rescue => err
-          msg = "Unable to require " \
-            "#{stream_protocol_class.class_name_to_filename} due to #{err.message}."
-          Logger.instance.error msg
-          raise msg
-        end
-      end
-
+      klass = Cosmos.require_class(stream_protocol_class.class_name_to_filename)
       @stream_protocol = klass.new(*stream_protocol_args)
       @stream_protocol.interface = self
     end

diff --git a/lib/cosmos/io/tcpip_server.rb b/lib/cosmos/io/tcpip_server.rb
@@ -70,17 +70,7 @@ def initialize(write_port,
       @read_timeout = @read_timeout.to_f if @read_timeout
 
       stream_protocol_class = stream_protocol_type.to_s.capitalize << 'StreamProtocol'
-      @stream_protocol_class = stream_protocol_class.to_class
-      unless @stream_protocol_class
-        begin
-          require "cosmos/streams/#{stream_protocol_class.class_name_to_filename}"
-          @stream_protocol_class = stream_protocol_class.to_class
-        rescue LoadError => err
-          Logger.instance.error "Unable to require #{stream_protocol_class.class_name_to_filename} due to #{err.message}. Ensure #{stream_protocol_class.class_name_to_filename} is in the COSMOS lib directory."
-          raise "Unable to require #{stream_protocol_class.class_name_to_filename} due to #{err.message}. Ensure #{stream_protocol_class.class_name_to_filename} is in the COSMOS lib directory."
-        end
-      end
-
+      @stream_protocol_class = Cosmos.require_class(stream_protocol_class.class_name_to_filename)
       @stream_protocol_args = stream_protocol_args
 
       @listen_sockets = []

diff --git a/lib/cosmos/system/target.rb b/lib/cosmos/system/target.rb
@@ -136,7 +136,7 @@ def process_file(filename)
           parser.verify_num_parameters(1, 1, usage)
           begin
             require parameters[0]
-          rescue LoadError => err
+          rescue Exception => err
             msg = "Unable to require #{parameters[0]} due to #{err.message}. " +
               "Ensure #{parameters[0]} is in the COSMOS lib directory."
             Logger.instance.error msg

diff --git a/lib/cosmos/top_level.rb b/lib/cosmos/top_level.rb
@@ -529,7 +529,7 @@ def self.require_class(class_filename)
     return class_name.to_class if class_name.to_class and defined? class_name.to_class
     begin
       require class_filename
-    rescue LoadError => err
+    rescue Exception => err
       msg = "Unable to require #{class_filename} due to #{err.message}. Ensure #{class_filename} is in the COSMOS lib directory."
       Logger.error msg
       raise msg