[whimsy] branch master updated: Html only requires one hash

[se...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
     new 1ba107b  Html only requires one hash
1ba107b is described below

commit 1ba107b5f2a2b82aaad38c180e3e016b136b904d
Author: Sebb <se...@apache.org>
AuthorDate: Thu Jun 11 14:05:49 2020 +0100

    Html only requires one hash
---
 lib/whimsy/asf/svn.rb | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/whimsy/asf/svn.rb b/lib/whimsy/asf/svn.rb
index 78a5d10..791d709 100644
--- a/lib/whimsy/asf/svn.rb
+++ b/lib/whimsy/asf/svn.rb
@@ -409,16 +409,20 @@ module ASF
         cmd << path
       end
 
-      p cmd if options[:verbose] # includes auth
+      Wunderbar.warn cmd.inspect if options[:verbose] # includes auth
 
       if options[:dryrun] # excludes auth
         # TODO: improve this
         return _.system ['echo', cmd.inspect]
       end
 
-    #  N.B. Version 1.3.3 requires separate hashes for JsonBuilder and BuilderClass,
-    #  see https://github.com/rubys/wunderbar/issues/11
-    _.system cmd, sysopts, sysopts # needs two hashes
+      #  N.B. Version 1.3.3 requires separate hashes for JsonBuilder and BuilderClass,
+      #  see https://github.com/rubys/wunderbar/issues/11
+      if _.instance_of?(Wunderbar::JsonBuilder) or _.instance_of?(Wunderbar::TextBuilder)
+        _.system cmd, sysopts, sysopts # needs two hashes
+      else
+        _.system cmd, sysopts
+      end
     end
 
     # As for self.svn_, but failures cause a RuntimeError