commutateurs 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 004cc139c226d06b9138a383fbbe24785ddedc4d
-  data.tar.gz: faf1a3664f09d5cc0cc89d11f6088bbb4c914fc9
+  metadata.gz: 7169b4ffc6129dc3f778f246922607fe8959c167
+  data.tar.gz: f5bf6bb867c867097eb35e5451bdba5fca781e87
 SHA512:
-  metadata.gz: e742d374a0af081ad83d47902ba6d79f6e36a04c902c944967801509d181849dd27fccf9542ce932fe5e9007cf1e50b83df75e4b50066a0e05acf0c69e6ff9c1
-  data.tar.gz: 958be74a8eebb3780a0b03fb789b3ea54775189c564d6843738e230d12430dfb704944c3a71c2aa18938f23a3de54dcefdad94d1ba222a1e95c1f0a4d2d7bd8b
+  metadata.gz: dbe1b0df004ee1a170b7f2a5929bc6a9575c0abede2fa512f24ceba706d62aeb64e7a1ed2d61177bfefd2443e8b4146b3f78f5dd8d202d289a73b770f729e6b6
+  data.tar.gz: 382a9ac0525b8ac6639e75ab55ebc00c83fb715c5ec73edd15533bc5c6761dca00a778049ae1d501dd0b4bbe8564466f8a5bce69cd6720ef3b53dba4e5b690a3

data/lib/commutateurs.rb

@@ -4,6 +4,11 @@ require 'net/ssh'
 module Commutateurs
 end
 
-require 'commutateurs/ssh'
-require 'commutateurs/device'
-
+require_relative './commutateurs/ssh'
+require_relative './commutateurs/base'
+require_relative './commutateurs/cisco'
+require_relative './commutateurs/credentials'
+require_relative './commutateurs/fortigate'
+require_relative './commutateurs/h3c'
+require_relative './commutateurs/hp'
+require_relative './commutateurs/juniper'

data/lib/commutateurs/base.rb

@@ -0,0 +1,16 @@
+module Commutateurs
+  class Base
+    def initialize(host, credentials, verbose = false)
+      @enable = credentials.enable
+
+      @transport = Ssh.new(verbose)
+      @transport.host = host
+      @transport.user = credentials.user
+      @transport.password = credentials.password
+    end
+
+    def execute(line)
+      @transport.command line
+    end
+  end
+end

data/lib/commutateurs/cisco.rb

