Fix gem versions for ninoxe and apartment

1 files changed, 32 insertions, 37 deletions

diff --git a/Gemfile b/Gemfile
index eb2ae2de3..3df61b34f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,60 +1,60 @@
 source 'http://rubygems.org'
 
-gem 'rails', '3.2.6'
-gem 'devise'
-gem 'devise_invitable'
-#gem 'devise-encryptable'
-
-gem "ffi-proj4", :git => 'git://github.com/dryade/ffi-proj4.git'
+gem 'rails', '3.2.6'    
 
 platforms :jruby do
-  gem 'activerecord-jdbcpostgresql-adapter', :git => 'git://github.com/dryade/activerecord-jdbc-adapter.git'
+  gem 'activerecord-jdbcpostgresql-adapter'
   gem 'activerecord-jdbcsqlite3-adapter'
   gem 'jruby-openssl'
   gem "jruby-rack-worker"
   gem 'warbler'   
+  gem 'therubyrhino'      
 end
 
-platforms :ruby do    
+platforms :ruby do
+  gem 'therubyracer', '~> 0.10.2'          
   gem 'pg', '~> 0.11.0' 
   gem 'sqlite3'
 end
 
-gem "map_layers", "~> 0.0.4"
-gem "georuby-ext", :git => 'git://github.com/dryade/georuby-ext.git'
+# Authentication
+gem 'devise', '2.1.3'
+gem 'devise_invitable'
 
-gem 'user_interface', :git => 'git://github.com/dryade/user-interface.git'
+# Map, Geolocalization
+gem "map_layers", "0.0.4"
+gem "georuby-ext", "0.0.2"
 
-gem 'json'
+# User interface
+gem 'user_interface', "0.0.2"
+gem 'gravatar_image_tag'
+gem 'calendar_helper', "0.2.5"
 gem 'cocoon'
 gem 'formtastic'
-gem 'inherited_resources'
-gem 'will_paginate', '~> 3.0'
-gem 'ransack'
-gem 'squeel'
 gem 'RedCloth'
 gem 'jquery-rails'
 gem "modernizr-rails", "~> 2.0.6"
-gem 'gravatar_image_tag'
-gem 'calendar_helper', :git => "git://github.com/topfunky/calendar_helper.git"
 
-gem "acts_as_tree", :git => "git://github.com/dryade/acts_as_tree.git"
-#gem 'ninoxe', :git => 'git://github.com/dryade/ninoxe.git'
-gem 'ninoxe', :git => 'git://github.com/dryade/ninoxe.git', :branch => 'master'
-#gem 'ninoxe', :git => 'git://chouette.dryade.priv/ninoxe' #, :path => '~/Projects/Ninoxe'
-#gem 'ninoxe', :path => '~/workspace/chouette/ninoxe'
+# Format Output
+gem 'json'
+
+# Controller
+gem 'inherited_resources'
+
+# Model
+gem 'will_paginate', '~> 3.0'
+gem 'ransack'
+gem 'squeel'
+gem 'ninoxe', '0.1.0'
 gem 'acts_as_list', '0.1.6'
-gem 'foreigner', '>=1.3.0'
-#gem 'composite_primary_keys', '~> 5.0.8'
+gem "acts_as_tree-1.8", '1.1.0', :require => "acts_as_tree"
+
 gem 'delayed_job_active_record'
-gem 'apartment',:git => 'git://github.com/dryade/apartment.git'
+gem 'dr-apartment', :require => "apartment"
 
 # some views use coffee script
 gem 'coffee-rails', '~> 3.2.1'
 gem 'coffee-script-source'
-gem 'therubyrhino', :platform => :jruby
-gem 'therubyracer', '~> 0.10.2', :platform => :ruby
-
 gem 'rabl'
 
 # Gems used only for assets and not required
@@ -72,20 +72,15 @@ group :development do
 end
 
 group :test, :development do
-  gem "rspec"
-  gem "rspec-rails"
+  gem "rspec-rails", "~> 2.0"
   gem "remarkable", "~> 4.0.0.alpha4"           
   gem "remarkable_activerecord", "~> 4.0.0.alpha4" 
   gem "shoulda-matchers"
-  gem 'rb-inotify', :require => RUBY_PLATFORM.include?('linux') && 'rb-inotify'
-  gem 'rb-fsevent', :require => RUBY_PLATFORM.include?('darwin') && 'rb-fsevent'
-end
-
-group :test do
   gem 'capybara'     
   gem 'launchy'
-  gem 'database_cleaner', :git => 'git://github.com/dnagir/database_cleaner.git', :branch => 'postgre_jruby_issue'
   gem 'factory_girl_rails', '1.7'
+  gem 'rb-inotify', :require => RUBY_PLATFORM.include?('linux') && 'rb-inotify'
+  gem 'rb-fsevent', :require => RUBY_PLATFORM.include?('darwin') && 'rb-fsevent'
 end
 
 group :production do