vipnet_getter 0.3 → 0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02791c509ed3cb9d56085ff5b6181e3f2d1c3989
-  data.tar.gz: b3844f588742eebe97a6daf5d195ca7a4db3f6ad
+  metadata.gz: 53175c56a11abe74e7481275a13ca3070e37e050
+  data.tar.gz: b2e9f65e4dfdc39f3861ef460a3bb27ddd026ec6
 SHA512:
-  metadata.gz: 0b0dcf0252d31b90930080fe7206fe30f4f5464542429ae371d5ce9669498a5f558f0b030ab32ba460b8d2db9599d38407afb88298e0c210ea7d2da0f7adc0b9
-  data.tar.gz: facdced06f47a81cd910b98c9c8020e3eb28dca353a39aa12d0315d8b34825046d60fb13235c56632d2418d38282d8a3a81f37e58e87d81fa590f1353b269749
+  metadata.gz: 67e0425e2875304e96ec3c1f53e7d5988faaac767187468c879c9ea3e51cf6fd07660dfeaa1b8ee72c71511502045a38c733414d13a5bf0f03e961f4f6fcb6c8
+  data.tar.gz: de3f14189c75a4c8f5f3b5f56d6c2e4a6f838e4ec948b676c07f3c988d13472fbb3172ff391e012699c21bccc3af3dc838a9b8514d8655a55f13fbe71e924820

data/lib/vipnet_getter.rb

@@ -1,8 +1,6 @@
-# encoding: UTF-8
-
 class VipnetGetter
   ENTER_KEYCODE = 13
-  PGDN_KEYCODE  = 34
+  PGDN_KEYCODE = 34
 
   def self.iplirconf(params)
     hostname = params[:hostname]
@@ -10,7 +8,7 @@ class VipnetGetter
     username = params[:username] || "vipnet"
     output_file_path = params[:output_file_path]
 
-    # Adding digest to "known_hosts" if needed.
+    # adding digest to known_hosts if needed
     require "ruby_expect"
     exp_ssh_digest = RubyExpect::Expect.spawn("/usr/bin/ssh #{username}@#{hostname}")
     exp_ssh_digest.timeout = 3
@@ -22,52 +20,43 @@ class VipnetGetter
       end
     end
 
+    iplirconf = String.new
     logged = false
-    puts "Logging to #{username}@#{hostname}..."
 
-    # "TERM=xterm" solves "WARNING: terminal is not fully functional" issue when running script with cron
-    # TODO: test.
-    exp = RubyExpect::Expect.spawn("TERM=xterm luit -encoding KOI8-R /usr/bin/ssh #{username}@#{hostname}")
+    # logging
+    exp = RubyExpect::Expect.spawn("/usr/bin/ssh #{username}@#{hostname}")
     exp.timeout = 3
-    iplirconf_content = ""
     exp.procedure do
       each do
         expect /password:\s*$/ do
           send password
-          puts "Entering password..."
+          puts "entering password"
         end
-
-        # For some reason, if password is incorrect, script waits for timeout
-        # and don't expect ">" for "iplir show config".
-        # Thus, commented code below doesn't work
+        # for some reason if pw is not incorrect, script wait for timeout and don't expect ">" for "iplir show config"
+        # thus, commented code below doesn't work
         # expect /Permission denied, please try again/ do
-        #   puts "permission denied"
+        # puts "permission denied"
         # end
-
         expect />\s*$/ do
-          command = "iplir show config"
-          send command
-          puts command
-
-          # When running with cron, message appears:
-          # "WARNING: terminal is not fully functional
-          # -  (press RETURN)"
-          # So we imitate pressing <Enter>.
+          send "iplir show config"
+          # when running with cron, message appears:
+          # WARNING: terminal is not fully functional
+          #-  (press RETURN)
           send ENTER_KEYCODE
           logged = true
+          puts "iplir show config"
         end
       end
-      return nil unless logged
+      return nil if !logged
 
-      # Reading iplirconf until "default= .*" or /tunneldefault= .*/ lines appeared.
-      # ("default" for vipnet v3 and "tunneldefault" for vipnet v4.)
+      # reading iplirconf until "default= auto" line appeared
       retflag = false
       while !retflag
         retval = any do
           expect /.*:/m do
