diff options
| -rw-r--r-- | .travis.yml | 13 | ||||
| -rw-r--r-- | README.textile | 12 | ||||
| -rw-r--r-- | config/database.yml | 4 | ||||
| -rw-r--r-- | config/database.yml.travis | 5 | ||||
| -rw-r--r-- | lib/tasks/ci.rake | 3 |
5 files changed, 30 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..3ec535d43 --- /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" + - "rake ci:travis" +script: "rake spec" +notifications: + recipients: + - luc.donnet@dryade.net + - michel.etienne@dryade.net
\ No newline at end of file diff --git a/README.textile b/README.textile index ac941ee73..9b849fa43 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. License 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..0335bca94 --- /dev/null +++ b/config/database.yml.travis @@ -0,0 +1,5 @@ +test: + adapter: jdbcpostgresql + 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..6c36a6c83 100644 --- a/lib/tasks/ci.rake +++ b/lib/tasks/ci.rake @@ -2,6 +2,9 @@ namespace :ci do task :db_config do cp "config/database.yml.ccontrol", "config/database.yml" end + task :travis do + cp "config/database.yml.travis", "config/database.yml" + end task :prepare => ["ci:db_config", "db:migrate"] task :deploy do cp "chouette2.war", "/var/lib/tomcat6/webapps/" |