Add ffi for georuby ext and update stop area map Refs #18 #20 #22

1 files changed, 37 insertions, 20 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index e61074d42..662e94b06 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,16 +1,4 @@
 GIT
-  remote: git://chouette.dryade.priv/ninoxe
-  revision: 9deb81a3121fdf295512f875a91ba7b5d0d106a4
-  specs:
-    ninoxe (0.0.8)
-      GeoRuby
-      activerecord (~> 3.1.3)
-      acts_as_list (= 0.1.6)
-      composite_primary_keys (= 4.1.2)
-      geokit
-      rails (= 3.1.3)
-
-GIT
   remote: git://github.com/dryade/activerecord-jdbc-adapter.git
   revision: 0bf424bc3bcaf9f44646976cc4c1a8e9e57f11b4
   specs:
@@ -34,6 +22,25 @@ GIT
     apartment (0.14.1)
 
 GIT
+  remote: git://github.com/dryade/ffi-proj4.git
+  revision: b3d868126f939030912dcf048c9fe1b54a2ad761
+  specs:
+    ffi-proj4 (0.0.1)
+      ffi (~> 1.0.0)
+
+GIT
+  remote: git://github.com/dryade/georuby-ext.git
+  revision: 809e03122b9e7d6881f7132b90b90720eaaab766
+  specs:
+    georuby-ext (0.0.1)
+      activesupport
+      ffi-geos (~> 0.0.4)
+      geokit
+      georuby
+      json_pure
+      rgeo (~> 0.3.13)
+
+GIT
   remote: git://github.com/thoughtbot/shoulda.git
   revision: 269edccc7df8f2eb94a96a6a6d248a5960d7fe1f
   specs:
@@ -48,11 +55,21 @@ GIT
     user_interface (0.0.1)
       rails (~> 3.1.0)
 
+PATH
+  remote: ~/projects/ninoxe
+  specs:
+    ninoxe (0.0.8)
+      GeoRuby
+      activerecord (~> 3.1.3)
+      acts_as_list (= 0.1.6)
+      composite_primary_keys (= 4.1.2)
+      geokit
+      rails (= 3.1.3)
+
 GEM
   remote: http://rubygems.org/
   specs:
     GeoRuby (1.3.4)
-    RedCloth (4.2.9)
     RedCloth (4.2.9-java)
     SyslogLogger (1.4.1)
     actionmailer (3.1.3)
@@ -89,7 +106,6 @@ GEM
     acts_as_list (0.1.6)
     addressable (2.2.8)
     arel (2.2.3)
-    bcrypt-ruby (3.0.1)
     bcrypt-ruby (3.0.1-java)
     bouncy-castle-java (1.5.0146.1)
     builder (3.0.0)
@@ -140,12 +156,14 @@ GEM
     factory_girl_rails (1.7.0)
       factory_girl (~> 2.6.0)
       railties (>= 3.0.0)
-    ffi (1.0.11)
     ffi (1.0.11-java)
+    ffi-geos (0.0.4)
+      ffi (~> 1.0.0)
     formtastic (2.0.2)
       rails (~> 3.0)
     geokit (1.6.5)
       multi_json
+    georuby (1.9.7)
     guard (1.0.2)
       ffi (>= 0.5.0)
       thor (~> 0.14.6)
@@ -166,10 +184,8 @@ GEM
     jruby-openssl (0.7.6.1)
       bouncy-castle-java (>= 1.5.0146.1)
     jruby-rack (1.1.5)
-    json (1.7.3)
     json (1.7.3-java)
-    launchy (2.1.0)
-      addressable (~> 2.2.6)
+    json_pure (1.7.3)
     launchy (2.1.0-java)
       addressable (~> 2.2.6)
       ffi (~> 1.0.9)
@@ -190,7 +206,6 @@ GEM
     net-ssh (2.3.0)
     net-ssh-gateway (1.1.0)
       net-ssh (>= 1.99.1)
-    nokogiri (1.5.2)
     nokogiri (1.5.2-java)
     orm_adapter (0.0.7)
     polyamorous (0.5.0)
@@ -238,6 +253,7 @@ GEM
       rspec (>= 2.0.0.alpha11)
     responders (0.9.1)
       railties (~> 3.1)
+    rgeo (0.3.13)
     rspec (2.10.0)
       rspec-core (~> 2.10.0)
       rspec-expectations (~> 2.10.0)
@@ -311,7 +327,6 @@ DEPENDENCIES
   capistrano
   capistrano-ext
   capybara
-  capybara-webkit
   cocoon
   coffee-rails (~> 3.1.1)
   coffee-script-source
@@ -320,7 +335,9 @@ DEPENDENCIES
   delayed_job_active_record
   devise
   factory_girl_rails (= 1.7)
+  ffi-proj4!
   formtastic (= 2.0.2)
+  georuby-ext!
   guard
   guard-rspec
   inherited_resources