rtprov 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a398e411bb4dad6a5a9d9729fc8c9c7c6c88620836d08eb4edfef767943eea82
-  data.tar.gz: 6e475a17877c5bab3b6dff77a347582e0ac5d727684584ace3d9b0ad25e5e517
+  metadata.gz: b91fc8dc026c4cb7ce9b65a0fcfb0b547c5b793551e7a2e3bfbbbccfcbcbc31a
+  data.tar.gz: 0c92a75b0a93666eaf9a7efc8b05df13aee7a8e546fd210e27165c71cf1024a2
 SHA512:
-  metadata.gz: 45e51ed23305e428916884a2c8dd0512332f1deed16edb25de19ba06e50e62e4be8c25e8e1a21929b84049df6ff6e43e41c221607d5cedc6f7046bef412024bc
-  data.tar.gz: b1580e8ea6d1580a544c405bbac4f150813492bade5f2f84ca7763a5ec86e1aec0a115651c5346889b78930010ddfdb0883e6fd3f154cd7042205b1abf28dfcd
+  metadata.gz: f955b8416a6e65a23065de9f6dc051aa730ddd930faa920781ca55c940bb197953b747604a25b0156f6fb1c94c9b4683bce43588fd39e73878fca9a50eed9856
+  data.tar.gz: 9c4c2d9d73891671de07795d40ab3ae61b17785111a0242fef153fb347e9944bf61190b28412590a6921040b22bc2702042ea0c09f9d66aa3e6c00c1f2751e66

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# v0.1.2
+
+* add subcommands `print`, `diff`
+
+# 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.2)
       reversible_cryptography
       thor
 
@@ -14,7 +14,7 @@ GEM
     parser (2.6.3.0)
       ast (~> 2.4.0)
     rainbow (3.0.0)
-    rake (10.5.0)
+    rake (13.0.1)
     reversible_cryptography (0.5.0)
       thor
     rubocop (0.74.0)
@@ -25,7 +25,7 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
     ruby-progressbar (1.10.1)
-    thor (0.20.3)
+    thor (1.2.1)
     unicode-display_width (1.6.0)
 
 PLATFORMS
@@ -33,9 +33,9 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 2.0)
-  rake (~> 10.0)
+  rake (~> 13.0)
   rtprov!
   rubocop (~> 0.74.0)
 
 BUNDLED WITH
-   2.0.1
+   2.3.25

data/README.md

@@ -80,6 +80,20 @@ rtprov uses `ENV["RTPROV_DIFF"]` or `colordiff` or `diff` to print diff.
     # Rendering templates/my_config.erb and put to my_route as config1 and load it.
     $ rtprov put my_router --number 1 my_config
 
+Templates are ERB file. In template, define variables described in router file.
+For example, in router file,
+
+    variables:
+      foo:
+        bar:
+          - baz: foobar
+
+in template,
+
+    <%= foo.bar[0].baz >
+
+you can get "foobar".
+
 
 ## Development
 

data/lib/rtprov/cli.rb

@@ -26,6 +26,28 @@ module Rtprov
       puts sftp.get("/system/config#{options[:number]}")
     end
 
+    desc "diff ROUTER TEMPLATE", "Show config diff of current and new config"
+    option :number, type: :numeric, default: 0, aliases: :n, desc: "Configuration number"
+    def diff(router_name, template_name)
+      current_file = "/system/config#{options[:number]}"
+      router = Router.load(router_name)
+
+      template = Template.find(router_name, template_name)
+      new_config = template.render(router.variables)
+
+      sftp = Sftp.new(router.host, router.user, router.administrator_password)
+      current_config = sftp.get(current_file)
+      diff = ENV["RTPROV_DIFF"] || %w(colordiff diff).find {|cmd| system("which", cmd, out: "/dev/null", err: "/dev/null") }
+
+      Dir.mktmpdir do |dir|
+        Dir.chdir(dir) do
+          File.write("new.conf", new_config.gsub(/^#.*$/, "").gsub(/(\r\n|\r|\n)+/, "\r\n"))
+          File.write("current.conf", current_config.gsub(/^#.*$/, "").gsub(/(\r\n|\r|\n)+/, "\r\n"))
+          system("#{diff} -u current.conf new.conf", out: $stdout, err: $stderr)
+        end
+      end
+    end
+
     desc "put ROUTER TEMPLATE", "Put config from router"
     option :number, type: :numeric, default: 0, aliases: :n, desc: "Configuration number"
     option :force, type: :boolean, default: false, aliases: :f, desc: "Don't ask to trasfer and load config"
@@ -66,6 +88,16 @@ module Rtprov
       end
     end
 
+    desc "print ROUTER TEMPLATE", "Print config"
+    option :number, type: :numeric, default: 0, aliases: :n, desc: "Configuration number"
+    def print(router_name, template_name)
+      router = Router.load(router_name)
+
+      template = Template.find(router_name, template_name)
+      new_config = template.render(router.variables)
+      puts new_config
+    end
+
     desc "ls", "List routers"
     def ls
       Router.names.each do |name|

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.2".freeze
 end

data/rtprov.gemspec

@@ -41,6 +41,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "thor"
 
   spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rubocop", "~> 0.74.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rtprov
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - labocho
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-09-05 00:00:00.000000000 Z
+date: 2022-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reversible_cryptography
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -117,7 +117,7 @@ metadata:
   homepage_uri: https://github.com/labocho/rtprov
   source_code_uri: https://github.com/labocho/rtprov
   changelog_uri: https://github.com/labocho/rtprov/master/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -132,8 +132,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: Yamaha router (RTX or NVR series) provisioning tool
 test_files: []