dust-deploy 0.13.9 → 0.13.10

data/changelog.md

@@ -1,6 +1,12 @@
 Changelog
 =============
 
+0.13.10
+------------
+
+-  improves duplicity status
+
+
 0.13.9
 ------------
 

data/lib/dust/recipes/duplicity.rb

@@ -76,17 +76,21 @@ class Duplicity < Recipe
             "--archive-dir #{config['archive']} " +
             "#{File.join(config['backend'], config['directory'])}"
 
-      cmd << " |tail -n3 |head -n1" unless options.long?
+      cmd << " |tail -n3 |head -n1"
 
       ret = @node.exec cmd
 
       # check exit code and stdout shouldn't be empty
       msg.parse_result( (ret[:exit_code] == 0 and ret[:stdout].length > 0) )
 
-      if options.long?
-        @node.messages.add(ret[:stdout], :indent => 0)
+      # parse backup type, date and number of sets
+      m = ret[:stdout].match(/^\s+([a-zA-Z]+)\s+(\w+\s+\w+\s+\d+\s+\d+:\d+:\d+\s+\d+)\s+(\d+)$/)
+
+      if m
+        type, date, sets = m[1..3]
+        @node.messages.add("Last backup: #{type} (#{sets} sets) on #{date}", :indent => 2).ok
       else
-        @node.messages.add("\t" + ret[:stdout].sub(/^\s+([a-zA-Z]+)\s+(\w+\s+\w+\s+\d+\s+\d+:\d+:\d+\s+\d+)\s+(\d+)$/, 'Last backup: \1 (\3 sets) on \2'), :indent => 0)
+        @node.messages.add('could not get backup chain', :indent => 2).failed
       end
 
     end

data/lib/dust/version.rb

@@ -1,3 +1,3 @@
 module Dust
-  VERSION = "0.13.9"
+  VERSION = "0.13.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dust-deploy
 version: !ruby/object:Gem::Version
-  version: 0.13.9
+  version: 0.13.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-15 00:00:00.000000000 Z
+date: 2012-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json