daff 1.3.18 → 1.3.19

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 099f0b4a80e2ba78cdf6b7bf2fbe0272186d421a
4
- data.tar.gz: bce4be10631472f0b8af958c314519ef4f30daef
3
+ metadata.gz: 5779d0129f0184e4c86479f7440a1e2c8505f872
4
+ data.tar.gz: 52eb0674f40911afc12b9b9ed0ac56f22a0926c6
5
5
  SHA512:
6
- metadata.gz: 589bbd9cf10186e6b29214c4b2e0e15d781f6b87069994211f3041d3466e86e9fee5673ce874cb2a72314990d4a3b12a1384981f5362c76856c0f596105e9948
7
- data.tar.gz: 4e260943a9253cb18a8e72ff6b6c79c593f3aeca80391db45ac145f24934146778d29d5e5a39f9c223968ea99f1dca5dbffef58027354876c8119aab73fb255b
6
+ metadata.gz: 822b821a2b9dd5feb1539b5a5c72797e91c5829cdabd0c5dcb50f150d7df0a22d40e407b3385567f33254a204d77d2bef18daf9f3948c96d1cc1e2d59da3232a
7
+ data.tar.gz: 44d38a2e32fdf8f2e47bc112f206268f996c88e1b6e6b3dce25019a7c905dafb562f59a4330458b95ca888f5316cd697027831b83c3ac310b3627836c878ae41
data/README.md CHANGED
@@ -244,6 +244,8 @@ Reading material
244
244
  * http://okfnlabs.org/blog/2013/08/08/diffing-and-patching-data.html : a summary of where the library came from.
245
245
  * http://blog.okfn.org/2013/07/02/git-and-github-for-data/ : a post about storing small data in git/github.
246
246
  * http://blog.ouseful.info/2013/08/27/diff-or-chop-github-csv-data-files-and-openrefine/ : counterpoint - a post discussing tracked-changes rather than diffs.
247
+ * http://blog.byronjsmith.com/makefile-shortcuts.html : a tutorial on using `make` for data, with daff in the mix. "Since git considers changes on a per-line basis,
248
+ looking at diffs of comma-delimited and tab-delimited files can get obnoxious. The program daff fixes this problem."
247
249
 
248
250
  ## License
249
251
 
@@ -835,7 +835,7 @@ module Coopy
835
835
  class << self
836
836
  attr_accessor :version
837
837
  end
838
- @version = "1.3.18"
838
+ @version = "1.3.19"
839
839
 
840
840
  def Coopy.diff_as_html(local,remote,flags = nil)
841
841
  comp = ::Coopy::TableComparisonState.new
@@ -945,7 +945,9 @@ module Coopy
945
945
  def Coopy.main
946
946
  io = ::Coopy::TableIO.new
947
947
  coopy1 = ::Coopy::Coopy.new
948
- coopy1.coopyhx(io)
948
+ ret = coopy1.coopyhx(io)
949
+ HxSys.exit(ret) if ret != 0
950
+ ret
949
951
  end
950
952
 
951
953
  # protected - in ruby this doesn't play well with static/inline methods
@@ -57,6 +57,10 @@
57
57
  result
58
58
  end
59
59
 
60
+ def HxSys.exit(code)
61
+ Kernel.exit(code)
62
+ end
63
+
60
64
  def HxSys.stdout
61
65
  ::Sys::Io::FileOutput.new(STDOUT)
62
66
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: daff
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3.18
4
+ version: 1.3.19
5
5
  platform: ruby
6
6
  authors:
7
7
  - James Smith
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2016-06-24 00:00:00.000000000 Z
12
+ date: 2016-11-08 00:00:00.000000000 Z
13
13
  dependencies: []
14
14
  description: Diff and patch tables
15
15
  email:
@@ -225,6 +225,9 @@ summary: '[![Build Status](https://travis-ci.org/paulfitz/daff.svg?branch=master
225
225
  this library with gitlab. * http://okfnlabs.org/blog/2013/08/08/diffing-and-patching-data.html
226
226
  : a summary of where the library came from. * http://blog.okfn.org/2013/07/02/git-and-github-for-data/
227
227
  : a post about storing small data in git/github. * http://blog.ouseful.info/2013/08/27/diff-or-chop-github-csv-data-files-and-openrefine/
228
- : counterpoint - a post discussing tracked-changes rather than diffs. ## License daff
228
+ : counterpoint - a post discussing tracked-changes rather than diffs. * http://blog.byronjsmith.com/makefile-shortcuts.html
229
+ : a tutorial on using `make` for data, with daff in the mix. "Since git considers
230
+ changes on a per-line basis, looking at diffs of comma-delimited and tab-delimited
231
+ files can get obnoxious. The program daff fixes this problem." ## License daff
229
232
  is distributed under the MIT License.'
230
233
  test_files: []