pretty_diff 2.1.2 → 2.1.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/VERSION +1 -1
- data/lib/pretty_diff/chunk.rb +8 -1
- data/pretty_diff.gemspec +2 -2
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: ae29c6c794c6c58e1c62cc7bbba4505aa317f65b
|
|
4
|
+
data.tar.gz: 7a053aa2276d927350ff6c91d099740dfbab105c
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 6784dc5c658d2299e4b78150e7099a091d0a87590abefac37aef5f3bc7fe517a8e52e800c278722335ddca5348b5fb346c263c36d6a15f6db0a1bd3a5d8d6e62
|
|
7
|
+
data.tar.gz: 0427a8b0eeaba442360c7d66de38c1c4151fbb6bde6b2191a6c8be84e163bb8112c226713530a40b497abb612ffad786c4734964c5a27833de5b80573e12bc75
|
data/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
2.1.
|
|
1
|
+
2.1.3
|
data/lib/pretty_diff/chunk.rb
CHANGED
|
@@ -21,7 +21,14 @@ module PrettyDiff
|
|
|
21
21
|
|
|
22
22
|
def find_lines
|
|
23
23
|
[].tap do |lines|
|
|
24
|
-
|
|
24
|
+
plain_lines = contents.split(/\r?\n|\r/)
|
|
25
|
+
wdiff(contents.split(/\r?\n|\r/)).each_with_index do |line_str, idx|
|
|
26
|
+
begin
|
|
27
|
+
line_str =~ //
|
|
28
|
+
rescue ArgumentError
|
|
29
|
+
line_str = plain_lines[idx]
|
|
30
|
+
end
|
|
31
|
+
|
|
25
32
|
line = Line.new(self, line_str)
|
|
26
33
|
next if line.ignored?
|
|
27
34
|
lines << line
|
data/pretty_diff.gemspec
CHANGED
|
@@ -5,11 +5,11 @@
|
|
|
5
5
|
|
|
6
6
|
Gem::Specification.new do |s|
|
|
7
7
|
s.name = "pretty_diff"
|
|
8
|
-
s.version = "2.1.
|
|
8
|
+
s.version = "2.1.3"
|
|
9
9
|
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
|
11
11
|
s.authors = ["Ilya Sabanin"]
|
|
12
|
-
s.date = "2014-
|
|
12
|
+
s.date = "2014-04-22"
|
|
13
13
|
s.description = "PrettyDiff is a highly customizable library for creating fully featured HTML\n listings out of unified diff format strings.\n Include copy/paste-safe line numbers and built-in syntax highlighting."
|
|
14
14
|
s.email = "ilya.sabanin@gmail.com"
|
|
15
15
|
s.extra_rdoc_files = [
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: pretty_diff
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.1.
|
|
4
|
+
version: 2.1.3
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Ilya Sabanin
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2014-
|
|
11
|
+
date: 2014-04-22 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: charlock_holmes
|