oxidized 0.14.1 → 0.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 244c0ce925a3ae1014ca7d50047cd6167af7de3e
-  data.tar.gz: 39e6ef1b5e064e56e0f465da938f9de3c5701312
+  metadata.gz: 61ca595b5255672ffc615530ca8913fd9e370181
+  data.tar.gz: 3c3a7756a3854b1b38882297d44e2d516a5b562b
 SHA512:
-  metadata.gz: bc4a2fb8be9e14c4defa550bf777fba102548c4ff4dc28c77bcc41cd19e5298c996716de2046c5d4b28f6418dc2f4f9285a2ca8534299de67de928940c9dd82b
-  data.tar.gz: ba4694c9ed5791b19a29305e7a49adc420c942093238285334cf590db5944bd277f79db362be75e3278dfea4e379dede383bc7a5c816261a74672f010673c4cc
+  metadata.gz: 20b6bac43a2aa14815322182e6a85d960b2a78c1c7b77dac850a9a392fe981acecf93a41336b8ed90262bdeba4001ac62027c8a28a10f0106cd787de5a86360b
+  data.tar.gz: 63f76ee63596e77e28a9d76991105df5272e73438099793a347f3ca7679362a8189f32fb7a84747a403007685b3fd0c29cb661f846dcf7ab3dd7bb67b45cc45e

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.14.2
+- BUGFIX: git expand path for all groups
+- BUGFIX: git get_version, teletubbies do it again
+- BUGFIX: comware, acos, procurve models
+
 # 0.14.1
 - BUGFIX: git get_version when groups and single_repo are used
 

data/README.md

@@ -292,6 +292,30 @@ vars:
    enable: S3cre7
 ```
 
+### Removing secrets
+
+To strip out secrets from configurations before storing them, Oxidized needs the the remove_secrets flag. You can globally enable this by adding the following snippet to the global sections of the configuration file.
+
+```
+vars:
+  remove_secret: true
+```
+
+Device models can contain substitution filters to remove potentially sensitive data from configs.
+
+As a partial example from ios.rb:
+
+```  
+  cmd :secret do |cfg|
+    cfg.gsub! /^(snmp-server community).*/, '\\1 <configuration removed>'
+    (...)    
+    cfg
+  end
+```
+The above strips out snmp community strings from your saved configs.
+
+**NOTE:** Removing secrets reduces the usefulness as a full configuration backup, but it may make sharing configs easier.
+
 ### Source: CSV
 
 One line per device, colon seperated.

data/lib/oxidized/model/comware.rb

@@ -13,6 +13,8 @@ class Comware < Oxidized::Model
 
   cmd :all do |cfg|
     #cfg.gsub! /^.*\e\[42D/, ''        # example how to handle pager
+    #skip rogue ^M
+    cfg = cfg.gsub /\r/, ''
     cfg.each_line.to_a[1..-2].join
   end
  

data/lib/oxidized/model/procurve.rb

@@ -2,7 +2,7 @@ class Procurve < Oxidized::Model
 
   # some models start lines with \r 
   # previous command is repeated followed by "\eE", which sometimes ends up on last line
-  prompt /^\r?([\w -]+\eE)?([\w-]+# )$/
+  prompt /^\r?([\w -]+\eE)?([\w.-]+# )$/
 
   comment  '! '
 

data/lib/oxidized/output/git.rb

@@ -21,7 +21,14 @@ class Git < Output
       Oxidized.asetus.save :user
       raise NoConfig, 'no output git config, edit ~/.config/oxidized/config'
     end
-    @cfg.repo = File.expand_path @cfg.repo
+
+    if @cfg.repo.respond_to?(:each)
+      @cfg.repo.each do |group, repo|
+        @cfg.repo["#{group}="] = File.expand_path repo
+      end
+    else
+      @cfg.repo = File.expand_path @cfg.repo
+    end
   end
 
   def store file, outputs, opt={}
@@ -105,7 +112,7 @@ class Git < Output
         repo = @cfg.repo
         if group && group != '' && !@cfg.single_repo?
           repo = File.join File.dirname(repo), group + '.git'
-        elsif group
+        elsif group && group != ''
           node = File.join group, node
         end
         repo = Rugged::Repository.new repo
@@ -152,13 +159,19 @@ class Git < Output
 
   def update repo, file, data
     return if data.empty?
+
     if @opt[:group]
       if @cfg.single_repo?
         file = File.join @opt[:group], file
       else
-        repo = File.join File.dirname(repo), @opt[:group] + '.git'
+        repo = if repo.is_a?(String)
+                 File.join File.dirname(repo), @opt[:group] + '.git'
+               else
+                 repo[@opt[:group]]
+               end
       end
     end
+
     begin
       repo = Rugged::Repository.new repo
       update_repo repo, file, data, @msg, @user, @email

data/lib/oxidized/version.rb

@@ -1,3 +1,3 @@
 module Oxidized
-  VERSION = '0.14.1'
+  VERSION = '0.14.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oxidized
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 0.14.2
 platform: ruby
 authors:
 - Saku Ytti
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-06 00:00:00.000000000 Z
+date: 2016-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asetus