rtprov 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a398e411bb4dad6a5a9d9729fc8c9c7c6c88620836d08eb4edfef767943eea82
-  data.tar.gz: 6e475a17877c5bab3b6dff77a347582e0ac5d727684584ace3d9b0ad25e5e517
+  metadata.gz: a42f3a6c37f9233c1e1fdd92873969d5ed678d6ad27fdfc4fdff77af6227febc
+  data.tar.gz: 62605c2099496b32f52fdc46252eb0e520db43aaf9406417ee0946306fe315d6
 SHA512:
-  metadata.gz: 45e51ed23305e428916884a2c8dd0512332f1deed16edb25de19ba06e50e62e4be8c25e8e1a21929b84049df6ff6e43e41c221607d5cedc6f7046bef412024bc
-  data.tar.gz: b1580e8ea6d1580a544c405bbac4f150813492bade5f2f84ca7763a5ec86e1aec0a115651c5346889b78930010ddfdb0883e6fd3f154cd7042205b1abf28dfcd
+  metadata.gz: ba354ca8fd48fcedfc6b07ff496843c1c8f23db8d6828cdfb4cc330d4912f2c6bd449986e461ec9d3a56b6cf4982e7625fa7609e7fc7b3ce234355164be7be63
+  data.tar.gz: 29dd3afde18056a78e1ce1e9d81896e538ace1b4b604664ac6f67846b62fe91968d05bb9d62db9e3b02665bad115b0757944368642c764b0703d6def1ca60c6b

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.1.1
+
+* support prompt change like 'pp1>' by 'pp select 1'
+
 # v0.1.0
 
 * initial release

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rtprov (0.1.0)
+    rtprov (0.1.1)
       reversible_cryptography
       thor
 

data/lib/rtprov/session.rb

@@ -4,7 +4,7 @@ require "shellwords"
 
 module Rtprov
   class Session
-    attr_reader :router, :reader, :writer, :prompt, :prompt_pattern
+    attr_reader :router, :reader, :writer, :prompt_prefix, :prompt_pattern
 
     def self.start(router, &block)
       cmd = [
@@ -17,9 +17,9 @@ module Rtprov
 
         r.expect(/password/)
         w.puts router.password
-        prompt = r.expect(/^(.*>) /)[1]
+        prompt_prefix = r.expect(/^(.*)> /)[1]
 
-        session = new(router, r, w, prompt)
+        session = new(router, r, w, prompt_prefix, ">")
         session.exec("console character en.ascii")
         session.exec("console lines infinity") # disable pager
         session.exec("console columns 200")
@@ -30,12 +30,12 @@ module Rtprov
       end
     end
 
-    def initialize(router, reader, writer, prompt = ">")
+    def initialize(router, reader, writer, prompt_prefix, prompt_suffix)
       @router = router
       @reader = reader
       @writer = writer
-      @prompt = prompt.dup.freeze
-      @prompt_pattern = Regexp.compile("^" + Regexp.escape(prompt) + " ").freeze
+      @prompt_prefix = prompt_prefix.dup.freeze
+      @prompt_pattern = Regexp.compile("^" + Regexp.escape(prompt_prefix) + "[a-z1-9]*" + prompt_suffix + " ").freeze
     end
 
     def exec(cmd)
@@ -58,7 +58,7 @@ module Rtprov
       reader.expect(/^Administrator Password: /)
       writer.puts router.administrator_password
 
-      writer.puts "console prompt '#{prompt.gsub(/\#$/, "")}'" # load config may change prompt
+      writer.puts "console prompt '#{prompt_prefix}'" # load config may change prompt prefix
       out, * = reader.expect(prompt_pattern)
 
       unless out
@@ -76,11 +76,11 @@ module Rtprov
 
       begin
         # set new prompt because default administrator prompt "# " matches config file comment etc.
-        session = self.class.new(router, reader, writer, "RTPROV#")
+        session = self.class.new(router, reader, writer, "RTPROV", "#")
         session.exec "console prompt RTPROV"
         block.call(session)
       ensure
-        writer.puts "console prompt '#{prompt.gsub(/>$/, "")}'"
+        writer.puts "console prompt '#{prompt_prefix}'"
         reader.expect(/^.*# /)
       end
 

data/lib/rtprov/version.rb

@@ -1,3 +1,3 @@
 module Rtprov
-  VERSION = "0.1.0".freeze
+  VERSION = "0.1.1".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rtprov
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - labocho