From 66fe86d1b9e56f83c362ca67dcf27d2bdce1ea24 Mon Sep 17 00:00:00 2001 From: Cyril Mougel Date: Fri, 3 Feb 2012 22:07:00 +0100 Subject: [PATCH 1/5] add travis conf --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..3734c00 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,6 @@ +language: ruby +rvm: + - 1.8.7 + - 1.9.2 + - 1.9.3 +script: rake test:ruby From 65c937ff64c579100a69ef20292ad826d4f0b29c Mon Sep 17 00:00:00 2001 From: Cyril Mougel Date: Fri, 3 Feb 2012 22:11:19 +0100 Subject: [PATCH 2/5] add Gemfile needed by travis --- .travis.yml | 2 +- Gemfile | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 Gemfile diff --git a/.travis.yml b/.travis.yml index 3734c00..641e9b8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,4 +3,4 @@ rvm: - 1.8.7 - 1.9.2 - 1.9.3 -script: rake test:ruby +script: bundle exec rake test:ruby diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000..7fcd75c --- /dev/null +++ b/Gemfile @@ -0,0 +1,6 @@ +source :rubygems +gem 'rake' +gem 'shoulda' +gem 'mocha' + +gemspec From 0426bd3d5acb3d5c435848a2b20bfd4122441f05 Mon Sep 17 00:00:00 2001 From: Cyril Mougel Date: Fri, 3 Feb 2012 22:12:32 +0100 Subject: [PATCH 3/5] avoid gemspec in Gemfile because multiple gemspec --- Gemfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Gemfile b/Gemfile index 7fcd75c..3a095fa 100644 --- a/Gemfile +++ b/Gemfile @@ -2,5 +2,3 @@ source :rubygems gem 'rake' gem 'shoulda' gem 'mocha' - -gemspec From 9febf7e15cd8800f33e899e653f083977b6c2c18 Mon Sep 17 00:00:00 2001 From: Cyril Mougel Date: Fri, 3 Feb 2012 22:19:36 +0100 Subject: [PATCH 4/5] add json_pure in Gemfile because not in stdlib in ruby 1.8 --- Gemfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Gemfile b/Gemfile index 3a095fa..de5151e 100644 --- a/Gemfile +++ b/Gemfile @@ -2,3 +2,4 @@ source :rubygems gem 'rake' gem 'shoulda' gem 'mocha' +gem 'json_pure' From 53b7f8f81c4b358c64bc5e18a70d6733f4dd2801 Mon Sep 17 00:00:00 2001 From: Cyril Mougel Date: Fri, 3 Feb 2012 22:35:38 +0100 Subject: [PATCH 5/5] use the platforms option to avoid install json_pure where is not needed --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index de5151e..4c7b791 100644 --- a/Gemfile +++ b/Gemfile @@ -2,4 +2,4 @@ source :rubygems gem 'rake' gem 'shoulda' gem 'mocha' -gem 'json_pure' +gem 'json_pure', :platforms => :mri_18