cow 0.1.2 → 0.1.3

data/lib/cow.rb

@@ -7,9 +7,12 @@ require 'cow/plugins/cisco'
 
 module Cow
   SERVER_TYPES = {
-    acs: Cow::ACS::Server,
-    acs5000: Cow::ACS5000::Server,
-    acs6000: Cow::ACS6000::Server,
+    acs_telnet: Cow::ACS::Telnet::Server,
+    acs_ssh: Cow::ACS::SSH::Server,
+    acs5000_telnet: Cow::ACS5000::Telnet::Server,
+    acs5000_ssh: Cow::ACS5000::SSH::Server,
+    acs6000_telnet: Cow::ACS6000::Telnet::Server,
+    acs6000_ssh: Cow::ACS6000::SSH::Server,
     digi_ts_telnet: Cow::DIGI_TS::Telnet::Server,
     cisco_telnet: Cow::Cisco::Telnet::Server,
     cisco_ssh: Cow::Cisco::SSH::Server

data/lib/cow/plugins/acs.rb

@@ -9,18 +9,12 @@ module Cow
     class Port < Cow::Tmpl::Port
     end
 
-    class Server < Cow::Tmpl::Server
+    module Server
       def port(_port)
         return _port if _port.class == Cow::ACS::Port
         super
       end
 
-      def connect_command(_port, _user = ENV['USER'])
-        "ssh -l #{_user}:#{port(_port).tcp_port} #{@hostname}"
-      end
-
-      private
-
       def get_ports
         ret = []
         snmp do |s|
@@ -38,5 +32,25 @@ module Cow
         ret
       end
     end
+
+    module Telnet
+      class Server < Cow::Tmpl::Server
+        include Cow::ACS::Server
+
+        def connect_command(_port, _user = ENV['USER'])
+          "telnet #{@hostname} #{port(_port).tcp_port}"
+        end
+      end
+    end
+
+    module SSH
+      class Server < Cow::Tmpl::Server
+        include Cow::ACS::Server
+
+        def connect_command(_port, _user = ENV['USER'])
+          "ssh -l #{_user}:#{port(_port).tcp_port} #{@hostname}"
+        end
+      end
+    end
   end
 end

data/lib/cow/plugins/acs5000.rb

@@ -9,23 +9,18 @@ module Cow
     class Port < Cow::Tmpl::Port
     end
 
-    class Server < Cow::Tmpl::Server
+    module Server
       def port(_port)
         return _port if _port.class == Cow::ACS5000::Port
         super
       end
 
-      def connect_command(_port, _user = ENV['USER'])
-        "ssh -l #{_user}:#{port(_port).tcp_port} #{@hostname}"
-      end
-
-      private
-
       def get_ports
         ret = []
         snmp do |s|
           s.walk(OID_DESCRIPTION_LIST) do |x|
             next if x.name.last.zero?
+            next unless (/^[0-9a-f]{2}-[0-9a-f]{2}-[0-9a-f]{2}P[0-9]+$/ =~ x.value.to_s).nil?
             port = x.name.last
             name = x.value.to_s
             tcp_port = snmp { |s| break s.get_value(OID_TCPPORT_LIST + ".#{port}") }
@@ -37,5 +32,25 @@ module Cow
         ret
       end
     end
+
+    module Telnet
+      class Server < Cow::Tmpl::Server
+        include Cow::ACS5000::Server
+
+        def connect_command(_port, _user = ENV['USER'])
+          "telnet #{@hostname} #{port(_port).tcp_port}"
+        end
+      end
+    end
+
+    module SSH
+      class Server < Cow::Tmpl::Server
+        include Cow::ACS5000::Server
+
+        def connect_command(_port, _user = ENV['USER'])
+          "ssh -l #{_user}:#{port(_port).tcp_port} #{@hostname}"
+        end
+      end
+    end
   end
 end

data/lib/cow/plugins/acs6000.rb

@@ -9,23 +9,18 @@ module Cow
     class Port < Cow::Tmpl::Port
     end
 
-    class Server < Cow::Tmpl::Server
+    module Server
       def port(_port)
         return _port if _port.class == Cow::ACS6000::Port
         super
       end
 
-      def connect_command(_port, _user = ENV['USER'])
-        "ssh -l #{_user}:#{port(_port).tcp_port} #{@hostname}"
-      end
-
-      private
-
       def get_ports
         ret = []
         snmp do |s|
           s.walk(OID_DESCRIPTION_LIST) do |x|
             next if x.name.last.zero?
+            next unless (/^[0-9a-f]{2}-[0-9a-f]{2}-[0-9a-f]{2}-p-[0-9]+$/ =~ x.value.to_s).nil?
             port = x.name.last
             name = x.value.to_s
             tcp_port = TCP_PORT_OFFSET + port.to_i
@@ -37,5 +32,25 @@ module Cow
         ret
       end
     end
+
+    module Telnet
+      class Server < Cow::Tmpl::Server
+        include Cow::ACS6000::Server
+
+        def connect_command(_port, _user = ENV['USER'])
+          "telnet #{@hostname} #{port(_port).tcp_port}"
+        end
+      end
+    end
+
+    module SSH
+      class Server < Cow::Tmpl::Server
+        include Cow::ACS6000::Server
+
+        def connect_command(_port, _user = ENV['USER'])
+          "ssh -l #{_user}:#{port(_port).tcp_port} #{@hostname}"
+        end
+      end
+    end
   end
 end

data/lib/cow/version.rb

@@ -1,3 +1,3 @@
 module Cow
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cow
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-05 00:00:00.000000000 Z
+date: 2016-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler