Merge pull request #182 from SciRuby/change_adapter_priority

Change zeromq adapter priority

Author: mrkn

lib/iruby.rb

@@ -19,15 +19,15 @@
 if ENV.fetch('IRUBY_OLD_SESSION', false)
   require 'iruby/session/mixin'
   begin
-    require 'iruby/session/cztop'
+    require 'iruby/session/ffi_rzmq'
   rescue LoadError
     begin
-      require 'iruby/session/ffi_rzmq'
+      require 'iruby/session/cztop'
     rescue LoadError
       begin
         require 'iruby/session/rbczmq'
       rescue LoadError
-        STDERR.puts "You should install cztop, rbczmq or ffi_rzmq before running iruby notebook. See README."
+        STDERR.puts "You should install ffi-rzmq, cztop, or rbczmq before running iruby notebook. See README."
       end
     end
   end

lib/iruby/session_adapter.rb

@@ -34,16 +34,16 @@ def make_rep_socket(protocol, host, port)
       end
     end
 
-    require_relative 'session_adapter/rbczmq_adapter'
-    require_relative 'session_adapter/cztop_adapter'
     require_relative 'session_adapter/ffirzmq_adapter'
+    require_relative 'session_adapter/cztop_adapter'
+    require_relative 'session_adapter/rbczmq_adapter'
     require_relative 'session_adapter/pyzmq_adapter'
 
     def self.select_adapter_class(name=nil)
       classes = {
-        'rbczmq' => SessionAdapter::RbczmqAdapter,
-        'cztop' => SessionAdapter::CztopAdapter,
         'ffi-rzmq' => SessionAdapter::FfirzmqAdapter,
+        'cztop' => SessionAdapter::CztopAdapter,
+        'rbczmq' => SessionAdapter::RbczmqAdapter,
         'pyzmq' => SessionAdapter::PyzmqAdapter
       }
       if (name ||= ENV.fetch('IRUBY_SESSION_ADAPTER', nil))