Travisに対応

diff --git a/.travis.yml b/.travis.yml
new file mode 100644 (file)
index 0000000..6167da3
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,13 @@
+language: ruby
+rvm:
+  - 1.9.3
+env:
+  - DB=mysql
+  - DB=postgresql
+before_install:
+  - gem update --system 1.8.25 
+  - gem install bundler
+before_script:
+  - cp config/database.yml.$DB config/database.yml
+  - bundle exec rake db:create db:migrate
+script: bundle exec ruby script/spec spec

diff --git a/Gemfile b/Gemfile
index 18f9e0d..2c9ff34 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -2,9 +2,13 @@ source 'https://rubygems.org'
 source 'http://gems.github.com'
 
 gem 'rails', '2.3.17'
+gem "tzinfo", "~> 0.3.31" 
+
+# Supported DBs
+gem "pg", :group => :postgresql
+
 gem 'rake', '~> 10.0'
 gem 'test-unit', '1.2.3'
-gem 'pg'
 gem 'rmagick', '2.13.2'
 gem 'gettext', '2.1.0'
 gem 'gruff', '0.3.6'

diff --git a/Gemfile.lock b/Gemfile.lock
index d6c461f..b21a1e0 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -91,6 +91,7 @@ GEM
       prawn (>= 0.12.0, <= 0.12.0)
     thoughtbot-factory_girl (1.2.2)
     ttfunk (1.0.3)
+    tzinfo (0.3.37)
     webmock (1.3.4)
       addressable (>= 2.1.1)
       crack (>= 0.1.7)
@@ -124,5 +125,6 @@ DEPENDENCIES
   test-unit (= 1.2.3)
   thinreports
   thoughtbot-factory_girl (= 1.2.2)
+  tzinfo (~> 0.3.31)
   webmock (= 1.3.4)
   will_paginate (~> 2.3)

diff --git a/config/database.example.yml b/config/database.yml.postgresql
similarity index 94%
rename from config/database.example.yml
rename to config/database.yml.postgresql
index 86a1dd5..db39800 100644 (file)
--- a/config/database.example.yml
+++ b/config/database.yml.postgresql
@@ -1,7 +1,7 @@
 common: &common
   adapter: postgresql
   username: postgres
-  password: 
+  password:
   host: localhost
   port: 5432