hrr_rb_ssh 0.1.2 → 0.1.3

data/lib/hrr_rb_ssh/message/081_ssh_msg_request_success.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/logger'
+require 'hrr_rb_ssh/data_type'
 require 'hrr_rb_ssh/message/codable'
 
 module HrrRbSsh
@@ -15,14 +15,14 @@ module HrrRbSsh
       VALUE = 81
 
       DEFINITION = [
-        # [Data Type, Field Name]
-        ['byte',      'message number'],
+        #[DataType, Field Name]
+        [DataType::Byte,      'message number'],
       ]
 
       TCPIP_FORWARD_DEFINITION = [
-        # [Data Type, Field Name]
-        # ['string',  'request name' : "tcpip-forward"],
-        ['uint32',    'port that was bound on the server'],
+        #[DataType, Field Name]
+        #[DataType::String,   'request name' : "tcpip-forward"],
+        [DataType::Uint32,    'port that was bound on the server'],
       ]
 
       CONDITIONAL_DEFINITION = {

data/lib/hrr_rb_ssh/message/082_ssh_msg_request_failure.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/logger'
+require 'hrr_rb_ssh/data_type'
 require 'hrr_rb_ssh/message/codable'
 
 module HrrRbSsh
@@ -15,8 +15,8 @@ module HrrRbSsh
       VALUE = 82
 
       DEFINITION = [
-        # [Data Type, Field Name]
-        ['byte',      'message number'],
+        #[DataType, Field Name]
+        [DataType::Byte,      'message number'],
       ]
     end
   end

data/lib/hrr_rb_ssh/message/090_ssh_msg_channel_open.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/logger'
+require 'hrr_rb_ssh/data_type'
 require 'hrr_rb_ssh/message/codable'
 
 module HrrRbSsh
@@ -15,42 +15,42 @@ module HrrRbSsh
       VALUE = 90
 
       DEFINITION = [
-        # [Data Type, Field Name]
-        ['byte',      'message number'],
-        ['string',    'channel type'],
-        ['uint32',    'sender channel'],
-        ['uint32',    'initial window size'],
-        ['uint32',    'maximum packet size'],
+        #[DataType, Field Name]
+        [DataType::Byte,      'message number'],
+        [DataType::String,    'channel type'],
+        [DataType::Uint32,    'sender channel'],
+        [DataType::Uint32,    'initial window size'],
+        [DataType::Uint32,    'maximum packet size'],
       ]
 
       SESSION_DEFINITION = [
-        # [Data Type, Field Name]
-        # ['string',  'channel type' : "session"],
+        #[DataType, Field Name]
+        #[DataType::String,   'channel type' : "session"],
       ]
 
       X11_DEFINITION = [
-        # [Data Type, Field Name]
-        # ['string',  'channel type' : "x11"],
-        ['string',    'originator address'],
-        ['uint32',    'originator port'],
+        #[DataType, Field Name]
+        #[DataType::String,   'channel type' : "x11"],
+        [DataType::String,    'originator address'],
+        [DataType::Uint32,    'originator port'],
       ]
 
       FORWARDED_TCPIP_DEFINITION = [
-        # [Data Type, Field Name]
-        # ['string',  'channel type' : "forwarded-tcpip"],
-        ['string',    'address that was connected'],
-        ['uint32',    'port that was connected'],
-        ['string',    'originator IP address'],
-        ['uint32',    'originator port'],
+        #[DataType, Field Name]
+        #[DataType::String,   'channel type' : "forwarded-tcpip"],
+        [DataType::String,    'address that was connected'],
+        [DataType::Uint32,    'port that was connected'],
+        [DataType::String,    'originator IP address'],
+        [DataType::Uint32,    'originator port'],
       ]
 
       DIRECT_TCPIP_DEFINITION = [
-        # [Data Type, Field Name]
-        # ['string',  'channel type' : "direct-tcpip"],
-        ['string',    'host to connect'],
-        ['uint32',    'port to connect'],
-        ['string',    'originator IP address'],
-        ['uint32',    'originator port'],
+        #[DataType, Field Name]
+        #[DataType::String,   'channel type' : "direct-tcpip"],
+        [DataType::String,    'host to connect'],
+        [DataType::Uint32,    'port to connect'],
+        [DataType::String,    'originator IP address'],
+        [DataType::Uint32,    'originator port'],
       ]
 
       CONDITIONAL_DEFINITION = {

data/lib/hrr_rb_ssh/message/091_ssh_msg_channel_open_confirmation.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/logger'
+require 'hrr_rb_ssh/data_type'
 require 'hrr_rb_ssh/message/codable'
 
 module HrrRbSsh
@@ -15,42 +15,42 @@ module HrrRbSsh
       VALUE = 91
 
       DEFINITION = [
-        # [Data Type, Field Name]
-        ['byte',      'message number'],
-        ['uint32',    'recipient channel'],
-        ['uint32',    'sender channel'],
-        ['uint32',    'initial window size'],
-        ['uint32',    'maximum packet size'],
+        #[DataType, Field Name]
+        [DataType::Byte,      'message number'],
+        [DataType::Uint32,    'recipient channel'],
+        [DataType::Uint32,    'sender channel'],
+        [DataType::Uint32,    'initial window size'],
+        [DataType::Uint32,    'maximum packet size'],
       ]
 
       SESSION_DEFINITION = [
-        # [Data Type, Field Name]
-        # ['string',  'channel type' : "session"],
+        #[DataType, Field Name]
+        #[DataType::String,   'channel type' : "session"],
       ]
 
       X11_DEFINITION = [
-        # [Data Type, Field Name]
-        # ['string',  'channel type' : "x11"],
-        ['string',    'originator address'],
-        ['uint32',    'originator port'],
+        #[DataType, Field Name]
+        #[DataType::String,   'channel type' : "x11"],
+        [DataType::String,    'originator address'],
+        [DataType::Uint32,    'originator port'],
       ]
 
       FORWARDED_TCPIP_DEFINITION = [
-        # [Data Type, Field Name]
-        # ['string',  'channel type' : "forwarded-tcpip"],
-        ['string',    'address that was connected'],
-        ['uint32',    'port that was connected'],
-        ['string',    'originator IP address'],
-        ['uint32',    'originator port'],
+        #[DataType, Field Name]
+        #[DataType::String,   'channel type' : "forwarded-tcpip"],
+        [DataType::String,    'address that was connected'],
+        [DataType::Uint32,    'port that was connected'],
+        [DataType::String,    'originator IP address'],
+        [DataType::Uint32,    'originator port'],
       ]
 
       DIRECT_TCPIP_DEFINITION = [
-        # [Data Type, Field Name]
-        # ['string',  'channel type' : "direct-tcpip"],
-        ['string',    'host to connect'],
-        ['uint32',    'port to connect'],
-        ['string',    'originator IP address'],
-        ['uint32',    'originator port'],
+        #[DataType, Field Name]
+        #[DataType::String,   'channel type' : "direct-tcpip"],
+        [DataType::String,    'host to connect'],
+        [DataType::Uint32,    'port to connect'],
+        [DataType::String,    'originator IP address'],
+        [DataType::Uint32,    'originator port'],
       ]
 
       CONDITIONAL_DEFINITION = {

data/lib/hrr_rb_ssh/message/092_ssh_msg_channel_open_failure.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/logger'
+require 'hrr_rb_ssh/data_type'
 require 'hrr_rb_ssh/message/codable'
 
 module HrrRbSsh
@@ -22,12 +22,12 @@ module HrrRbSsh
       VALUE = 92
 
       DEFINITION = [
-        # [Data Type, Field Name]
-        ['byte',      'message number'],
-        ['uint32',    'recipient channel'],
-        ['uint32',    'reason code'],
-        ['string',    'description'],
-        ['string',    'language tag'],
+        #[DataType, Field Name]
+        [DataType::Byte,      'message number'],
+        [DataType::Uint32,    'recipient channel'],
+        [DataType::Uint32,    'reason code'],
+        [DataType::String,    'description'],
+        [DataType::String,    'language tag'],
       ]
     end
   end

data/lib/hrr_rb_ssh/message/093_ssh_msg_channel_window_adjust.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/logger'
+require 'hrr_rb_ssh/data_type'
 require 'hrr_rb_ssh/message/codable'
 
 module HrrRbSsh
@@ -15,10 +15,10 @@ module HrrRbSsh
       VALUE = 93
 
       DEFINITION = [
-        # [Data Type, Field Name]
-        ['byte',      'message number'],
-        ['uint32',    'recipient channel'],
-        ['uint32',    'bytes to add'],
+        #[DataType, Field Name]
+        [DataType::Byte,      'message number'],
+        [DataType::Uint32,    'recipient channel'],
+        [DataType::Uint32,    'bytes to add'],
       ]
     end
   end

data/lib/hrr_rb_ssh/message/094_ssh_msg_channel_data.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/logger'
+require 'hrr_rb_ssh/data_type'
 require 'hrr_rb_ssh/message/codable'
 
 module HrrRbSsh
@@ -15,10 +15,10 @@ module HrrRbSsh
       VALUE = 94
 
       DEFINITION = [
-        # [Data Type, Field Name]
-        ['byte',      'message number'],
-        ['uint32',    'recipient channel'],
-        ['string',    'data'],
+        #[DataType, Field Name]
+        [DataType::Byte,      'message number'],
+        [DataType::Uint32,    'recipient channel'],
+        [DataType::String,    'data'],
       ]
     end
   end

data/lib/hrr_rb_ssh/message/095_ssh_msg_channel_extended_data.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/logger'
+require 'hrr_rb_ssh/data_type'
 require 'hrr_rb_ssh/message/codable'
 
 module HrrRbSsh
@@ -19,11 +19,11 @@ module HrrRbSsh
       VALUE = 95
 
       DEFINITION = [
-        # [Data Type, Field Name]
-        ['byte',      'message number'],
-        ['uint32',    'recipient channel'],
-        ['uint32',    'data type code'],
-        ['string',    'data'],
+        #[DataType, Field Name]
+        [DataType::Byte,      'message number'],
+        [DataType::Uint32,    'recipient channel'],
+        [DataType::Uint32,    'data type code'],
+        [DataType::String,    'data'],
       ]
     end
   end

data/lib/hrr_rb_ssh/message/096_ssh_msg_channel_eof.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/logger'
+require 'hrr_rb_ssh/data_type'
 require 'hrr_rb_ssh/message/codable'
 
 module HrrRbSsh
@@ -15,9 +15,9 @@ module HrrRbSsh
       VALUE = 96
 
       DEFINITION = [
-        # [Data Type, Field Name]
-        ['byte',      'message number'],
-        ['uint32',    'recipient channel'],
+        #[DataType, Field Name]
+        [DataType::Byte,      'message number'],
+        [DataType::Uint32,    'recipient channel'],
       ]
     end
   end

data/lib/hrr_rb_ssh/message/097_ssh_msg_channel_close.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/logger'
+require 'hrr_rb_ssh/data_type'
 require 'hrr_rb_ssh/message/codable'
 
 module HrrRbSsh
@@ -15,9 +15,9 @@ module HrrRbSsh
       VALUE = 97
 
       DEFINITION = [
-        # [Data Type, Field Name]
-        ['byte',      'message number'],
-        ['uint32',    'recipient channel'],
+        #[DataType, Field Name]
+        [DataType::Byte,      'message number'],
+        [DataType::Uint32,    'recipient channel'],
       ]
     end
   end

data/lib/hrr_rb_ssh/message/098_ssh_msg_channel_request.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/logger'
+require 'hrr_rb_ssh/data_type'
 require 'hrr_rb_ssh/message/codable'
 
 module HrrRbSsh
@@ -31,91 +31,91 @@ module HrrRbSsh
       VALUE = 98
 
       DEFINITION = [
-        # [Data Type, Field Name]
-        ['byte',      'message number'],
-        ['uint32',    'recipient channel'],
-        ['string',    'request type'],
-        ['boolean',   'want reply'],
+        #[DataType, Field Name]
+        [DataType::Byte,      'message number'],
+        [DataType::Uint32,    'recipient channel'],
+        [DataType::String,    'request type'],
+        [DataType::Boolean,   'want reply'],
       ]
 
       PTY_REQ_DEFINITION = [
-        # [Data Type, Field Name]
-        # ['string',  'request type' : "pty-req"],
-        ['string',    'TERM environment variable value'],
-        ['uint32',    'terminal width, characters'],
-        ['uint32',    'terminal height, rows'],
-        ['uint32',    'terminal width, pixels'],
-        ['uint32',    'terminal height, pixels'],
-        ['string',    'encoded terminal modes'],
+        #[DataType, Field Name]
+        #[DataType::String,   'request type' : "pty-req"],
+        [DataType::String,    'TERM environment variable value'],
+        [DataType::Uint32,    'terminal width, characters'],
+        [DataType::Uint32,    'terminal height, rows'],
+        [DataType::Uint32,    'terminal width, pixels'],
+        [DataType::Uint32,    'terminal height, pixels'],
+        [DataType::String,    'encoded terminal modes'],
       ]
 
       X11_REQ_DEFINITION = [
-        # [Data Type, Field Name]
-        # ['string',  'request type' : "x11-req"],
-        ['boolean',   'single connection'],
-        ['string',    'x11 authentication protocol'],
-        ['string',    'x11 authentication cookie'],
-        ['uint32',    'x11 screen number'],
+        #[DataType, Field Name]
+        #[DataType::String,   'request type' : "x11-req"],
+        [DataType::Boolean,   'single connection'],
+        [DataType::String,    'x11 authentication protocol'],
+        [DataType::String,    'x11 authentication cookie'],
+        [DataType::Uint32,    'x11 screen number'],
       ]
 
       ENV_DEFINITION = [
-        # [Data Type, Field Name]
-        # ['string',  'request type' : "env"],
-        ['string',    'variable name'],
-        ['string',    'variable value'],
+        #[DataType, Field Name]
+        #[DataType::String,   'request type' : "env"],
+        [DataType::String,    'variable name'],
+        [DataType::String,    'variable value'],
       ]
 
       SHELL_DEFINITION = [
-        # [Data Type, Field Name]
-        # ['string',  'request type' : "shell"],
+        #[DataType, Field Name]
+        #[DataType::String,   'request type' : "shell"],
       ]
 
       EXEC_DEFINITION = [
-        # [Data Type, Field Name]
-        # ['string',  'request type' : "exec"],
-        ['string',    'command'],
+        #[DataType, Field Name]
+        #[DataType::String,   'request type' : "exec"],
+        [DataType::String,    'command'],
       ]
 
       SUBSYSTEM_DEFINITION = [
-        # [Data Type, Field Name]
-        # ['string',  'request type' : "subsystem"],
-        ['string',    'subsystem name'],
+        #[DataType, Field Name]
+        #[DataType::String,   'request type' : "subsystem"],
+        [DataType::String,    'subsystem name'],
       ]
 
       WINDOW_CHANGE_DEFINITION = [
-        # [Data Type, Field Name]
-        # ['string',  'request type' : "window-change"],
-        ['uint32',    'terminal width, columns'],
-        ['uint32',    'terminal height, rows'],
-        ['uint32',    'terminal width, pixels'],
-        ['uint32',    'terminal height, pixels'],
+        #[DataType, Field Name]
+        #[DataType::String,   'request type' : "window-change"],
+        [DataType::Uint32,    'terminal width, columns'],
+        [DataType::Uint32,    'terminal height, rows'],
+        [DataType::Uint32,    'terminal width, pixels'],
+        [DataType::Uint32,    'terminal height, pixels'],
       ]
 
       XON_XOFF_DEFINITION = [
-        # [Data Type, Field Name]
-        # ['string',  'request type' : "xon-xoff"],
-        ['boolean',   'client can do'],
+        #[DataType, Field Name]
+        #[DataType::String,   'request type' : "xon-xoff"],
+        [DataType::Boolean,   'client can do'],
       ]
 
       SIGNAL_DEFINITION = [
-        # [Data Type, Field Name]
-        # ['string',  'request type' : "signal"],
-        ['string',    'signal name'],
+        #[DataType, Field Name]
+        #[DataType::String,   'request type' : "signal"],
+        [DataType::String,    'signal name'],
       ]
 
       EXIT_STATUS_DEFINITION = [
-        # [Data Type, Field Name]
-        # ['string',  'request type' : "exit-status"],
-        ['uint32',    'exit status'],
+        #[DataType, Field Name]
+        #[DataType::String,   'request type' : "exit-status"],
+        [DataType::Uint32,    'exit status'],
       ]
 
       EXIT_SIGNAL_DEFINITION = [
-        # [Data Type, Field Name]
-        # ['string',  'request type' : "exit-signal"],
-        ['string',    'signal name'],
-        ['boolean',   'core dumped'],
-        ['string',    'error message'],
-        ['string',    'language tag'],
+        #[DataType, Field Name]
+        #[DataType::String,   'request type' : "exit-signal"],
+        [DataType::String,    'signal name'],
+        [DataType::Boolean,   'core dumped'],
+        [DataType::String,    'error message'],
+        [DataType::String,    'language tag'],
       ]
 
       CONDITIONAL_DEFINITION = {

data/lib/hrr_rb_ssh/message/099_ssh_msg_channel_success.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/logger'
+require 'hrr_rb_ssh/data_type'
 require 'hrr_rb_ssh/message/codable'
 
 module HrrRbSsh
@@ -15,9 +15,9 @@ module HrrRbSsh
       VALUE = 99
 
       DEFINITION = [
-        # [Data Type, Field Name]
-        ['byte',      'message number'],
-        ['uint32',    'recipient channel'],
+        #[DataType, Field Name]
+        [DataType::Byte,      'message number'],
+        [DataType::Uint32,    'recipient channel'],
       ]
     end
   end

data/lib/hrr_rb_ssh/message/100_ssh_msg_channel_failure.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/logger'
+require 'hrr_rb_ssh/data_type'
 require 'hrr_rb_ssh/message/codable'
 
 module HrrRbSsh
@@ -15,9 +15,9 @@ module HrrRbSsh
       VALUE = 100
 
       DEFINITION = [
-        # [Data Type, Field Name]
-        ['byte',      'message number'],
-        ['uint32',    'recipient channel'],
+        #[DataType, Field Name]
+        [DataType::Byte,      'message number'],
+        [DataType::Uint32,    'recipient channel'],
       ]
     end
   end

data/lib/hrr_rb_ssh/message/codable.rb

@@ -2,7 +2,6 @@
 # vim: et ts=2 sw=2
 
 require 'hrr_rb_ssh/logger'
-require 'hrr_rb_ssh/transport/data_type'
 
 module HrrRbSsh
   module Message
@@ -28,7 +27,7 @@ module HrrRbSsh
         definition = common_definition + conditional_definition(message.merge complementary_message)
         definition.map{ |data_type, field_name|
           field_value = if message[field_name].instance_of? ::Proc then message[field_name].call else message[field_name] end
-          HrrRbSsh::Transport::DataType[data_type].encode( field_value )
+          data_type.encode( field_value )
         }.join
       end
 
@@ -46,7 +45,7 @@ module HrrRbSsh
             decoded_message = definition.map{ |data_type, field_name|
               [
                 field_name,
-                HrrRbSsh::Transport::DataType[data_type].decode( payload_io )
+                data_type.decode( payload_io )
               ]
             }
 

data/lib/hrr_rb_ssh/subclass_with_preference_listable.rb

@@ -0,0 +1,29 @@
+# coding: utf-8
+# vim: et ts=2 sw=2
+
+module HrrRbSsh
+  module SubclassWithPreferenceListable
+    def inherited klass
+      @subclass_list.push klass if @subclass_list
+    end
+
+    def [] key
+      __subclass_list__(__method__).find{ |klass| klass::NAME == key }
+    end
+
+    def list_supported
+      __subclass_list__(__method__).map{ |klass| klass::NAME }
+    end
+
+    def list_preferred
+      __subclass_list__(__method__).select{ |klass| klass::PREFERENCE > 0 }.sort_by{ |klass| klass::PREFERENCE }.reverse.map{ |klass| klass::NAME }
+    end
+
+    def __subclass_list__ method_name
+      send(:method_missing, method_name) unless @subclass_list
+      @subclass_list
+    end
+
+    private :__subclass_list__
+  end
+end

data/lib/hrr_rb_ssh/transport/compression_algorithm/functionable.rb

@@ -2,18 +2,18 @@
 # vim: et ts=2 sw=2
 
 require 'zlib'
+require 'hrr_rb_ssh/logger'
 
 module HrrRbSsh
   class Transport
     class CompressionAlgorithm
       module Functionable
         def initialize direction
-          super
-
+          @logger = HrrRbSsh::Logger.new(self.class.name)
           case direction
-          when HrrRbSsh::Transport::Direction::OUTGOING
+          when Direction::OUTGOING
             @deflator = ::Zlib::Deflate.new
-          when HrrRbSsh::Transport::Direction::INCOMING
+          when Direction::INCOMING
             @inflator = ::Zlib::Inflate.new
           end
         end

data/lib/hrr_rb_ssh/transport/compression_algorithm/none.rb

@@ -1,7 +1,6 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/transport/compression_algorithm/compression_algorithm'
 require 'hrr_rb_ssh/transport/compression_algorithm/unfunctionable'
 
 module HrrRbSsh
@@ -9,11 +8,7 @@ module HrrRbSsh
     class CompressionAlgorithm
       class None < CompressionAlgorithm
         NAME = 'none'
-
-        def initialize direction=nil
-          super
-        end
-
+        PREFERENCE = 20
         include Unfunctionable
       end
     end