@@ -0,0 +1,31 @@
+module Commutateurs
+  class Cisco < Base
+    def initialize(host, credentials, verbose = false)
+      super
+      @transport.default_prompt = /[#>]\s?\z/n
+    end
+
+    def enable
+      @transport.command("enable", :prompt => /^Password:/)
+      @transport.command(@enable)
+    end
+
+    def connect
+      @transport.connect
+      @transport.command('terminal length 0')
+    end
+
+    def configuration
+      execute('show run')
+    end
+
+    def save
+      execute('wr mem')
+    end
+
+    def disconnect
+      @transport.send 'exit'
+      @transport.close
+    end
+  end
+end

data/lib/commutateurs/credentials.rb

@@ -0,0 +1,10 @@
+module Commutateurs
+  class Credentials
+    attr_reader :user, :password, :enable
+    def initialize(user, password, enable)
+      @user = user
+      @password = password
+      @enable = enable
+    end
+  end
+end

data/lib/commutateurs/fortigate.rb

@@ -0,0 +1,27 @@
+module Commutateurs
+  class Fortigate < Base
+    def initialize(host, credentials, verbose = false)
+      super
+      @transport.default_prompt = / [#\$] $/
+    end
+
+    def enable
+    end
+
+    def connect
+      @transport.connect
+    end
+
+    def configuration
+      execute('show')
+    end
+
+    def save
+    end
+
+    def disconnect
+      @transport.send 'exit'
+      @transport.close
+    end
+  end
+end

data/lib/commutateurs/h3c.rb

@@ -0,0 +1,33 @@
+module Commutateurs
+  class H3c < Base
+    def initialize(host, credentials, verbose = false)
+      super
+      @transport.default_prompt = /(<.*>|\[.*\])$/
+    end
+
+    def enable
+      @transport.command('super', :prompt => /Password:/)
+      @transport.command(@enable)
+      @transport.command('screen-length disable')
+    end
+
+    def connect
+      @transport.connect
+    end
+
+    def configuration
+      execute('dis curr')
+    end
+
+    def save
+      @transport.command('save safely', :prompt => /Are you sure/)
+      @transport.command('Y', :prompt => /enter key/)
+      @transport.command('')
+    end
+
+    def disconnect
+      @transport.send 'quit'
+      @transport.close
+    end
+  end
+end

data/lib/commutateurs/hp.rb

@@ -0,0 +1,38 @@
+module Commutateurs
+  # Work in progress
+  class HP < Base
+    def initialize(host, credentials, verbose = false)
+      super
+      @transport.default_prompt = /(Press any key to continue|# )/
+
+      # hpuifilter.c used by rancid - https://github.com/dotwaffle/rancid-git/blob/master/bin/hpuifilter.c#L534
+      @transport.filter = Proc.new do |line| 
+        line.gsub(/\e\[2K|\e\[2J|\e\[\?7l|\e\[\?6l|\e\[[0-9]+;[0-9]+r|\e\[[0-9]+;[0-9]+H|\e\[\?25l|\e\[\?25h/, "")
+            .gsub(/\eE/, "\n") 
+      end
+    end
+
+    def connect
+      @transport.connect
+      @transport.command("\n")
+      @transport.command("terminal length 1000")
+    end
+
+    def enable
+
+    end
+
+    def configuration
+      execute('write term')
+    end
+
+    def save
+      execute('write memory')
+    end
+
+    def disconnect
+      @transport.send 'exit'
+      @transport.close
+    end
+  end
+end

data/lib/commutateurs/juniper.rb

@@ -0,0 +1,27 @@
+module Commutateurs
+  class Juniper < Base
+    def initialize(host, credentials, verbose = false)
+      super
+      @transport.default_prompt = /-> $/
+    end
+
+    def enable
+    end
+
+    def connect
+      @transport.connect
+    end
+
+    def configuration
+      execute('get config')
+    end
+
+    def save
+    end
+
+    def disconnect
+      @transport.send 'exit'
+      @transport.close
+    end
+  end
+end

data/lib/commutateurs/ssh.rb

@@ -3,12 +3,12 @@
 module Commutateurs
   class Ssh
     attr_accessor :user, :password, :host, :port
-    attr_accessor :default_prompt, :timeout, :debug
+    attr_accessor :default_prompt, :timeout, :filter
 
     def initialize(verbose)
       @timeout = 10
       @verbose = verbose
-      @debug = Proc.new { |line| $stderr.print(line) }
+      @filter = Proc.new { |line| line }
     end
 
     def command(cmd, options = {})
@@ -34,11 +34,16 @@ module Commutateurs
           raise "failed to open ssh shell channel" unless success
 
           ch.on_data { |ch,data|
-            # p data
-            @debug.call(data) if @verbose
-            @buf << data
+            # p @filter.call(data)
+            $stderr.puts(@filter.call(data)) if @verbose
+            @buf << @filter.call(data)
+          }
+          ch.on_extended_data { |ch,type,data|
+            if type == 1
+              $stderr.puts(@filter.call(data)) if @verbose
+              @buf << @filter.call(data)
+            end
           }
-          ch.on_extended_data { |ch,type,data| @debug.call(data) if type == 1; @buf << data if type == 1 }
           ch.on_close { @eof = true }
 
           @channel = ch
@@ -109,4 +114,4 @@ module Commutateurs
       end
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: commutateurs
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Guillaume Rose
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-16 00:00:00.000000000 Z
+date: 2013-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -30,7 +30,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/commutateurs/device.rb
+- lib/commutateurs/base.rb
+- lib/commutateurs/cisco.rb
+- lib/commutateurs/credentials.rb
+- lib/commutateurs/fortigate.rb
+- lib/commutateurs/h3c.rb
+- lib/commutateurs/hp.rb
+- lib/commutateurs/juniper.rb
 - lib/commutateurs/ssh.rb
 - lib/commutateurs.rb
 homepage: http://www.github.com/guillaumerose/commutateurs

data/lib/commutateurs/device.rb

@@ -1,181 +0,0 @@
-module Commutateurs
-  class Credentials
-    attr_reader :user, :password, :enable
-    def initialize(user, password, enable)
-      @user = user
-      @password = password
-      @enable = enable
-    end
-  end
-
-  class Base
-    def initialize(host, credentials, verbose = false)
-      @enable = credentials.enable
-
-      @transport = Ssh.new(verbose)
-      @transport.host = host
-      @transport.user = credentials.user
-      @transport.password = credentials.password
-    end
-
-    def execute(line)
-      @transport.command line
-    end
-  end
-
-  # Work in progress
-  class HP < Base
-    def initialize(host, credentials, verbose = false)
-      super
-      @transport.default_prompt = /(Press any key to continue|# )/
-      @transport.debug = Proc.new { |line| $stderr.print(clean(line)) }
-    end
-
-    def connect
-      @transport.connect
-      @transport.command("\n")
-      @transport.command("terminal length 1000")
-    end
-
-    def enable
-
-    end
-
-    def configuration
-      execute('write term')
-    end
-
-    def save
-      raise "Not implemented yet"
-    end
-
-    def disconnect
-      @transport.send 'exit'
-      @transport.close
-    end
-
-    def execute(arg)
-      clean(super(arg))
-    end
-
-    def clean(arg)
-      cleaned = ""
-      (arg || "").each_byte { |x|  cleaned << x unless x > 127   }
-      cleaned
-    end
-  end
-
-  class Cisco < Base
-    def initialize(host, credentials, verbose = false)
-      super
-      @transport.default_prompt = /[#>]\s?\z/n
-    end
-
-    def enable
-      @transport.command("enable", :prompt => /^Password:/)
-      @transport.command(@enable)
-    end
-
-    def connect
-      @transport.connect
-      @transport.command('terminal length 0')
-    end
-
-    def configuration
-      execute('show run')
-    end
-
-    def save
-      execute('wr mem')
-    end
-
-    def disconnect
-      @transport.send 'exit'
-      @transport.close
-    end
-  end
-
-  class H3c < Base
-    def initialize(host, credentials, verbose = false)
-      super
-      @transport.default_prompt = /(<.*>|\[.*\])$/
-    end
-
-    def enable
-      @transport.command('super', :prompt => /Password:/)
-      @transport.command(@enable)
-      @transport.command('screen-length disable')
-    end
-
-    def connect
-      @transport.connect
-    end
-
-    def configuration
-      execute('dis curr')
-    end
-
-    def save
-      @transport.command('save safely', :prompt => /Are you sure/)
-      @transport.command('Y', :prompt => /enter key/)
-      @transport.command('')
-    end
-
-    def disconnect
-      @transport.send 'quit'
-      @transport.close
-    end
-  end
-
-  class Juniper < Base
-    def initialize(host, credentials, verbose = false)
-      super
-      @transport.default_prompt = /-> $/
-    end
-
-    def enable
-    end
-
-    def connect
-      @transport.connect
-    end
-
-    def configuration
-      execute('get config')
-    end
-
-    def save
-    end
-
-    def disconnect
-      @transport.send 'exit'
-      @transport.close
-    end
-  end
-
-  class Fortigate < Base
-    def initialize(host, credentials, verbose = false)
-      super
-      @transport.default_prompt = / [#\$] $/
-    end
-
-    def enable
-    end
-
-    def connect
-      @transport.connect
-    end
-
-    def configuration
-      execute('show')
-    end
-
-    def save
-    end
-
-    def disconnect
-      @transport.send 'exit'
-      @transport.close
-    end
-  end
-end