rtprov 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b91fc8dc026c4cb7ce9b65a0fcfb0b547c5b793551e7a2e3bfbbbccfcbcbc31a
-  data.tar.gz: 0c92a75b0a93666eaf9a7efc8b05df13aee7a8e546fd210e27165c71cf1024a2
+  metadata.gz: dddbe1e1f19412764cd3299b98b846671818d7f968fd1fad9561119396f83913
+  data.tar.gz: 6113e8893c87e96c0a5ec1c1a9b33bcd05bfd3f63002e21a6bf85a24b077c43c
 SHA512:
-  metadata.gz: f955b8416a6e65a23065de9f6dc051aa730ddd930faa920781ca55c940bb197953b747604a25b0156f6fb1c94c9b4683bce43588fd39e73878fca9a50eed9856
-  data.tar.gz: 9c4c2d9d73891671de07795d40ab3ae61b17785111a0242fef153fb347e9944bf61190b28412590a6921040b22bc2702042ea0c09f9d66aa3e6c00c1f2751e66
+  metadata.gz: a35844a0c506d3eb612edd02ddccc12f98826cfaf14624066dd001e44208377e2abfdc0bad9f548507e0834869c868c9ceaf298934cf9f53bdae59478161365a
+  data.tar.gz: 9f5313e2783404f33b7a71ea3bc19398ab7781fb1497e5de008754415cc5b7f55fa4ac239d7cc278cca11793bd1c95d3f9560af727ddf060c2ab9cddc0fb763b

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.1.3
+
+* use file name instead of config number on `get`, `diff`
+
 # v0.1.2
 
 * add subcommands `print`, `diff`

data/Gemfile.lock

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

data/lib/rtprov/cli.rb

@@ -19,17 +19,17 @@ 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 :number, type: :numeric, default: 0, aliases: :n, desc: "Configuration number"
+    option :filename, type: :string, default: "/system/config", aliases: :f, desc: "Configuration file"
     def diff(router_name, template_name)
-      current_file = "/system/config#{options[:number]}"
+      current_file = options[:filename]
       router = Router.load(router_name)
 
       template = Template.find(router_name, template_name)
@@ -41,8 +41,8 @@ module Rtprov
 
       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"))
+          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
@@ -89,7 +89,6 @@ module Rtprov
     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)
 

data/lib/rtprov/version.rb

@@ -1,3 +1,3 @@
 module Rtprov
-  VERSION = "0.1.2".freeze
+  VERSION = "0.1.3".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rtprov
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - labocho
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-11-04 00:00:00.000000000 Z
+date: 2022-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reversible_cryptography