Merge branch 'master' into api_key

7 files changed, 49 insertions, 19 deletions

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000..bc8a4c271
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,13 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - jruby-18mode
+
+before_script: 
+  - "sudo apt-get install build-essential ruby-dev libproj-dev libgeos-dev libffi-dev libsparsehash-dev zlib1g-dev libxslt1-dev libxml2-dev libbz2-dev"
+  - "psql -c 'create database chouette_test;' -U postgres"
+  - "rake ci:prepare_travis"
+script: "rake spec"
+notifications:
+  recipients:
+    - luc.donnet@dryade.net
\ No newline at end of file
diff --git a/Gemfile b/Gemfile
index 202f9b18d..29ee02032 100644
--- a/Gemfile
+++ b/Gemfile
@@ -23,8 +23,8 @@ 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.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 'json'
 gem 'cocoon'
 gem 'formtastic'
diff --git a/Gemfile.lock b/Gemfile.lock
index bae9f8da5..32b01c903 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -59,19 +59,19 @@ GIT
       rails (>= 3.1.3)
 
 GIT
+  remote: git://github.com/dryade/user-interface.git
+  revision: 2a30a4eb3ff446f9d2b2de12ecacb5f923e5623c
+  specs:
+    user_interface (0.0.1)
+      rails (> 3.1.0)
+
+GIT
   remote: git://github.com/topfunky/calendar_helper.git
   revision: 763a497dbd8833b98d92815667b367ade938c00c
   specs:
     calendar_helper (0.2.5)
       open4
 
-GIT
-  remote: git://sim.dryade.priv/user_interface
-  revision: d828d7107f2b4025853cbfa7cc0e76cceca27da6
-  specs:
-    user_interface (0.0.1)
-      rails (> 3.1.0)
-
 GEM
   remote: http://rubygems.org/
   specs:
@@ -116,7 +116,7 @@ GEM
     bcrypt-ruby (3.0.1-java)
     bouncy-castle-java (1.5.0146.1)
     builder (3.0.4)
-    capistrano (2.13.3)
+    capistrano (2.13.5)
       highline
       net-scp (>= 1.0.0)
       net-sftp (>= 2.0.0)
@@ -182,7 +182,7 @@ GEM
     guard-rspec (1.2.1)
       guard (>= 1.1)
     has_scope (0.5.1)
-    highline (1.6.14)
+    highline (1.6.15)
     hike (1.2.1)
     i18n (0.6.1)
     inherited_resources (1.3.1)
@@ -227,7 +227,7 @@ GEM
       net-ssh (>= 1.99.1)
     net-sftp (2.0.5)
       net-ssh (>= 2.0.9)
-    net-ssh (2.5.2)
+    net-ssh (2.6.2)
     net-ssh-gateway (1.1.0)
       net-ssh (>= 1.99.1)
     nokogiri (1.5.5)
diff --git a/README.textile b/README.textile
index ac941ee73..8ad0a8172 100644
--- a/README.textile
+++ b/README.textile
@@ -1,4 +1,6 @@
-h1. License
+h1. Chouette2 !https://travis-ci.org/dryade/chouette2.png?branch=master!:https://travis-ci.org/dryade/chouette2 !https://codeclimate.com/badge.png!:https://codeclimate.com/github/dryade/ninoxe
+
+h2. Licence
 
 Copyright "AFIMB":http://www.developpement-durable.gouv.fr/Presentation-de-l-AFIMB.html
 
@@ -30,9 +32,9 @@ In this respect, the user's attention is drawn to the risks associated with load
 
 The fact that you are presently reading this means that you have had knowledge of the CeCILL-B license and that you accept its terms.
 
-h1. Notes de version
+h2. Notes de version
 
-h2. V2.0.1 
+h3. V2.0.1 
 
 * Ajout de la gestion des groupes de lignes
 * Ajout de la gestion des accès et des relations arrêts-accès
@@ -40,9 +42,9 @@ h2. V2.0.1
 * Améliorations ergonomiques et cartographiques
 * L'import Neptune accepte les principaux formats d'encodage : ISO-8859-1, UTF-8, ...
 
-h2. V2.0.0 
+h3. V2.0.0 
 
 * refonte de l'interface graphique
 * ajout d'une gestion simplifiée d'utilisateurs :
 ** ajout d'une notion d'organisation
-** ajout d'une notion d'espace de données
\ No newline at end of file
+** ajout d'une notion d'espace de données
diff --git a/config/database.yml b/config/database.yml
index 0c5c4ba6e..ecff83b1f 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -8,8 +8,8 @@ development:
   adapter: <%= RUBY_PLATFORM == "java" ? "jdbcpostgresql" : "postgresql" %>
   database: chouette_dev
   encoding: utf8
-  username: chouette
-  password: chouette
+  username: luc
+  password: monalisa
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
diff --git a/config/database.yml.travis b/config/database.yml.travis
new file mode 100644
index 000000000..797872065
--- /dev/null
+++ b/config/database.yml.travis
@@ -0,0 +1,11 @@
+development:
+  adapter: <%= RUBY_PLATFORM == "java" ? "jdbcpostgresql" : "postgresql" %>
+  database: <%= (ENV["GIT_BRANCH"].nil? || ENV["GIT_BRANCH"] == "master") ? "chouette_dev" : "chouette_" + ENV["GIT_BRANCH"] + "_dev" %>
+  encoding: utf8
+  username: postgres
+
+test:
+  adapter: <%= RUBY_PLATFORM == "java" ? "jdbcpostgresql" : "postgresql" %>
+  database: <%= (ENV["GIT_BRANCH"].nil? || ENV["GIT_BRANCH"] == "master") ? "chouette_test" : "chouette_" + ENV["GIT_BRANCH"] + "_test" %>
+  encoding: utf8
+  username: postgres
\ No newline at end of file
diff --git a/lib/tasks/ci.rake b/lib/tasks/ci.rake
index d62b475ab..8a59f54b9 100644
--- a/lib/tasks/ci.rake
+++ b/lib/tasks/ci.rake
@@ -1,4 +1,8 @@
 namespace :ci do
+  task :db_travis_config do
+    cp "config/database.yml.travis", "config/database.yml"
+  end
+  task :prepare_travis => ["ci:db_travis_config", "apartment:migrate"]
   task :db_config do
     cp "config/database.yml.ccontrol", "config/database.yml"
   end