-            iplirconf_content << last_match.to_s
+            iplirconf += last_match.to_s
             last_match.to_s.split("\n").each do |line|
-              if line =~ /^default=\s.*/ || line =~ /^tunneldefault=\s.*/
+              if line =~ /default= auto/
                 retflag = true
                 break
               end
@@ -78,33 +67,30 @@ class VipnetGetter
       end
     end
 
-    # Encode and remove unsupported characters.
-    iplirconf_content.force_encoding("UTF-8")
-                     .gsub!("\r", "")
-                     .gsub!(/[^\w\s\p{Cyrillic}=\(\)\[\]:\.\,@\#$%\^\-!]/, "")
-
-    # Remove trash in the beginning.
-    iplirconf_content.gsub!(/iplir show config.*1h=/m, "")
-                     .gsub!("[7moptvipnetuseriplir.conf[27m[K[K:[K11[K33[K", "")
-
-    # Remove trash in the middle.
-    iplirconf_content.gsub!(/\[K\d+\[K\d+\[K/, "") # [K33[K44[K
-    iplirconf_content.gsub!(/:\[K\[K:/, "") # :[K[K:
-
-    # Remove trash in the end.
-    iplirconf_content.gsub!(/\[7m\(END\).*\[K\[K:/, "")
-
-    # Remove trailing spaces and add carriage return.
-    iplirconf_content.strip!
-    iplirconf_content << "\n\n"
-
+    # remove regular trash caused by "send PGDN_KEYCODE"
+    iplirconf = iplirconf.gsub(":\e[K\r\e[K:\e[K3\b3\e[K4\b4\r\e[K", "")
+    # remove trash in the beginning
+    iplirconf = iplirconf.gsub("iplir show config\r\n\e[?1049h\e[?1h\e=\r", "")
+    # remove trash in the end
+    iplirconf = iplirconf[/.*default= auto\r\n/m, 0]
+    # replace \r\n by \n
+    iplirconf = iplirconf.gsub("\r", "")
+    # remove trash caused by send ENTER_KEYCODE
+    iplirconf = iplirconf.gsub(":\x1B[K\x1B[K:\x1B[K1\x081\x1B[K3\x083\x1B[K", "")
+    # remove trash caused by "terminal is not fully functional" issue when running script with cron
+    iplirconf = iplirconf.gsub("::3\x083", "")
+    iplirconf = iplirconf.gsub("4\x084", "")
+    iplirconf = iplirconf.gsub("iplir show config\nWARNING: terminal is not fully functional\n-  (press RETURN):1\x081", "")
+    iplirconf = iplirconf.gsub("4\x084", "")
+    # add return if necessary
+    iplirconf += "\n" if iplirconf[-4..-1] != "\n\n"
     if output_file_path
-      File.open(output_file_path, "w:KOI8-R") { |f| f.write(iplirconf_content) }
+      File.open(output_file_path, 'w') { |f| f.write(iplirconf) }
       output_file_path
     else
       require "tempfile"
-      iplirconf_file = Tempfile.new("iplirconf", encoding: "KOI8-R")
-      iplirconf_file.write(iplirconf_content)
+      iplirconf_file = Tempfile.new("iplirconf")
+      iplirconf_file.write(iplirconf)
       iplirconf_file.flush
       iplirconf_file.path
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vipnet_getter
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.11'
 platform: ruby
 authors:
 - Alexander Morozov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-24 00:00:00.000000000 Z
+date: 2016-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby_expect
@@ -24,7 +24,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
-description: Allows to get configuration files like iplir.conf (and more) from ViPNet™
+description: Allows to get configuration files like iplir.conf (and more) from ViPNet
   products such as HW1000; no "enable" and "admin escape" needed.
 email: ntcomp12@gmail.com
 executables: []
@@ -55,5 +55,5 @@ rubyforge_project:
 rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
-summary: Gem for getting data from ViPNet™ products
+summary: Gem for getting data from ViPNet products
 test_files: []