github integration

3 files changed, 22 insertions, 101 deletions

diff --git a/Gemfile b/Gemfile
index fc99efba0..839b57c7a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -22,7 +22,8 @@ end
 gem "map_layers", "~> 0.0.4"
 gem "georuby-ext", :git => 'git://github.com/dryade/georuby-ext.git'
 
-gem 'user_interface', :git => 'git://sim.dryade.priv/user_interface' #, :path => '~/Projects/UserInterfaceDryade'
+gem 'user_interface', :git => 'git://github.com/dryade/user-interface.git'
+#gem 'user_interface', :git => 'git://sim.dryade.priv/user_interface' #, :path => '~/Projects/UserInterfaceDryade'
 gem 'json'
 gem 'cocoon'
 gem 'formtastic'
@@ -35,7 +36,8 @@ gem 'jquery-rails'
 gem "modernizr-rails", "~> 2.0.6"
 
 gem "acts_as_tree", :git => "git://github.com/dryade/acts_as_tree.git"
-gem 'ninoxe', :git => 'git://chouette.dryade.priv/ninoxe' #, :path => '~/Projects/Ninoxe'
+gem 'ninoxe', :git => 'git://github.com/dryade/ninoxe.git'
+#gem 'ninoxe', :git => 'git://chouette.dryade.priv/ninoxe' #, :path => '~/Projects/Ninoxe'
 gem 'acts_as_list', '0.1.6'
 
 #gem 'composite_primary_keys', '~> 5.0.8'
diff --git a/Gemfile.github b/Gemfile.github
deleted file mode 100644
index 8501a21c3..000000000
--- a/Gemfile.github
+++ /dev/null
@@ -1,81 +0,0 @@
-source 'http://rubygems.org'
-
-gem 'rails', '3.2.6'
-gem 'devise'
-
-gem "ffi-proj4", :git => 'git://github.com/dryade/ffi-proj4.git'
-
-platforms :jruby do
-  gem 'activerecord-jdbcpostgresql-adapter', :git => 'git://github.com/dryade/activerecord-jdbc-adapter.git'
-  gem 'activerecord-jdbcsqlite3-adapter'
-  gem 'jruby-openssl'
-  gem "jruby-rack-worker"
-  gem 'warbler'   
-  gem "jruby-rack-worker"
-end
-
-platforms :ruby do    
-  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'
-
-gem 'user_interface', :git => 'git://github.com/dryade/user-interface'
-gem 'json'
-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 "acts_as_tree", :git => "git://github.com/dryade/acts_as_tree.git"
-gem 'ninoxe', :git => 'git://github.com/dryade/ninoxe.git'
-gem 'acts_as_list', '0.1.6'
-
-#gem 'composite_primary_keys', '~> 5.0.8'
-gem 'delayed_job_active_record'
-gem 'apartment',:git => 'git://github.com/dryade/apartment.git'
-
-# Gems used only for assets and not required
-# in production environments by default.
-group :assets do
-  gem 'sass-rails',   '~> 3.2.3'
-  gem 'coffee-rails', '~> 3.2.1'
-  gem 'coffee-script-source'
-  gem 'uglifier', '>= 1.0.3'
-  gem 'therubyrhino', :platform => :jruby
-  gem 'therubyracer', :platform => :ruby
-end
-
-group :development do 
-  gem 'capistrano'
-  gem 'capistrano-ext'   
-  gem 'guard'
-  gem 'guard-rspec'
-end
-
-group :test, :development do
-  gem "rspec"
-  gem "rspec-rails"
-  gem "remarkable", "~> 4.0.0.alpha4"           
-  gem "remarkable_activerecord", "~> 4.0.0.alpha4" 
-  gem "shoulda", :git => 'git://github.com/thoughtbot/shoulda.git'
-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'
-end
-
-group :production do
-   gem "SyslogLogger"
-end
-
diff --git a/Gemfile.lock b/Gemfile.lock
index f7298e6f3..3a446184e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,16 +1,4 @@
 GIT
-  remote: git://chouette.dryade.priv/ninoxe
-  revision: 34f3b94569b35d8ce51e2b036c12e067e2222eec
-  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/dnagir/database_cleaner.git
   revision: 0c0aa44f13ae392000a6f506b62d5d1602cb4e53
   branch: postgre_jruby_issue
@@ -60,20 +48,32 @@ GIT
       rgeo (~> 0.3.13)
 
 GIT
-  remote: git://github.com/thoughtbot/shoulda.git
-  revision: 269edccc7df8f2eb94a96a6a6d248a5960d7fe1f
+  remote: git://github.com/dryade/ninoxe.git
+  revision: 34f3b94569b35d8ce51e2b036c12e067e2222eec
   specs:
-    shoulda (3.0.1)
-      shoulda-context (~> 1.0)
-      shoulda-matchers (~> 1.0)
+    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://sim.dryade.priv/user_interface
+  remote: git://github.com/dryade/user-interface.git
   revision: 6931e642037ffef9d3818669a5f5167a0298b30b
   specs:
     user_interface (0.0.1)
       rails (> 3.1.0)
 
+GIT
+  remote: git://github.com/thoughtbot/shoulda.git
+  revision: 269edccc7df8f2eb94a96a6a6d248a5960d7fe1f
+  specs:
+    shoulda (3.0.1)
+      shoulda-context (~> 1.0)
+      shoulda-matchers (~> 1.0)
+
 GEM
   remote: http://rubygems.org/
   specs: