gitdis 0.1.2.1 → 0.1.3.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/VERSION +1 -1
  3. data/lib/gitdis.rb +6 -2
  4. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: dff5d4e19798bf4fa0087e9a97affdc2b60cb5ff
4
- data.tar.gz: 9d3133897f4a68c1de7298615e6d9a50ac7ed39b
3
+ metadata.gz: b0f8b49e0f1a745e0eefe9dbf1c6233ef6fe3a22
4
+ data.tar.gz: 92c9383bc63d69d4064ca15b6a3c4fe099191052
5
5
  SHA512:
6
- metadata.gz: fc9c1c81e4b3ccd76df7259f01bbd8970ed18770a0f53d8d1631a236c0d460a3adcba521a42660c19db323232581b4a89432ab4b68d1a460062f79ab8eeb6078
7
- data.tar.gz: f48060d031e6b1865ce3f7f771e64889f8bf924a7748801a1dd50022ff6526336715a5617a86fe09ebff18b9a1932f30e77104913ab6858a176d4da7ffa588a8
6
+ metadata.gz: 05d308b83f9e9ff4435459ed0f60f4bec1aa5048e232c1b087f028bf19adc7a43e85582025c0e7b8883d7466694f08d653d604dd514ced85280bcf37e2d56998
7
+ data.tar.gz: 8797ed0f6c79b46f96aa095615b8e3183b2e96689123c28c09cb7b77ae3ef9dea00569fa5453d7488d369c3faebfb2f4eced24b46fdf54cd2e9a5a38a182e74f
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.1.2.1
1
+ 0.1.3.1
@@ -64,11 +64,15 @@ class GitDis
64
64
  raise "refusing to concatenate disparate filetypes: #{filetypes}"
65
65
  end
66
66
 
67
+ newline = "\n"
68
+
67
69
  payload = filenames.map { |fname|
68
70
  contents = File.read(fname) || raise("could not read #{fname}")
69
- sep << "\r" if !sep.include?("\r") and contents.include?("\r")
71
+ newline = "\r\n" if !newline.include?("\r") and contents.include?("\r")
70
72
  contents if !contents.empty?
71
- }.compact.join("#{sep}\n")
73
+ }.compact
74
+ sep = sep.empty? ? newline : "#{newline}#{sep}#{newline}"
75
+ payload.join(sep)
72
76
  end
73
77
 
74
78
  # return a specific separator for known filetypes
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: gitdis
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.2.1
4
+ version: 0.1.3.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Rick Hull
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-06-06 00:00:00.000000000 Z
11
+ date: 2015-06-10 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: slop