expect4r 0.0.8 → 0.0.9

data/lib/expect/io.rb

@@ -248,8 +248,8 @@ module Expect4r
     _login_ :proxy=> proxy
   end
   alias :login_via :login_by_proxy
-
-  def login(cmd, arg={})
+  
+  def _login(cmd, arg={})
     
     return if connected?
 
@@ -324,6 +324,9 @@ module Expect4r
     [buf, ev]
   end
   
+  alias :login :_login
+  
+  
   private
   
   def login_proxy(cmd, arg)
@@ -482,165 +485,3 @@ module Kernel
   end
   exp_debug :disable
 end
-
-module Expect4r
-  class Base
-    include Expect4r
-    class << self
-      attr_reader :routers
-      def all
-        @arr
-      end
-      def add(r)
-        @arr ||=[]
-        @arr << r
-      end
-    end
-    def initialize(*args)
-      @matches = Set.new
-      Base.add(self)
-      self
-    end
-  end
-  
-  class BaseLoginObject < Base
-    class << self
-      # Examples:
-      #   my_mac = RShell.new_telnet '1.1.1.1', 'me', 'secret'
-      #   ios = Ios.new_telnet '1.1.1.1', 'lab', 'lab'
-      #   iox = Iox.new_telnet '1.1.1.1', 'username', 'pwd'
-      #
-      def new_telnet(*args)
-        new :telnet, *args
-      end
-      # Examples:
-      #   my_mac = RShell.new_ssh '1.1.1.1', 'me', 'secret'
-      #   iox = Ios.new_ssh '1.1.1.1', 'lab', 'lab'
-      #   ios = Iosx.new_ssh '1.1.1.1', 'username', 'pwd'
-      #
-      def new_ssh(*args)
-        new :ssh, *args
-      end
-      attr_reader :routers
-      def add(r)
-        @routers ||=[]
-        @routers << r
-      end
-    end
-    attr_reader :host, :user, :method, :port, :proxy
-    alias :username :user
-    alias :hostname :host
-    # Adds a login to a Expect4r::BaseLoginObject"
-    #
-    # Constructor: 
-    # * <tt>new</tt>  <method>, <username>, <password>, [port_number]
-    # * <tt>new</tt>  <method>, options={}
-    #
-    # Options are:  
-    # * <tt>:host</tt> or <tt>:hostname</tt>
-    # * <tt>:user</tt> or <tt>:username</tt>
-    # * <tt>:pwd</tt> or <tt>:password</tt>
-    #
-    # Examples:
-    #   new :telnet, :host=> '1.1.1.1', :user=> 'lab', :password=>'lab'
-    #   new :ssh, :host=> '1.1.1.1', :user=> 'jme'
-    #   new :ssh, '1.1.1.1', 'me', 'secret'
-    #
-    def initialize(*args)
-      ciphered_password=nil
-      if args.size>2 and args[1].is_a?(String)
-        @method, host, @user, pwd = args
-      elsif args.size == 2 and args[1].is_a?(Hash) and args[0].is_a?(Symbol)
-        @method = args[0]
-        host = args[1][:host] || args[1][:hostname]
-        @user = args[1][:user]|| args[1][:username]
-        pwd  = args[1][:pwd]  || args[1][:password]
-        ciphered_password  = args[1][:ciphered_password]
-      end
-      @host, port = host.split
-      @port = port.to_i
-      @pwd = if ciphered_password
-        ciphered_password
-      else
-        Expect4r.cipher(pwd) if pwd
-      end
-      @ps1 = /(.*)(>|#|\$)\s*$/
-      @more = / --More-- /
-      @matches=Set.new
-      Base.add(self)
-      self
-    end
-
-    def spawnee
-      case method
-      when :telnet  ; "telnet #{host} #{port if port>0}"
-      when :ssh     ; "ssh #{spawnee_username}@#{host}"
-      else
-        raise RuntimeError
-      end
-    end
-
-    def spawnee_username
-      @user
-    end
-
-    def spawnee_prompt
-      @ps1
-    end
-    
-    def dup
-      if @pwd
-        self.class.new @method, @host, @user, Expect4r.decipher(@pwd)
-      else
-        self.class.new @method, @host, @user
-      end
-    end
-
-    private
-
-    def spawnee_password
-      if @pwd.nil?
-        @pwd = Expect4r.cipher( ask("(#{self}) Enter your password:  ") { |q| q.echo = "X" } )
-        @asked4pwd=true
-      end
-      Expect4r.decipher(@pwd)
-    end
-    
-    def spawnee_reset
-      @pwd=nil if @asked4pwd
-    end
-
-  end
-end
-
-if __FILE__ != $0
-
-  at_exit { 
-    if Expect4r::Base.all
-      Expect4r::Base.all.each { |o| o.logout if o.respond_to? :logout }
-    end
-  }
-
-else
-
-  require "test/unit"
-
-  class Expect4r::Base
-    def initialize
-      Expect4r::Base.add(self)
-    end
-  end
-
-  class Base < Test::Unit::TestCase
-    include Expect4r
-
-    def test_add
-      assert [], Base.all
-      Base.new
-      assert 1, Base.all.size
-      Base.new 
-      assert_equal 2, Base.all.size
-    end
-  end
-
-end

data/lib/expect4r.rb

@@ -1,4 +1,5 @@
 require 'expect/io'
+require 'misc/base.rb'
 require 'misc/passwd'
 
 module Expect4r

data/lib/misc/base.rb

@@ -0,0 +1,178 @@
+
+module Expect4r
+  class Base
+    include Expect4r
+    class << self
+      attr_reader :routers
+      def all
+        @arr
+      end
+      def add(r)
+        @arr ||=[]
+        @arr << r
+      end
+    end
+    def initialize(*args)
+      @matches = Set.new
+      Base.add(self)
+      self
+    end
+  end
+  
+  class BaseLoginObject < Base
+    class << self
+      # Examples:
+      #   my_mac = RShell.new_telnet '1.1.1.1', 'me', 'secret'
+      #   ios = Ios.new_telnet '1.1.1.1', 'lab', 'lab'
+      #   iox = Iox.new_telnet '1.1.1.1', 'username', 'pwd'
+      #
+      def new_telnet(*args)
+        new :telnet, *args
+      end
+      # Examples:
+      #   my_mac = RShell.new_ssh '1.1.1.1', 'me', 'secret'
+      #   iox = Ios.new_ssh '1.1.1.1', 'lab', 'lab'
+      #   ios = Iosx.new_ssh '1.1.1.1', 'username', 'pwd'
+      #
+      def new_ssh(*args)
+        new :ssh, *args
+      end
+      attr_reader :routers
+      def add(r)
+        @routers ||=[]
+        @routers << r
+      end
+    end
+    attr_reader :host, :user, :method, :port, :proxy
+    alias :username :user
+    alias :hostname :host
+    # Adds a login to a Expect4r::BaseLoginObject"
+    #
+    # Constructor: 
+    # * <tt>new</tt>  <method>, <username>, <password>, [port_number]
+    # * <tt>new</tt>  <method>, options={}
+    #
+    # Options are:  
+    # * <tt>:host</tt> or <tt>:hostname</tt>
+    # * <tt>:user</tt> or <tt>:username</tt>
+    # * <tt>:pwd</tt> or <tt>:password</tt>
+    #
+    # Examples:
+    #   new :telnet, :host=> '1.1.1.1', :user=> 'lab', :password=>'lab'
+    #   new :ssh, :host=> '1.1.1.1', :user=> 'jme'
+    #   new :ssh, '1.1.1.1', 'me', 'secret'
+    #
+    def initialize(*args)
+      ciphered_password=nil
+      if args.size>2 and args[1].is_a?(String)
+        @method, host, @user, pwd = args
+        @host, port = host.split
+        @port = (port || 0).to_i
+      elsif args.size == 2 and args[1].is_a?(Hash) and args[0].is_a?(Symbol)
+        @method = args[0]
+        @host = args[1][:host] || args[1][:hostname]
+        port = args[1][:port]
+        @port = (port || 0).to_i
+        @user = args[1][:user]|| args[1][:username]
+        pwd  = args[1][:pwd]  || args[1][:password]
+        ciphered_password  = args[1][:ciphered_password]
+      else
+        raise
+      end
+      @pwd = if ciphered_password
+        ciphered_password
+      else
+        Expect4r.cipher(pwd) if pwd
+      end
+      @ps1 = /(.*)(>|#|\$)\s*$/
+      @more = / --More-- /
+      @matches=Set.new
+      Base.add(self)
+      self
+    end
+
+    attr_writer :host, :username, :port
+    
+    def method=(arg)
+      case arg
+      when :telnet, :ssh
+        @method= arg
+      else
+        raise ArgumentError
+      end
+    end
+
+
+    def spawnee
+      case method
+      when :telnet  ; "telnet #{host} #{port if port>0}"
+      when :ssh     ; "ssh #{spawnee_username}@#{host} #{port if port>0}"
+      else
+        raise RuntimeError
+      end
+    end
+
+    def spawnee_username
+      @user
+    end
+
+    def spawnee_prompt
+      @ps1
+    end
+    
+    def dup
+      if @pwd
+        self.class.new @method, @host, @user, Expect4r.decipher(@pwd)
+      else
+        self.class.new @method, @host, @user
+      end
+    end
+
+    private
+
+    def spawnee_password
+      if @pwd.nil?
+        @pwd = Expect4r.cipher( ask("(#{self}) Enter your password:  ") { |q| q.echo = "X" } )
+        @asked4pwd=true
+      end
+      Expect4r.decipher(@pwd)
+    end
+    
+    def spawnee_reset
+      @pwd=nil if @asked4pwd
+    end
+
+  end
+end
+
+if __FILE__ != $0
+
+  at_exit { 
+    if Expect4r::Base.all
+      Expect4r::Base.all.each { |o| o.logout if o.respond_to? :logout }
+    end
+  }
+
+else
+
+  require "test/unit"
+
+  class Expect4r::Base
+    def initialize
+      Expect4r::Base.add(self)
+    end
+  end
+
+  class Base < Test::Unit::TestCase
+    include Expect4r
+
+    def test_add
+      assert [], Base.all
+      Base.new
+      assert 1, Base.all.size
+      Base.new 
+      assert_equal 2, Base.all.size
+    end
+  end
+
+end

data/lib/router/cisco/ios/ios.rb

@@ -29,6 +29,7 @@ class Expect4r::Ios < ::Expect4r::BaseLoginObject
   end
   
   def enable_password
+    return unless @pwd || @enable_password
     @enable_password ||= @pwd  # FIXME
     Expect4r.decipher(@pwd)    # password is ciphered ...
   end

data/lib/router/cisco/ios/modes.rb

@@ -76,7 +76,7 @@ module Modes
   # returns *true* if router is in <tt>:user</tt> mode,  *false* otherwise.
   #
   def user?
-    @lp =~ /.+>\s*$/
+    @lp.split.last =~ /.+>\s*$/
   end
     
   def to_config

data/lib/router/common.rb

@@ -11,7 +11,7 @@ module Common
   end
 
   def io_escape_char_cb
-    putc "\n" if console?
+    putc "\r" if console?
   end
 
 end

data/lib/router/juniper/junos/junos.rb

@@ -56,7 +56,7 @@ class Expect4r::J < ::Expect4r::BaseLoginObject
     @matches << [/Exit with uncommitted changes.+\(yes\)/, 'yes']
     output = putline "commit", arg
     if /error: configuration check-out failed/.match(output.join)
-      rollack
+      rollback
       raise SemanticError.new(self.class.to_s, output)
     end
     output

data/lib/router/juniper/junos/modes.rb

@@ -131,7 +131,7 @@ def to_shell
 end
 
 def logged_as_root?
-  @_is_root_ ||=  @lp =~ /root@/
+  ! (@_is_root_ ||=  @lp =~ /root@/).nil?
 end
 
 def to_exec

data/lib/router/modes.rb

@@ -22,8 +22,8 @@ module Modes
     login unless connected?
     case mode
     when :exec    ; exec?
-    when :shell   ; shell?
     when :config  ; config?
+    when :shell   ; shell?
     else
       _mode_?
     end
@@ -32,8 +32,8 @@ module Modes
     login unless connected?
     case mode
     when :exec    ;  to_exec
-    when :shell   ;  to_shell
     when :config  ;  to_config
+    when :shell   ;  to_shell
     end
   end
   def _mode_?

data/lib/router/vyatta/ping.rb

@@ -37,7 +37,8 @@ module Ping
   #++
   def ping(host, arg={}, &on_error)
 
-    pct_success = arg.delete(:pct_success) || 99
+    pct_success    = arg.delete(:pct_success)    || 99
+    raise_on_error = arg.delete(:on_error_raise) || true
 
     output = exp_send(ping_cmd(host, arg), arg)
 
@@ -63,7 +64,9 @@ module Ping
       if on_error
         on_error.call(self)
       else
-        raise ::Expect4r::Router::Error::PingError.new(@host, host, pct_success, $1.to_i, tx, rx, output)
+        if raise_on_error
+          raise ::Expect4r::Router::Error::PingError.new(@host, host, pct_success, $1.to_i, tx, rx, output)
+        end
       end
 
     end

data/lib/router/vyatta/show.rb

@@ -19,5 +19,13 @@ module Show
     end
   end
   
+  # count | match | no-match | no-more | more
+  def method_missing(name, *args, &block)
+    @invalid_inputs ||=[]
+    super if @invalid_inputs.include?(name.to_s)
+    cmd = name.to_s.split('_').join(' ')
+    cmd += ""
+  end
+
 end
 end

data/test/misc/rspec.rb

@@ -0,0 +1,13 @@
+
+class User
+  def in_role?(role)
+    true
+  end
+end
+
+describe User do
+  it "should be in any role assigned to it" do
+    user = User.new
+    user.should be_in_role("assigned role")
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: expect4r
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-20 00:00:00.000000000Z
+date: 2013-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70302466268900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,12 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70302466268900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.0
 description: A Ruby Library for interacting with IOS, IOS-XR, and JUNOS  CLI.
 email: jesnault@gmail.com
 executables: []
@@ -37,6 +42,7 @@ files:
 - examples/jex2.rb
 - lib/expect/io.rb
 - lib/expect4r.rb
+- lib/misc/base.rb
 - lib/misc/passwd.rb
 - lib/misc/shell.rb
 - lib/router/cisco/common/common.rb
@@ -61,6 +67,7 @@ files:
 - lib/router/vyatta/vyatta.rb
 - test/expect4r_test.rb
 - test/misc/passwd_test.rb
+- test/misc/rspec.rb
 - test/router/cisco/iox/iox_test.rb
 homepage: http://github.com/jesnault/expect4r
 licenses: []
@@ -86,11 +93,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Expect4r
 test_files:
 - test/expect4r_test.rb
 - test/misc/passwd_test.rb
+- test/misc/rspec.rb
 - test/router/cisco/iox/iox_test.rb