kdiff3 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a995c8ef2e0491b96bc41cd7ef0d3e58cbc0b7db
-  data.tar.gz: 2bf8b1b5dfc875b7b0041ee1d35b5a27849aaceb
+  metadata.gz: 52365cf659fb3fd8bca0b15cca2e6853f10dea8d
+  data.tar.gz: f5ae675033136ef25c4af34a142df66be96cc6c2
 SHA512:
-  metadata.gz: ecb0903d170966fc3ad0c6ae1bbdbedac196c0c23fee5d35852b7042af615f808742da182b9e64d15610f22c1229b37b496929072ca3052951c1bbae354bfcb9
-  data.tar.gz: 27dd3505ac62bc36803714fc33a836403a53e043fe514e9d4fd4db7fda0ae81c11f697f0044adcbca3167c8565576a90a867f8749a15d80e2496b7184eb2e384
+  metadata.gz: dcb80cfc208da8a50189e63e3e2684006e261c689ba9a67ad63ead35c20affbdd9dcef3fc6b8440620e9656ec70ae453d21b614af9498c67aa71ef5cc9530db4
+  data.tar.gz: db6c24056e1f409870d970773ece323b9b3db9ea7fee051c49ba276ba78b275d11f80e084ff2a9276d2165c1a8b0dcf7c91299c19622a725b6a7008b71fc437f

data/.travis.yml

@@ -4,6 +4,10 @@ rvm:
   - "2.0"
   - "2.1"
   - ruby-head
+before_script:
+  - cd ./ext/kdiff3 && ruby extconf.rb
+  # - gem build kdiff3.gemspec
+  # - gem install kdiff3-*
 script: "bundle exec rspec"
 addons:
   code_climate:
@@ -11,6 +15,4 @@ addons:
 branches:
   only: master
 notifications:
-  email: false
-env:
-  - USE_BIN_KDIFF3=true
+  email: false

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    kdiff3 (0.9.1)
-      activesupport
+    kdiff3 (0.9.2)
+      activesupport (>= 3.2)
 
 GEM
   remote: https://rubygems.org/
@@ -63,9 +63,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  awesome_print
-  bundler
-  codeclimate-test-reporter
+  awesome_print (>= 1.2)
+  bundler (>= 1.6.0)
+  codeclimate-test-reporter (>= 0.4.3)
   kdiff3!
-  pry-byebug
-  rspec
+  pry-byebug (>= 2.0.0)
+  rspec (>= 3.1.0)

data/README.md

@@ -1,7 +1,7 @@
 KDiff3
 ========
 
-[![Gem Version](http://img.shields.io/gem/v/KDiff3.svg?style=flat-square)](http://badge.fury.io/rb/KDiff3)
+[![Gem Version](http://img.shields.io/gem/v/kdiff3.svg?style=flat-square)](http://badge.fury.io/rb/kdiff3)
 [![Build Status](http://img.shields.io/travis/NullVoxPopuli/kdiff3-rb.svg?style=flat-square)](https://travis-ci.org/NullVoxPopuli/kdiff3-rb)
 [![Code Climate](http://img.shields.io/codeclimate/github/NullVoxPopuli/kdiff3-rb.svg?style=flat-square)](https://codeclimate.com/github/NullVoxPopuli/kdiff3-rb)
 [![Test Coverage](http://img.shields.io/codeclimate/coverage/github/NullVoxPopuli/kdiff3-rb.svg?style=flat-square)](https://codeclimate.com/github/NullVoxPopuli/kdiff3-rb)
@@ -12,11 +12,11 @@ Provides a simple way to utilize the power of [kdiff3 by Joachim Eibl](http://kd
 
 ## Installation
 
-    gem install KDiff3
+    gem install kdiff3
 
     or
 
-    gem 'KDiff3' # in your Gemfile
+    gem 'kdiff3' # in your Gemfile
 
 ## Examples
 

data/kdiff3.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.extensions    = ['ext/kdiff3/extconf.rb']
+  s.requirements  << 'libqt4-dev'
 
   s.required_ruby_version = '> 2.0'
 

data/lib/kdiff3.rb

@@ -109,33 +109,12 @@ module KDiff3
     path = "#{current_folder}/../ext/kdiff3/releaseQt/kdiff3"
 
     unless File.exist?(path)
-      build_kdiff3
+      raise 'kdiff3 from NullVoxPopuli/kdiff3 was not sucessfully compiled.'
     end
 
     path
   end
 
-  def self.build_kdiff3
-    current_folder = File.dirname(__FILE__)
-    kdiff3_repo_path = "#{current_folder}/../ext/kdiff3"
-
-    if  File.exist?(kdiff3_repo_path)
-      %x(
-        git pull # origin optionally-fail-on-conflict
-      )
-    else
-      %x(
-        git clone git@github.com:NullVoxPopuli/kdiff3.git #{kdiff3_repo_path}
-        cd #{kdiff3_repo_path} && git checkout optionally-fail-on-conflict
-      )
-    end
-
-    # build
-    %x(
-      cd #{kdiff3_repo_path} && ./configure qt4
-    )
-  end
-
   # add newlines after every tag, and every character
   def self.add_new_lines(text)
     text = self.add_new_lines_to_non_tags(text)

data/lib/kdiff3/version.rb

@@ -1,3 +1,3 @@
 module KDiff3
-  VERSION = "0.9.2"
+  VERSION = "0.9.3"
 end

data/spec/kdiff3_spec.rb

@@ -1,15 +1,6 @@
 require 'spec_helper'
 
 describe KDiff3 do
-  before(:each) do
-    if ENV['USE_BIN_KDIFF3']
-      current_folder = File.dirname(__FILE__)
-      # may only work on Ubuntu 14.04?
-      kdiff3_bin_path = "#{current_folder}/../bin/kdiff3"
-      allow(KDiff3).to receive(:kdiff3_path).and_return(kdiff3_bin_path)
-    end
-  end
-
 
   describe 'merge' do
     it { expect{KDiff3.merge}.to raise_error(ArgumentError) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kdiff3
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - L. Preston Sego III
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-10 00:00:00.000000000 Z
+date: 2014-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -96,8 +96,7 @@ dependencies:
         version: 0.4.3
 description: Ruby wrapper for the kdiff3 mergetool
 email: LPSego3+dev@gmail.com
-executables:
-- kdiff3
+executables: []
 extensions:
 - ext/kdiff3/extconf.rb
 extra_rdoc_files: []
@@ -110,7 +109,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- bin/kdiff3
 - ext/kdiff3/AUTHORS
 - ext/kdiff3/CMakeLists.txt
 - ext/kdiff3/COPYING
@@ -593,12 +591,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-requirements: []
+requirements:
+- libqt4-dev
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
-summary: kdiff3-0.9.2
+summary: kdiff3-0.9.3
 test_files:
 - spec/kdiff3_spec.rb
 - spec/spec_helper.rb