expect4r 0.0.4.dev → 0.0.5.dev

data/lib/expect/io.rb

@@ -314,15 +314,16 @@ module Expect4r
         when @more
           r._io_save no_echo, "matching MORE"
           putc ' '
+        else
+          # For objects that include Expect4r but do not subclass base Login class.
+          @matches ||= []
+          @matches.each { |match, _send|
+            if r._io_string =~ match
+              r._io_save no_echo, "match #{match}"
+              exp_puts _send
+            end
+          }
         end
-        
-        @matches.each { |match, _send|  
-          if r._io_string =~ match
-             r._io_save no_echo, "match #{match}"
-            exp_puts _send
-          end
-        }
-        
       end
     end
     case rc
@@ -431,7 +432,23 @@ module Kernel
 end
 
 module Expect4r
-  class BaseLoginObject
+  class Base
+    include Expect4r
+    class << self
+      attr_reader :routers
+      def add(r)
+        @routers ||=[]
+        @routers << 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'
@@ -544,8 +561,8 @@ end
 if __FILE__ != $0
 
   at_exit { 
-    if Expect4r::BaseLoginObject.routers
-      Expect4r::BaseLoginObject.routers.each { |r| r.logout if r.respond_to? :logout }
+    if Expect4r::Base.routers
+      Expect4r::Base.routers.each { |r| r.logout if r.respond_to? :logout }
     end
   }
   
@@ -553,21 +570,21 @@ else
 
   require "test/unit"
 
-  class Expect4r::BaseLoginObject
+  class Expect4r::Base
     def initialize
-      Expect4r::BaseLoginObject.add(self)
+      Expect4r::Base.add(self)
     end
   end
 
-  class TestRouterBaseLoginObject < Test::Unit::TestCase
+  class Base < Test::Unit::TestCase
     include Expect4r
 
     def test_add
-      assert [], BaseLoginObject.routers
-      BaseLoginObject.new
-      assert 1, BaseLoginObject.routers.size
-      BaseLoginObject.new 
-      assert_equal 2, BaseLoginObject.routers.size
+      assert [], Base.routers
+      Base.new
+      assert 1, Base.routers.size
+      Base.new 
+      assert_equal 2, Base.routers.size
     end
   end
 

data/lib/misc/passwd.rb

@@ -1,19 +1,36 @@
 require 'rubygems'
-require 'openssl'
-require 'digest/sha1'
-module Expect4r
-  def self.cipher(this, pwd='expect4r')
-    c = OpenSSL::Cipher::Cipher.new("aes-256-cbc")
-    c.encrypt
-    c.key = key = Digest::SHA1.hexdigest(pwd)
-    e = c.update(this)
-    e << c.final
+
+begin
+
+  require 'openssl'
+  require 'digest/sha1'
+  
+  module Expect4r
+    def self.cipher(this, pwd='expect4r')
+      c = OpenSSL::Cipher::Cipher.new("aes-256-cbc")
+      c.encrypt
+      c.key = key = Digest::SHA1.hexdigest(pwd)
+      e = c.update(this)
+      e << c.final
+    end
+    def self.decipher(cipher,pwd='expect4r')
+      c = OpenSSL::Cipher::Cipher.new("aes-256-cbc")
+      c.decrypt
+      c.key = key = Digest::SHA1.hexdigest(pwd)
+      d = c.update(cipher)
+      d << c.final
+    end
   end
-  def self.decipher(cipher,pwd='expect4r')
-    c = OpenSSL::Cipher::Cipher.new("aes-256-cbc")
-    c.decrypt
-    c.key = key = Digest::SHA1.hexdigest(pwd)
-    d = c.update(cipher)
-    d << c.final
+  
+rescue LoadError => e
+  
+  module Expect4r
+    def self.cipher(arg, pwd='')
+      arg
+    end
+    def self.decipher(arg,pwd='')
+      arg
+    end
   end
-end
+
+end

data/lib/misc/shell.rb

@@ -1,7 +1,7 @@
 module Expect4r
-  class Shell
-    include Expect4r
+  class Shell < Expect4r::Base
     def initialize()
+      super
       ENV['PROMPT_COMMAND']="date +%k:%m:%S"
       ENV['PS1']="shell>"
       @ps1 = /shell>$/
@@ -13,8 +13,6 @@ module Expect4r
     end
   end
   class RShell < ::Expect4r::BaseLoginObject
-    include Expect4r
-    
     def initialize(*args)
       super
       default_ps1

metadata

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