rtprov 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a42f3a6c37f9233c1e1fdd92873969d5ed678d6ad27fdfc4fdff77af6227febc
-  data.tar.gz: 62605c2099496b32f52fdc46252eb0e520db43aaf9406417ee0946306fe315d6
+  metadata.gz: dddbe1e1f19412764cd3299b98b846671818d7f968fd1fad9561119396f83913
+  data.tar.gz: 6113e8893c87e96c0a5ec1c1a9b33bcd05bfd3f63002e21a6bf85a24b077c43c
 SHA512:
-  metadata.gz: ba354ca8fd48fcedfc6b07ff496843c1c8f23db8d6828cdfb4cc330d4912f2c6bd449986e461ec9d3a56b6cf4982e7625fa7609e7fc7b3ce234355164be7be63
-  data.tar.gz: 29dd3afde18056a78e1ce1e9d81896e538ace1b4b604664ac6f67846b62fe91968d05bb9d62db9e3b02665bad115b0757944368642c764b0703d6def1ca60c6b
+  metadata.gz: a35844a0c506d3eb612edd02ddccc12f98826cfaf14624066dd001e44208377e2abfdc0bad9f548507e0834869c868c9ceaf298934cf9f53bdae59478161365a
+  data.tar.gz: 9f5313e2783404f33b7a71ea3bc19398ab7781fb1497e5de008754415cc5b7f55fa4ac239d7cc278cca11793bd1c95d3f9560af727ddf060c2ab9cddc0fb763b

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# v0.1.3
+
+* use file name instead of config number on `get`, `diff`
+
+# v0.1.2
+
+* add subcommands `print`, `diff`
+
 # v0.1.1
 
 * support prompt change like 'pp1>' by 'pp select 1'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rtprov (0.1.1)
+    rtprov (0.1.3)
       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

@@ -19,11 +19,33 @@ module Rtprov
     end
 
     desc "get ROUTER", "Get config from router"
-    option :number, type: :numeric, default: 0, aliases: :n, desc: "Configuration number"
+    option :filename, type: :string, default: "/system/config", aliases: :f, desc: "Configuration file"
     def get(router_name)
       router = Router.load(router_name)
       sftp = Sftp.new(router.host, router.user, router.administrator_password)
-      puts sftp.get("/system/config#{options[:number]}")
+      puts sftp.get(options[:filename])
+    end
+
+    desc "diff ROUTER TEMPLATE", "Show config diff of current and new config"
+    option :filename, type: :string, default: "/system/config", aliases: :f, desc: "Configuration file"
+    def diff(router_name, template_name)
+      current_file = options[:filename]
+      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(/^\s*#.*$/, "").gsub(/(\r\n|\r|\n)+/, "\r\n").chomp)
+          File.write("current.conf", current_config.gsub(/^\s*#.*$/, "").gsub(/\s+$/, "").gsub(/(\r\n|\r|\n)+/, "\r\n").chomp)
+          system("#{diff} -u current.conf new.conf", out: $stdout, err: $stderr)
+        end
+      end
     end
 
     desc "put ROUTER TEMPLATE", "Put config from router"
@@ -66,6 +88,15 @@ module Rtprov
       end
     end
 
+    desc "print ROUTER TEMPLATE", "Print config"
+    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/version.rb

@@ -1,3 +1,3 @@
 module Rtprov
-  VERSION = "0.1.1".freeze
+  VERSION = "0.1.3".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.1
+  version: 0.1.3
 platform: ruby
 authors:
 - labocho
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-09-05 00:00:00.000000000 Z
+date: 2022-11-30 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: []