buratino 0.0.4 → 0.0.5

data/lib/buratino/hg.rb

@@ -50,8 +50,15 @@ module Buratino
       puts "DEBUG BURATINO::HG::SEND_REPORTS"
       message = "New report from #{Facter.fqdn}"
       Mercurial::Shell.run("add", :append_hg => true, :in => config['reports_dir'])
-      Mercurial::Shell.run(["commit -m ?", message], :append_hg => true, :in => config['reports_dir'])
-      Mercurial::Shell.run("push", :append_hg => true, :in => config['reports_dir'])
+      begin
+        Mercurial::Shell.run(["commit -m ?", message], :append_hg => true, :in => config['reports_dir'])
+        Mercurial::Shell.run("push", :append_hg => true, :in => config['reports_dir'])
+      rescue Mercurial::CommandError => errmsg
+        puts "Something wrong...trying update(pull --update) first"
+        reports_repos = Mercurial::Repository.open( config['reports_dir'] )
+        reports_repos.pull( 'default', '--update')
+        retry
+      end  
     end
 
   end

data/lib/buratino/version.rb

@@ -1,3 +1,3 @@
 module Buratino
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: buratino
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-23 00:00:00.000000000 Z
+date: 2012-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mercurial-ruby