cow 0.1.1 → 0.1.2

data/README.md

@@ -20,18 +20,19 @@ Type `cow`. Then you can see usage.
 
 ```
 $ cow list
-console.local/1        -       tokyo-core01     |       ssh -l kazubu:7001 console.local
-console.local/2        -       tokyo-core02     |       ssh -l kazubu:7002 console.local
-console.local/3        -       tokyo-sw01       |       ssh -l kazubu:7003 console.local
-console.local/4        -       tokyo-sw02       |       ssh -l kazubu:7004 console.local
-console.local/5        -       tokyo-serv01     |       ssh -l kazubu:7005 console.local
-console.local/6        -       tokyo-serv02     |       ssh -l kazubu:7006 console.local
-console.local/7        -       tokyo-serv03     |       ssh -l kazubu:7007 console.local
-console.local/8        -       0F-B3-10P08      |       ssh -l kazubu:7008 console.local
+SERVER/PORT                    PORTNAME             COMMAND
+console.local/1                tokyo-core01         ssh -l kazubu:7001 console.local
+console.local/2                tokyo-core02         ssh -l kazubu:7002 console.local
+console.local/3                tokyo-sw01           ssh -l kazubu:7003 console.local
+console.local/4                tokyo-sw02           ssh -l kazubu:7004 console.local
+console.local/5                tokyo-serv01         ssh -l kazubu:7005 console.local
+console.local/6                tokyo-serv02         ssh -l kazubu:7006 console.local
+console.local/7                tokyo-serv03         ssh -l kazubu:7007 console.local
 
 $ cow find core
-console.local/1        -       tokyo-core01     |       ssh -l kazubu:7001 console.local
-console.local/2        -       tokyo-core02     |       ssh -l kazubu:7002 console.local
+SERVER/PORT                    PORTNAME             COMMAND
+console.local/1                tokyo-core01         ssh -l kazubu:7001 console.local
+console.local/2                tokyo-core02         ssh -l kazubu:7002 console.local
 
 $ cow connect tokyo-core01
 Found on console.local/1. Connecting...

data/bin/console

@@ -1,14 +1,14 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "cow"
+require 'bundler/setup'
+require 'cow'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
 
 # (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
+# require 'pry'
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start

data/cow.gemspec

@@ -4,29 +4,21 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'cow/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "cow"
+  spec.name          = 'cow'
   spec.version       = Cow::VERSION
-  spec.authors       = ["Kazuki Shimizu"]
-  spec.email         = ["kazubu@kazubu.jp"]
+  spec.authors       = ['Kazuki Shimizu']
+  spec.email         = ['kazubu@kazubu.jp']
 
   spec.summary       = %q{Console server Wrapper}
   spec.description   = %q{Ease to connect console server ports}
-  spec.homepage      = "https://www.kazubu.jp/"
-
-  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
-  # to allow pushing to a single host or delete this section to allow pushing to any host.
-  #if spec.respond_to?(:metadata)
-  #  spec.metadata['allowed_push_host'] = "TODO: Set to 'http://mygemserver.com'"
-  #else
-  #  raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
-  #end
+  spec.homepage      = 'https://github.com/kazubu/cow/'
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 1.12"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency 'bundler', '~> 1.12'
+  spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_dependency 'snmp'
 end

data/lib/cow.rb

@@ -1,9 +1,9 @@
-require "cow/version"
-require "cow/plugins/acs"
-require "cow/plugins/acs5000"
-require "cow/plugins/acs6000"
-require "cow/plugins/digi_ts"
-require "cow/plugins/cisco"
+require 'cow/version'
+require 'cow/plugins/acs'
+require 'cow/plugins/acs5000'
+require 'cow/plugins/acs6000'
+require 'cow/plugins/digi_ts'
+require 'cow/plugins/cisco'
 
 module Cow
   SERVER_TYPES = {
@@ -13,5 +13,5 @@ module Cow
     digi_ts_telnet: Cow::DIGI_TS::Telnet::Server,
     cisco_telnet: Cow::Cisco::Telnet::Server,
     cisco_ssh: Cow::Cisco::SSH::Server
-  }
+  }.freeze
 end

data/lib/cow/application.rb

@@ -11,19 +11,19 @@ module Cow
       end
 
       def add_server(_server)
-        @servers.each_with_index{|server, idx|
+        @servers.each_with_index do |server, idx|
           if server.hostname == _server.hostname
             @servers[idx] = _server
             return _server
           end
-        }
+        end
 
         @servers << _server
       end
 
     end
 
-    CACHE_FILE = '/var/cache/cow/cow.cache'
+    CACHE_FILE = '/var/cache/cow/cow.cache'.freeze
 
     @cache = nil
 
@@ -64,7 +64,7 @@ module Cow
 
       File.open(_cache, 'w') do |file|
         puts 'Updating cache file.'
-        if file.flock(File::LOCK_EX|File::LOCK_NB)
+        if file.flock(File::LOCK_EX | File::LOCK_NB)
 
           begin
             yield cache
@@ -117,7 +117,7 @@ module Cow
       server = Cow::SERVER_TYPES[_type.to_sym].new(_hostname, _snmp_community)
 
       server.ports.each do |port|
-        puts "%s %s" % ["#{server.hostname.to_s}/#{port.port.to_s}".ljust(30), port.name.to_s.ljust(20) ]
+        puts '%s %s' % ["#{server.hostname}/#{port.port}".ljust(30), port.name.to_s.ljust(20)]
       end
 
       load_cache
@@ -137,8 +137,8 @@ module Cow
           if port.name == _portname
             puts "Found on #{server.hostname}/#{port.port}. Connecting..."
             server.connect(port)
+            break
           end
-          return
         end
       end
     end
@@ -147,23 +147,23 @@ module Cow
       raise ArgumentError unless _keyword.class == String
 
       load_cache
-      puts "%s %s %s" % ["SERVER/PORT".ljust(30), "PORTNAME".ljust(20), "COMMAND"]
+      puts '%s %s %s' % ['SERVER/PORT'.ljust(30), 'PORTNAME'.ljust(20), 'COMMAND']
 
       @cache.servers.each do |server|
         server.find(_keyword).each do |port|
-          puts "%s %s %s" % ["#{server.hostname.to_s}/#{port.port.to_s}".ljust(30), port.name.to_s.ljust(20), server.connect_command(port)]
+          puts '%s %s %s' % ["#{server.hostname}/#{port.port}".ljust(30), port.name.to_s.ljust(20), server.connect_command(port)]
         end
       end
     end
 
     def cmd_list(_hostname)
       load_cache
-      puts "%s %s %s" % ["SERVER/PORT".ljust(30), "PORTNAME".ljust(20), "COMMAND"]
+      puts '%s %s %s' % ['SERVER/PORT'.ljust(30), 'PORTNAME'.ljust(20), 'COMMAND']
 
       @cache.servers.each do |server|
         if _hostname.nil? || server.hostname == _hostname
           server.ports.each do |port|
-            puts "%s %s %s" % ["#{server.hostname.to_s}/#{port.port.to_s}".ljust(30), port.name.to_s.ljust(20), server.connect_command(port)]
+            puts '%s %s %s' % ["#{server.hostname}/#{port.port}".ljust(30), port.name.to_s.ljust(20), server.connect_command(port)]
           end
         end
       end
@@ -171,7 +171,7 @@ module Cow
 
     def cmd_server_list
       load_cache
-      puts "SERVER(TYPE)"
+      puts 'SERVER(TYPE)'
 
       @cache.servers.each do |server|
         type = nil
@@ -184,8 +184,7 @@ module Cow
     def cmd_update(_hostname)
       load_cache
 
-      puts "Updating local cache..."
-      puts "%s %s" % ["SERVER/PORT".ljust(30), "PORTNAME".ljust(20)]
+      puts 'Updating local cache...'
 
       edit_cache do |cache|
         cache.servers.each do |server|
@@ -193,8 +192,9 @@ module Cow
             puts "Updating server #{server.hostname}"
             server.update_ports
 
+            puts '%s %s' % ['SERVER/PORT'.ljust(30), 'PORTNAME'.ljust(20)]
             server.ports.each do |port|
-              puts "%s %s" % ["#{server.hostname.to_s}/#{port.port.to_s}".ljust(30), port.name.to_s.ljust(20) ]
+              puts '%s %s' % ["#{server.hostname}/#{port.port}".ljust(30), port.name.to_s.ljust(20)]
             end
 
             cache.add_server server

data/lib/cow/plugins/acs.rb

@@ -3,8 +3,8 @@ require 'snmp'
 
 module Cow
   module ACS
-    OID_DESCRIPTION_LIST = '1.3.6.1.4.1.2925.4.2.6.2.1.1.3'
-    OID_TCPPORT_LIST = '1.3.6.1.4.1.2925.4.2.6.2.1.1.26'
+    OID_DESCRIPTION_LIST = '1.3.6.1.4.1.2925.4.2.6.2.1.1.3'.freeze
+    OID_TCPPORT_LIST = '1.3.6.1.4.1.2925.4.2.6.2.1.1.26'.freeze
 
     class Port < Cow::Tmpl::Port
     end
@@ -16,24 +16,26 @@ module Cow
       end
 
       def connect_command(_port, _user = ENV['USER'])
-        return "ssh -l #{_user}:#{port(_port).tcp_port} #{@hostname}"
+        "ssh -l #{_user}:#{port(_port).tcp_port} #{@hostname}"
       end
 
       private
 
       def get_ports
         ret = []
-        snmp{|s|
-          s.walk(OID_DESCRIPTION_LIST){|x|
-            next if x.name.last == 0
+        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]{2}$/ =~ 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 + ".#{x.name.last.to_s}")}
+            tcp_port = snmp { |s| break s.get_value(OID_TCPPORT_LIST + ".#{port}") }
 
-            ret <<  Cow::ACS::Port.new(port, name, tcp_port)
-          }
-        }
-        return ret
+            ret << Cow::ACS::Port.new(port, name, tcp_port)
+          end
+        end
+
+        ret
       end
     end
   end

data/lib/cow/plugins/acs5000.rb

@@ -3,8 +3,8 @@ require 'snmp'
 
 module Cow
   module ACS5000
-    OID_DESCRIPTION_LIST = '1.3.6.1.4.1.10418.15.2.2.6.2.1.1.3'
-    OID_TCPPORT_LIST = '1.3.6.1.4.1.10418.15.2.2.6.2.1.1.26'
+    OID_DESCRIPTION_LIST = '1.3.6.1.4.1.10418.15.2.2.6.2.1.1.3'.freeze
+    OID_TCPPORT_LIST = '1.3.6.1.4.1.10418.15.2.2.6.2.1.1.26'.freeze
 
     class Port < Cow::Tmpl::Port
     end
@@ -16,24 +16,25 @@ module Cow
       end
 
       def connect_command(_port, _user = ENV['USER'])
-        return "ssh -l #{_user}:#{port(_port).tcp_port} #{@hostname}"
+        "ssh -l #{_user}:#{port(_port).tcp_port} #{@hostname}"
       end
 
       private
 
       def get_ports
         ret = []
-        snmp{|s|
-          s.walk(OID_DESCRIPTION_LIST){|x|
-            next if x.name.last == 0
+        snmp do |s|
+          s.walk(OID_DESCRIPTION_LIST) do |x|
+            next if x.name.last.zero?
             port = x.name.last
             name = x.value.to_s
-            tcp_port = snmp{|s| break s.get_value(OID_TCPPORT_LIST + ".#{x.name.last.to_s}")}
+            tcp_port = snmp { |s| break s.get_value(OID_TCPPORT_LIST + ".#{port}") }
 
-            ret <<  Cow::ACS5000::Port.new(port, name, tcp_port)
-          }
-        }
-        return ret
+            ret << Cow::ACS5000::Port.new(port, name, tcp_port)
+          end
+        end
+
+        ret
       end
     end
   end

data/lib/cow/plugins/acs6000.rb

@@ -3,7 +3,8 @@ require 'snmp'
 
 module Cow
   module ACS6000
-    OID_DESCRIPTION_LIST = '1.3.6.1.4.1.10418.16.2.3.2.1.4'
+    OID_DESCRIPTION_LIST = '1.3.6.1.4.1.10418.16.2.3.2.1.4'.freeze
+    TCP_PORT_OFFSET = 7000
 
     class Port < Cow::Tmpl::Port
     end
@@ -15,24 +16,25 @@ module Cow
       end
 
       def connect_command(_port, _user = ENV['USER'])
-        return "ssh -l #{_user}:#{port(_port).tcp_port} #{@hostname}"
+        "ssh -l #{_user}:#{port(_port).tcp_port} #{@hostname}"
       end
 
       private
 
       def get_ports
         ret = []
-        snmp{|s|
-          s.walk(OID_DESCRIPTION_LIST){|x|
-            next if x.name.last == 0
+        snmp do |s|
+          s.walk(OID_DESCRIPTION_LIST) do |x|
+            next if x.name.last.zero?
             port = x.name.last
             name = x.value.to_s
-            tcp_port = port.to_i + 7000
+            tcp_port = TCP_PORT_OFFSET + port.to_i
 
-            ret <<  Cow::ACS6000::Port.new(port, name, tcp_port)
-          }
-        }
-        return ret
+            ret << Cow::ACS6000::Port.new(port, name, tcp_port)
+          end
+        end
+
+        ret
       end
     end
   end

data/lib/cow/plugins/cisco.rb

@@ -3,7 +3,8 @@ require 'snmp'
 
 module Cow
   module Cisco
-    OID_DESCRIPTION_LIST = '1.3.6.1.4.1.9.2.9.2.1.8'
+    OID_DESCRIPTION_LIST = '1.3.6.1.4.1.9.2.9.2.1.8'.freeze
+    TCP_PORT_OFFSET = 2000
 
     class Port < Cow::Tmpl::Port
     end
@@ -16,18 +17,19 @@ module Cow
 
       def get_ports
         ret = []
-        snmp{|s|
-          s.walk(OID_DESCRIPTION_LIST){|x|
-            next if x.name.last == 0
-            next if x.value.to_s.length == 0
+        snmp do |s|
+          s.walk(OID_DESCRIPTION_LIST) do |x|
+            next if x.name.last.zero?
+            next if x.value.to_s.empty?
             port = x.name.last
             name = x.value.to_s
-            tcp_port = 2000 + port.to_i
+            tcp_port = TCP_PORT_OFFSET + port.to_i
 
-            ret <<  Cow::Cisco::Port.new(port, name, tcp_port)
-          }
-        }
-        return ret
+            ret << Cow::Cisco::Port.new(port, name, tcp_port)
+          end
+        end
+
+        ret
       end
     end
 
@@ -36,7 +38,7 @@ module Cow
         include Cow::Cisco::Server
 
         def connect_command(_port, _user = ENV['USER'])
-          return "telnet #{@hostname} #{port(_port).tcp_port}"
+          "telnet #{@hostname} #{port(_port).tcp_port}"
         end
       end
     end
@@ -46,7 +48,7 @@ module Cow
         include Cow::Cisco::Server
 
         def connect_command(_port, _user = ENV['USER'])
-          return "ssh -l #{_user}:#{port(_port).port} #{@hostname}"
+          "ssh -l #{_user}:#{port(_port).port} #{@hostname}"
         end
       end
     end

data/lib/cow/plugins/digi_ts.rb

@@ -3,8 +3,8 @@ require 'snmp'
 
 module Cow
   module DIGI_TS
-    OID_DESCRIPTION_LIST = '1.3.6.1.4.1.332.11.5.3.3.25.13.1.29'
-    OID_TCPPORT_BASE = '1.3.6.1.4.1.332.11.5.3.3.20.22.0'
+    OID_DESCRIPTION_LIST = '1.3.6.1.4.1.332.11.5.3.3.25.13.1.29'.freeze
+    OID_TCPPORT_BASE = '1.3.6.1.4.1.332.11.5.3.3.20.22.0'.freeze
 
     class Port < Cow::Tmpl::Port
     end
@@ -17,8 +17,8 @@ module Cow
         end
 
         def connect_command(_port, _user = ENV['USER'])
-          #return "ssh -l #{_user}:#{port(_port).tcp_port+500} #{@hostname}"
-          return "telnet #{@hostname} #{port(_port).tcp_port}"
+          # "ssh -l #{_user}:#{port(_port).tcp_port+500} #{@hostname}"
+          "telnet #{@hostname} #{port(_port).tcp_port}"
         end
 
         private
@@ -26,19 +26,26 @@ module Cow
         def get_ports
           ret = []
 
-          base_port = snmp{|s| break s.get_value(OID_TCPPORT_BASE)}
+          base_port = snmp{|s| break s.get_value(OID_TCPPORT_BASE) }
 
-          snmp{|s|
-            s.walk(OID_DESCRIPTION_LIST){|x|
-              next if x.value.to_s.chomp.length == 0
+          snmp do |s|
+            s.walk(OID_DESCRIPTION_LIST) do |x|
+              next if x.value.to_s.chomp.empty?
               port = x.name.last
               name = x.value.to_s
-              tcp_port = base_port + port.to_i
+              tcp_port = base_port.to_i + port.to_i
 
-              ret <<  Cow::DIGI_TS::Port.new(port, name, tcp_port)
-            }
-          }
-          return ret
+              ret << Cow::DIGI_TS::Port.new(port, name, tcp_port)
+            end
+          end
+
+          ret
+        end
+
+        def snmp
+          SNMP::Manager.open(host: @hostname, community: @snmp_community, version: :SNMPv1) do|snmp|
+            yield(snmp)
+          end
         end
       end
     end

data/lib/cow/plugins/tmpl.rb

@@ -13,7 +13,7 @@ module Cow
       end
 
       def initialize(_port, _name, _tcp_port)
-        raise ArgumentError if _port.nil? or _name.nil? or _tcp_port.nil?
+        raise ArgumentError if _port.nil? || _name.nil? || _tcp_port.nil?
 
         @port = _port.to_s
         @name = _name.to_s
@@ -40,7 +40,8 @@ module Cow
 
       def ports
         update_ports unless @ports
-        return @ports
+
+        @ports
       end
 
       def update_ports
@@ -50,14 +51,9 @@ module Cow
       def port(_port)
         case _port
         when Fixnum
-          ports.each{|p|
-            return p if p.port == _port
-          }
+          ports.each{|p| return p if p.port == _port}
         when String
-          ports.each{|p|
-            return p if p.name == _port
-          }
-        else
+          ports.each{|p| return p if p.name == _port}
         end
 
         nil
@@ -65,9 +61,7 @@ module Cow
 
       def find(_portname)
         _ports = []
-        ports.each{|p|
-          _ports << p if p.name.include?(_portname)
-        }
+        ports.each{|p| _ports << p if p.name.include?(_portname) }
         return _ports
       end
 
@@ -90,7 +84,7 @@ module Cow
       end
 
       def snmp
-        SNMP::Manager.open(:host => @hostname, :community => @snmp_community) do|snmp|
+        SNMP::Manager.open(host: @hostname, community: @snmp_community) do|snmp|
           yield(snmp)
         end
       end

data/lib/cow/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cow
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-02 00:00:00.000000000 Z
+date: 2016-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,7 +84,7 @@ files:
 - lib/cow/plugins/digi_ts.rb
 - lib/cow/plugins/tmpl.rb
 - lib/cow/version.rb
-homepage: https://www.kazubu.jp/
+homepage: https://github.com/kazubu/cow/
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -96,18 +96,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2846258190445444436
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2846258190445444436
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23