From 3e63ce3c71620433dc135959b2743aa010b28fe1 Mon Sep 17 00:00:00 2001 From: varac Date: Tue, 17 May 2016 12:52:57 +0200 Subject: update submodules so "rake test" doesnt complain anymore --- puppet/modules/couchdb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'puppet/modules/couchdb/files/couch-doc-diff') diff --git a/puppet/modules/couchdb b/puppet/modules/couchdb index 40d2289f..76ff149a 160000 --- a/puppet/modules/couchdb +++ b/puppet/modules/couchdb @@ -1 +1 @@ -Subproject commit 40d2289f8e10625cd45fdccdf492b5fb6490e66d +Subproject commit 76ff149a095023611c05bbb00157d06f87b07c05 -- cgit v1.2.3 From 7ce3190986cf8e5fe037a7ccd4c1076505b117f4 Mon Sep 17 00:00:00 2001 From: Micah Date: Tue, 12 Jul 2016 16:41:59 -0400 Subject: remove submodules in preparation for move to subrepos Change-Id: Ia7655153b556337f676e3d909559c4a7306bedd6 --- puppet/modules/couchdb | 1 - 1 file changed, 1 deletion(-) delete mode 160000 puppet/modules/couchdb (limited to 'puppet/modules/couchdb/files/couch-doc-diff') diff --git a/puppet/modules/couchdb b/puppet/modules/couchdb deleted file mode 160000 index 76ff149a..00000000 --- a/puppet/modules/couchdb +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 76ff149a095023611c05bbb00157d06f87b07c05 -- cgit v1.2.3 From f2019755fd724fb1020cb2d97cdf82b751450ebc Mon Sep 17 00:00:00 2001 From: Micah Date: Tue, 12 Jul 2016 16:45:54 -0400 Subject: git subrepo clone https://leap.se/git/puppet_couchdb puppet/modules/couchdb subrepo: subdir: "puppet/modules/couchdb" merged: "76ff149" upstream: origin: "https://leap.se/git/puppet_couchdb" branch: "master" commit: "76ff149" git-subrepo: version: "0.3.0" origin: "https://github.com/ingydotnet/git-subrepo" commit: "1e79595" Change-Id: I9ccb1a9dfdaa083814ea395132c42a778052f59b --- puppet/modules/couchdb/files/couch-doc-diff | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 puppet/modules/couchdb/files/couch-doc-diff (limited to 'puppet/modules/couchdb/files/couch-doc-diff') diff --git a/puppet/modules/couchdb/files/couch-doc-diff b/puppet/modules/couchdb/files/couch-doc-diff new file mode 100644 index 00000000..a5907d5e --- /dev/null +++ b/puppet/modules/couchdb/files/couch-doc-diff @@ -0,0 +1,17 @@ +#!/bin/bash + +# Run a diff between a couch document specified as the first parameter +# and the second parameter. +# Diff returns 0 if there is no difference. This way you can tell the data +# is already on the couch. +# Both the couch document and the second paramter will be pretty printed +# before comparison so differences in spaces etc. do not matter. +# All keys starting with an underscore on the couch such as _id and _rev +# will be removed before the comparison - we assume we want to compare +# the real data, not the metadata about the document as we usually do not +# know or care about what the id and revision will be. + +curl -s --netrc-file /etc/couchdb/couchdb.netrc $1 \ + | python -mjson.tool \ + | grep -v '^\s*"_' \ + | diff -w - <(echo $2 | python -mjson.tool) -- cgit v1.2.3