3 files changed, 60 insertions, 3 deletions
diff --git a/lib/oxidized/model/aosw.rb b/lib/oxidized/model/aosw.rb
index 203c5e0..43e1cff 100644
--- a/lib/oxidized/model/aosw.rb
+++ b/lib/oxidized/model/aosw.rb
@@ -5,7 +5,7 @@ class AOSW < Oxidized::Model
   # Also Dell controllers
 
   comment  '# '
-  prompt /^\([^)]+\) #/
+  prompt /^\([^)]+\) [#>]/
 
   cmd :all do |cfg|
     cfg.each_line.to_a[1..-2].join
@@ -36,7 +36,16 @@ class AOSW < Oxidized::Model
   end
 
   cfg :telnet, :ssh do
+    if vars :enable
+      post_login do
+        send 'enable\n'
+        send vars(:enable) + '\n'
+      end
+    end
     post_login 'no paging'
+    if vars :enable
+      pre_logout 'exit'
+    end
     pre_logout 'exit'
   end
 
@@ -50,7 +59,7 @@ class AOSW < Oxidized::Model
       next if line.match /[0-9]+ (RPM|mV|C)$/
       out << line.strip
     end
-    out = out.join "\n"
+    out = comment out.join "\n"
     out << "\n"
   end
 
diff --git a/lib/oxidized/model/masteros.rb b/lib/oxidized/model/masteros.rb
new file mode 100644
index 0000000..3f5a2fc
--- /dev/null
+++ b/lib/oxidized/model/masteros.rb
@@ -0,0 +1,46 @@
+class MasterOS < Oxidized::Model
+
+  # MRV MasterOS model #
+
+comment '!' 
+
+  cmd :secret do |cfg|
+    cfg.gsub! /^(snmp-server community).*/, '\\1 <configuration removed>'
+    cfg.gsub! /username (\S+) password encrypted (\S+) class (\S+).*/, '<secret hidden>'
+    cfg 
+  end 
+
+  cmd :all do |cfg|
+    cfg.each_line.to_a[1..-2].join
+  end 
+
+  cmd 'show inventory' do |cfg|
+    cfg = cfg.each_line.to_a[0..-2].join
+    comment cfg 
+  end 
+
+  cmd 'show plugins' do |cfg|
+    comment cfg 
+  end 
+
+  cmd 'show hw-config' do |cfg|
+    comment cfg 
+  end 
+
+  cmd 'show running-config' do |cfg|
+    cfg = cfg.each_line.to_a[3..-1].join
+    cfg 
+  end 
+
+  cfg :telnet, :ssh do
+    post_login 'no pager'
+    if vars :enable
+      post_login do
+        send "enable\n"
+        send vars(:enable) + "\n"
+      end 
+    end 
+    pre_logout 'exit'
+  end 
+
+end
+\ No newline at end of file
diff --git a/lib/oxidized/output/git.rb b/lib/oxidized/output/git.rb
index b1212f1..81be162 100644
--- a/lib/oxidized/output/git.rb
+++ b/lib/oxidized/output/git.rb
@@ -80,6 +80,8 @@ class Git < Output
             hash = {}
             hash[:date] = commit.time.to_s 
             hash[:oid] = commit.oid
+            hash[:author] = commit.author
+            hash[:message] = commit.message
             tab[i += 1] = hash
           end
         end
@@ -185,4 +187,4 @@ class Git < Output
     end
   end
 end
-end
-\ No newline at end of file
+end