kdiff3 0.9.4 → 0.9.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/Gemfile.lock +10 -10
- data/lib/kdiff3.rb +5 -0
- data/lib/kdiff3/version.rb +1 -1
- data/spec/spec_helper.rb +1 -1
- metadata +4 -4
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 0c1fec1567d076d8cbf7caccf7b7f132ff2e6606
|
|
4
|
+
data.tar.gz: 2158d7087fe88cbd2770a3ae5ca45f0791682a23
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 6180f09647f610d5ec1288239ae18b78c8b4d6f5d72b9779dd13fa7cefaedcacb9f50a954fa7afa04af081ba37e6152aaa946081de70447c825f8ea5818b3d89
|
|
7
|
+
data.tar.gz: fd9e04c19b96ee0cc9eb607cdc8f844a454d45c599c590fbc0b43eb0febb4ddf9b6c1f67455ad23120808ca347c58dccb1003e6dc95390314da8d6a27e39e79b
|
data/Gemfile.lock
CHANGED
|
@@ -1,34 +1,34 @@
|
|
|
1
1
|
PATH
|
|
2
2
|
remote: .
|
|
3
3
|
specs:
|
|
4
|
-
kdiff3 (0.9.
|
|
4
|
+
kdiff3 (0.9.4)
|
|
5
5
|
activesupport (>= 3.2)
|
|
6
6
|
|
|
7
7
|
GEM
|
|
8
8
|
remote: https://rubygems.org/
|
|
9
9
|
specs:
|
|
10
|
-
activesupport (4.
|
|
11
|
-
i18n (~> 0.
|
|
10
|
+
activesupport (4.2.0)
|
|
11
|
+
i18n (~> 0.7)
|
|
12
12
|
json (~> 1.7, >= 1.7.7)
|
|
13
13
|
minitest (~> 5.1)
|
|
14
|
-
thread_safe (~> 0.
|
|
14
|
+
thread_safe (~> 0.3, >= 0.3.4)
|
|
15
15
|
tzinfo (~> 1.1)
|
|
16
|
-
awesome_print (1.
|
|
16
|
+
awesome_print (1.6.1)
|
|
17
17
|
byebug (3.5.1)
|
|
18
18
|
columnize (~> 0.8)
|
|
19
19
|
debugger-linecache (~> 1.2)
|
|
20
20
|
slop (~> 3.6)
|
|
21
|
-
codeclimate-test-reporter (0.4.
|
|
21
|
+
codeclimate-test-reporter (0.4.5)
|
|
22
22
|
simplecov (>= 0.7.1, < 1.0.0)
|
|
23
23
|
coderay (1.1.0)
|
|
24
|
-
columnize (0.
|
|
24
|
+
columnize (0.9.0)
|
|
25
25
|
debugger-linecache (1.2.0)
|
|
26
26
|
diff-lcs (1.2.5)
|
|
27
27
|
docile (1.1.5)
|
|
28
|
-
i18n (0.
|
|
29
|
-
json (1.8.
|
|
28
|
+
i18n (0.7.0)
|
|
29
|
+
json (1.8.2)
|
|
30
30
|
method_source (0.8.2)
|
|
31
|
-
minitest (5.
|
|
31
|
+
minitest (5.5.0)
|
|
32
32
|
multi_json (1.10.1)
|
|
33
33
|
pry (0.10.1)
|
|
34
34
|
coderay (~> 1.1.0)
|
data/lib/kdiff3.rb
CHANGED
|
@@ -108,6 +108,11 @@ module KDiff3
|
|
|
108
108
|
current_folder = File.dirname(__FILE__)
|
|
109
109
|
path = "#{current_folder}/../ext/kdiff3/releaseQt/kdiff3"
|
|
110
110
|
|
|
111
|
+
# update path for mac
|
|
112
|
+
if !RUBY_PLATFORM.match("darwin").nil?
|
|
113
|
+
path = "#{current_folder}/../ext/kdiff3/releaseQt/kdiff3.app/Contents/MacOS/kdiff3"
|
|
114
|
+
end
|
|
115
|
+
|
|
111
116
|
unless File.exist?(path)
|
|
112
117
|
raise 'kdiff3 from NullVoxPopuli/kdiff3 was not sucessfully compiled.'
|
|
113
118
|
end
|
data/lib/kdiff3/version.rb
CHANGED
data/spec/spec_helper.rb
CHANGED
|
@@ -7,7 +7,7 @@ require 'awesome_print' # ap object # to pretty print
|
|
|
7
7
|
|
|
8
8
|
# Coverage
|
|
9
9
|
require "codeclimate-test-reporter"
|
|
10
|
-
|
|
10
|
+
ENV['CODECLIMATE_REPO_TOKEN'] = "28ede3cf89bd481c235b8ecde1914a1c2b39a7bd45e3ddf67961c42416eabcc5"
|
|
11
11
|
CodeClimate::TestReporter.start
|
|
12
12
|
|
|
13
13
|
# This Gem
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: kdiff3
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.9.
|
|
4
|
+
version: 0.9.5
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- L. Preston Sego III
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date:
|
|
11
|
+
date: 2015-01-09 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: activesupport
|
|
@@ -594,10 +594,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
594
594
|
requirements:
|
|
595
595
|
- libqt4-dev
|
|
596
596
|
rubyforge_project:
|
|
597
|
-
rubygems_version: 2.
|
|
597
|
+
rubygems_version: 2.1.11
|
|
598
598
|
signing_key:
|
|
599
599
|
specification_version: 4
|
|
600
|
-
summary: kdiff3-0.9.
|
|
600
|
+
summary: kdiff3-0.9.5
|
|
601
601
|
test_files:
|
|
602
602
|
- spec/kdiff3_spec.rb
|
|
603
603
|
- spec/spec_helper.rb
|