expect4r 0.0.5.dev → 0.0.6.dev

data/lib/expect/io.rb

@@ -255,7 +255,20 @@ module Expect4r
           exp_puts 'yes'
         when /(Login incorrect|denied, please try again)/
           spawnee_reset
-        end
+        else
+          # For objects that include Expect4r but do not subclass base Login class.
+          @matches ||= []
+          @matches.each { |match, _send|
+            if read_pipe._io_string =~ match
+              read_pipe._io_save no_echo, "match #{match}"
+              if _send.is_a?(Proc)
+                exp_puts _send.call
+              else
+                exp_puts _send
+              end
+            end
+          }
+        end          
       end
     end
     case ev
@@ -320,7 +333,11 @@ module Expect4r
           @matches.each { |match, _send|
             if r._io_string =~ match
               r._io_save no_echo, "match #{match}"
-              exp_puts _send
+              if _send.is_a?(Proc)
+                exp_puts _send.call
+              else
+                exp_puts _send
+              end
             end
           }
         end
@@ -512,7 +529,7 @@ module Expect4r
       @ps1 = /(.*)(>|#|\$)\s*$/
       @more = / --More-- /
       @matches=Set.new
-      BaseLoginObject.add(self)
+      Base.add(self)
       self
     end
 

data/lib/misc/passwd.rb

@@ -24,13 +24,15 @@ begin
   
 rescue LoadError => e
   
-  module Expect4r
-    def self.cipher(arg, pwd='')
-      arg
-    end
-    def self.decipher(arg,pwd='')
-      arg
-    end
-  end
+  # module Expect4r
+  #   def self.cipher(arg, pwd='')
+  #     arg
+  #   end
+  #   def self.decipher(arg,pwd='')
+  #     arg
+  #   end
+  # end
+  
+  raise
 
 end

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

@@ -83,7 +83,7 @@ module Modes
     return :config if config?
     to_exec
     putline 'configure terminal' if exec?
-    raise RuntimeError, "unable to got to config mode" unless config?
+    raise RuntimeError, "unable to get to config mode" unless config?
     :config
   end
   
@@ -92,14 +92,14 @@ module Modes
     if config?
       1.upto(config_lvl?) { putline 'exit'}
     end
-    raise RuntimeError, "unable to got to exec mode" unless exec?
+    raise RuntimeError, "unable to get to exec mode" unless exec?
     :exec
   end
 
   def to_user
     return if user?
     putline "exit"
-    raise RuntimeError, "unable to got to user mode" unless exec?
+    raise RuntimeError, "unable to get to user mode" unless exec?
     :user
   end
   

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

@@ -90,7 +90,7 @@ module Modes
     return :config if config?
     to_exec
     putline 'configure'
-    raise RuntimeError, "unable to got to config mode" unless config?
+    raise RuntimeError, "unable to get to config mode" unless config?
     :config
   end
 
@@ -98,7 +98,7 @@ module Modes
     return :shell if shell?
     to_exec
     putline 'run'
-    raise RuntimeError, "unable to got to shell mode" unless shell?
+    raise RuntimeError, "unable to get to shell mode" unless shell?
     :shell
   end
 
@@ -106,7 +106,7 @@ module Modes
     return :exec if exec?
     putline "exit"  if shell?
     putline "abort" if config?
-    raise RuntimeError, "unable to got to exec mode" unless exec?
+    raise RuntimeError, "unable to get to exec mode" unless exec?
     :exec
   end
 

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

@@ -47,6 +47,10 @@ class Expect4r::J < ::Expect4r::BaseLoginObject
     putline 'exit'
   end
   
+  def cli
+    putline 'cli'
+  end
+  
   def commit(arg={})
     return unless config?
     @matches << [/Exit with uncommitted changes.+\(yes\)/, 'yes']

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

@@ -86,7 +86,13 @@ end
 # returns *true* if router is in <tt>:shell</tt> mode, *false* otherwise.
 #
 def shell?
-  @lp == '% ' ? true : false
+  if @lp == '% '
+    true
+  elsif logged_as_root? and @lp =~ /root@.+% $/
+    true
+  else
+    false
+  end
 end
 
 def set_cli_logical_router(logical_router)
@@ -111,7 +117,7 @@ def to_config
   return :config if config?
   to_exec
   putline 'edit', :debug=>1
-  raise RuntimeError, "unable to got to config mode" unless config?
+  raise RuntimeError, "unable to get to config mode" unless config?
   :config
 end
 
@@ -120,15 +126,19 @@ def to_shell
   return :shell if shell? 
   to_exec
   putline 'start shell'
-  raise RuntimeError, "unable to got to shell mode" unless shell?
+  raise RuntimeError, "unable to get to shell mode" unless shell?
   :shell
 end
 
+def logged_as_root?
+  @_is_root_ ||=  @lp =~ /root@/
+end
+
 def to_exec
   return :exec if exec?
   top if config?
-  exit
-  raise RuntimeError, "unable to got to exec mode" unless exec?
+  logged_as_root? ? cli : exit
+  raise RuntimeError, "unable to get to exec mode" unless exec?
   :exec
 end
 

data/test/misc/passwd_test.rb

@@ -5,5 +5,7 @@ class TestMiscPasswd < Test::Unit::TestCase
   def test_cipher
     assert_not_equal 'my password', Expect4r.cipher('my password')
     assert_equal 'my password', Expect4r.decipher(Expect4r.cipher('my password'))
+    assert_not_equal 'my password', Expect4r.cipher('my password', 'abcdef')
+    assert_equal 'my password', Expect4r.decipher(Expect4r.cipher('my password'))
   end
 end

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 5
+  - 6
   - dev
-  version: 0.0.5.dev
+  version: 0.0.6.dev
 platform: ruby
 authors: 
 - Jean-Michel Esnault
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-13 00:00:00 -08:00
+date: 2010-11-29 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency