geokdtree 0.1.0 → 0.2.0

data/CHANGELOG.md

@@ -0,0 +1,5 @@
+# 0.1.0, 02-19-2013
+- initial release
+
+# 0.2.0, 02-21-2013
+- refactored native lib build using ffi-compiler, fixed linux installation issues

data/README.md

@@ -1,4 +1,4 @@
-# Ruby/FFI Geokdtree v0.1.0
+# Geokdtree v0.2.0
 
 Ruby & JRuby gem with a fast **k-d tree** C implementation using FFI bindings with support for latitude/longitude and **geo distance range search**.
 
@@ -6,33 +6,21 @@ A [k-d tree](https://en.wikipedia.org/wiki/K-d_tree) is a space-partitioning dat
 
 ## Installation
 
-Tested on OSX 10.8.2 with
-- MRI Ruby 1.9.3 p362
-- MRI Ruby 1.9.3 p385
+Tested on **OSX 10.8.2** and **Linux 12.10** with
+- MRI Ruby 1.9.3 p362, 1.9.3 p385
 - JRuby 1.7.2 (1.9.3 p327)
 
 Add this line to your application's Gemfile:
-
+```
     gem 'geokdtree'
-
+```
 And then execute:
-
+```
     $ bundle
-
-Or install it yourself as:
-
-    $ gem install geokdtree
-
-## JRuby Notes
-
-if the gem installation fails with the following error message, this is because JRuby disabled native extensions by default. 
 ```
-Gem::Installer::ExtensionBuildError: ERROR: Failed to build gem native extension
+Or install it yourself as:
 ```
-
-To fix this simply set the following JRuby runtime option
-``` sh
-$ export JRUBY_OPTS=-Xcext.enabled=true
+    $ gem install geokdtree
 ```
 
 ## Usage
@@ -103,12 +91,20 @@ $ export JRUBY_OPTS=-Xcext.enabled=true
   puts(d.inspect) # => 403
 ```
 
+## Developement
+
+1. Fort it
+2. Install gems `$ bundle install`
+3. Compile lib `$ rake compile`
+4. Run specs `$ rake spec`
+5. Clean compiler generated files `$ rake clean`
+
 ## Contributing
 
 1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
+2. Create your feature branch `git checkout -b my-new-feature`
+3. Commit your changes `git commit -am 'Add some feature'`
+4. Push to the branch `git push origin my-new-feature`
 5. Create new Pull Request
 
 ## Credits
@@ -118,4 +114,4 @@ $ export JRUBY_OPTS=-Xcext.enabled=true
 Colin Surprenant, [@colinsurprenant](http://twitter.com/colinsurprenant), [http://github.com/colinsurprenant](http://github.com/colinsurprenant), colin.surprenant@gmail.com
 
 ## License
-Ruby/FFI Geokdtree is distributed under the Apache License, Version 2.0. 
+Geokdtree is distributed under the Apache License, Version 2.0. 

data/Rakefile

@@ -3,28 +3,25 @@ require 'rake'
 require 'rake/clean'
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
+require 'ffi-compiler/compile_task'
 
 task :default => :spec
 
-desc "clean, make and run specsrkae"
+desc "run specs"
 task :spec do
   RSpec::Core::RakeTask.new
 end
 
-desc "compile C ext and FFI ext and copy objects into lib"
-task :make => [:clean] do
-  Dir.chdir("ext/geokdtree") do
-    ruby jruby? ? "-Xcext.enabled=true extconf.rb" : "extconf.rb"
-    sh "make"
+desc "compiler tasks"
+namespace "ffi-compiler" do
+  FFI::Compiler::CompileTask.new('ext/geokdtree/geokdtree') do |c|
+    c.have_library?('pthread')
+    c.cflags << "-DUSE_LIST_NODE_ALLOCATOR"
   end
-  cp "ext/geokdtree/geokdtree.bundle", "lib/"
 end
+task :compile => ["ffi-compiler:default"]
 
 CLEAN.include('ext/**/*{.o,.log,.so,.bundle}')
 CLEAN.include('lib/**/*{.o,.log,.so,.bundle}')
 CLEAN.include('ext/**/Makefile')
 
-def jruby?
-  !!(defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby')
-end
-

data/ext/geokdtree/Rakefile

@@ -0,0 +1,6 @@
+require 'ffi-compiler/compile_task'
+
+FFI::Compiler::CompileTask.new('geokdtree') do |c|
+  c.have_library?('pthread')
+  c.cflags << "-DUSE_LIST_NODE_ALLOCATOR"
+end

data/geokdtree.gemspec

@@ -16,8 +16,11 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
-  gem.extensions    = ["ext/geokdtree/extconf.rb"]
+  gem.extensions    = ["ext/geokdtree/Rakefile"]
 
-  gem.add_development_dependency "rspec"
-  gem.add_runtime_dependency "ffi"
+  gem.add_dependency 'rake'
+  gem.add_dependency 'ffi'
+  gem.add_dependency 'ffi-compiler'
+  
+  gem.add_development_dependency 'rspec'
 end

data/lib/geokdtree.rb

@@ -1,10 +1,10 @@
 require 'ffi'
+require 'ffi-compiler/loader'
 
 module Geokdtree
   module C
     extend FFI::Library
-    
-  	ffi_lib File.dirname(__FILE__) + "/" + (FFI::Platform.mac? ? "geokdtree.bundle" : FFI.map_library_name("geokdtree"))
+    ffi_lib FFI::Compiler::Loader.find('geokdtree')
   end
 end
 

data/lib/geokdtree/version.rb

@@ -1,3 +1,3 @@
 module Geokdtree
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geokdtree
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,17 +9,17 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-19 00:00:00.000000000 Z
+date: 2013-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -43,24 +43,57 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ffi-compiler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby & JRuby gem with a fast k-d tree C implementation using FFI bindings
   with support for latitude/longitude and geo distance range search
 email:
 - colin.surprenant@gmail.com
 executables: []
 extensions:
-- ext/geokdtree/extconf.rb
+- ext/geokdtree/Rakefile
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - example/usage.rb
+- ext/geokdtree/Rakefile
 - ext/geokdtree/distance.c
 - ext/geokdtree/distance.h
-- ext/geokdtree/extconf.rb
 - ext/geokdtree/kdtree.c
 - ext/geokdtree/kdtree.h
 - geokdtree.gemspec
@@ -81,12 +114,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1969207989393657853
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1969207989393657853
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/ext/geokdtree/extconf.rb

@@ -1,7 +0,0 @@
-require 'mkmf'
-
-$CFLAGS = "-pedantic -Wall -g -O3 -fPIC -g -DUSE_LIST_NODE_ALLOCATOR"
-
-have_library("pthread")
-
-create_makefile 'geokdtree'