kdiff3 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c5c8b67ee5e3e838573cef92727d53a79f8a986
-  data.tar.gz: 1fb39bd396a9decd0e33193b79800607c8960d6f
+  metadata.gz: 0c1fec1567d076d8cbf7caccf7b7f132ff2e6606
+  data.tar.gz: 2158d7087fe88cbd2770a3ae5ca45f0791682a23
 SHA512:
-  metadata.gz: 67b0889a7d19209b02e4c43883ec99f6029f478bb35beb4d76e82f6d4c8fc87d684e9ca2bbae350ac92a6c46adc5f2510667413e663b701561e473aa537a7814
-  data.tar.gz: 12792650ec3e42d1ef489982e719f433834d19564b1c979c3fb9aad0054961fccc6745053c28905936e675709676e863f1de924412798277c3b98a4ee018afd0
+  metadata.gz: 6180f09647f610d5ec1288239ae18b78c8b4d6f5d72b9779dd13fa7cefaedcacb9f50a954fa7afa04af081ba37e6152aaa946081de70447c825f8ea5818b3d89
+  data.tar.gz: fd9e04c19b96ee0cc9eb607cdc8f844a454d45c599c590fbc0b43eb0febb4ddf9b6c1f67455ad23120808ca347c58dccb1003e6dc95390314da8d6a27e39e79b

data/Gemfile.lock

@@ -1,34 +1,34 @@
 PATH
   remote: .
   specs:
-    kdiff3 (0.9.3)
+    kdiff3 (0.9.4)
       activesupport (>= 3.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.1.8)
-      i18n (~> 0.6, >= 0.6.9)
+    activesupport (4.2.0)
+      i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    awesome_print (1.2.0)
+    awesome_print (1.6.1)
     byebug (3.5.1)
       columnize (~> 0.8)
       debugger-linecache (~> 1.2)
       slop (~> 3.6)
-    codeclimate-test-reporter (0.4.3)
+    codeclimate-test-reporter (0.4.5)
       simplecov (>= 0.7.1, < 1.0.0)
     coderay (1.1.0)
-    columnize (0.8.9)
+    columnize (0.9.0)
     debugger-linecache (1.2.0)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    i18n (0.6.11)
-    json (1.8.1)
+    i18n (0.7.0)
+    json (1.8.2)
     method_source (0.8.2)
-    minitest (5.4.3)
+    minitest (5.5.0)
     multi_json (1.10.1)
     pry (0.10.1)
       coderay (~> 1.1.0)

data/lib/kdiff3.rb

@@ -108,6 +108,11 @@ module KDiff3
     current_folder = File.dirname(__FILE__)
     path = "#{current_folder}/../ext/kdiff3/releaseQt/kdiff3"
 
+    # update path for mac
+    if !RUBY_PLATFORM.match("darwin").nil?
+      path = "#{current_folder}/../ext/kdiff3/releaseQt/kdiff3.app/Contents/MacOS/kdiff3"
+    end
+
     unless File.exist?(path)
       raise 'kdiff3 from NullVoxPopuli/kdiff3 was not sucessfully compiled.'
     end

data/lib/kdiff3/version.rb

@@ -1,3 +1,3 @@
 module KDiff3
-  VERSION = "0.9.4"
+  VERSION = "0.9.5"
 end

data/spec/spec_helper.rb

@@ -7,7 +7,7 @@ require 'awesome_print' # ap object # to pretty print
 
 # Coverage
 require "codeclimate-test-reporter"
-# ENV['CODECLIMATE_REPO_TOKEN'] = ""
+ENV['CODECLIMATE_REPO_TOKEN'] = "28ede3cf89bd481c235b8ecde1914a1c2b39a7bd45e3ddf67961c42416eabcc5"
 CodeClimate::TestReporter.start
 
 # This Gem

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kdiff3
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - L. Preston Sego III
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-11 00:00:00.000000000 Z
+date: 2015-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -594,10 +594,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - libqt4-dev
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
-summary: kdiff3-0.9.4
+summary: kdiff3-0.9.5
 test_files:
 - spec/kdiff3_spec.rb
 - spec/spec_helper.rb