From ba282a854cfbc1031920a58f32ced64b76e4874a Mon Sep 17 00:00:00 2001 From: Samuel Cochran Date: Mon, 7 Dec 2015 14:09:04 +1100 Subject: [PATCH] Test different versions of eventmachine --- .gitignore | 3 ++ .travis.yml | 28 ++++++++++-- Gemfile | 8 ++-- Gemfile.lock | 117 --------------------------------------------------- 4 files changed, 31 insertions(+), 125 deletions(-) delete mode 100644 Gemfile.lock diff --git a/.gitignore b/.gitignore index a4b4b4e..17bcdfd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +# Host-specific gems +Gemfile.lock + # Caches .bundle .sass-cache diff --git a/.travis.yml b/.travis.yml index af21021..94a9adf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,28 @@ language: ruby +sudo: false rvm: - 1.9.3 - - 2.0.0 - - 2.1.5 - - 2.2.0 + - 2.0 + - 2.1 + - 2.2 +env: + - EVENTMACHINE=1.0.0 + - EVENTMACHINE=1.0.1 + - EVENTMACHINE=1.0.2 + - EVENTMACHINE=1.0.3 + - EVENTMACHINE=1.0.4 + - EVENTMACHINE=1.0.5 + - EVENTMACHINE=1.0.6 + - EVENTMACHINE=1.0.7 + - EVENTMACHINE=1.0.8 +matrix: + exclude: + - rvm: 2.2 + env: EVENTMACHINE=1.0.0 + - rvm: 2.2 + env: EVENTMACHINE=1.0.1 + - rvm: 2.2 + env: EVENTMACHINE=1.0.2 + - rvm: 2.2 + env: EVENTMACHINE=1.0.3 + diff --git a/Gemfile b/Gemfile index f5c5665..b871d2a 100644 --- a/Gemfile +++ b/Gemfile @@ -2,8 +2,6 @@ source "https://rubygems.org" gemspec -# gem "eventmachine", path: "#{ENV["HOME"]}/Projects/eventmachine" - -#group :development do -# gem "pry" -#end +if ENV.has_key? "EVENTMACHINE" + gem "eventmachine", ENV["EVENTMACHINE"] +end diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index 93a3d2e..0000000 --- a/Gemfile.lock +++ /dev/null @@ -1,117 +0,0 @@ -PATH - remote: . - specs: - mailcatcher (0.6.1) - activesupport (>= 4.0.0, < 5) - eventmachine (~> 1.0.0, <= 1.0.8) - mail (~> 2.3) - sinatra (~> 1.2) - skinny (~> 0.2.3) - sqlite3 (~> 1.3) - thin (~> 1.5.0) - -GEM - remote: https://rubygems.org/ - specs: - activesupport (4.2.5) - i18n (~> 0.7) - json (~> 1.7, >= 1.7.7) - minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) - tzinfo (~> 1.1) - childprocess (0.5.8) - ffi (~> 1.0, >= 1.0.11) - chunky_png (1.3.5) - coffee-script (2.4.1) - coffee-script-source - execjs - coffee-script-source (1.10.0) - compass (1.0.3) - chunky_png (~> 1.2) - compass-core (~> 1.0.2) - compass-import-once (~> 1.0.5) - rb-fsevent (>= 0.9.3) - rb-inotify (>= 0.9) - sass (>= 3.3.13, < 3.5) - compass-core (1.0.3) - multi_json (~> 1.0) - sass (>= 3.3.0, < 3.5) - compass-import-once (1.0.5) - sass (>= 3.2, < 3.5) - daemons (1.2.3) - eventmachine (1.0.8) - execjs (2.6.0) - ffi (1.9.10) - hike (1.2.3) - i18n (0.7.0) - json (1.8.3) - mail (2.6.3) - mime-types (>= 1.16, < 3) - mime-types (2.99) - minitest (5.8.3) - multi_json (1.11.2) - rack (1.6.4) - rack-protection (1.5.3) - rack - rake (10.4.2) - rb-fsevent (0.9.6) - rb-inotify (0.9.5) - ffi (>= 0.5.0) - rdoc (4.2.0) - rubyzip (1.1.7) - sass (3.4.19) - selenium-webdriver (2.48.1) - childprocess (~> 0.5) - multi_json (~> 1.0) - rubyzip (~> 1.0) - websocket (~> 1.0) - sinatra (1.4.6) - rack (~> 1.4) - rack-protection (~> 1.4) - tilt (>= 1.3, < 3) - skinny (0.2.3) - eventmachine (~> 1.0.0) - thin (~> 1.5.0) - sprockets (2.12.4) - hike (~> 1.2) - multi_json (~> 1.0) - rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) - sprockets-helpers (1.2.1) - sprockets (>= 2.2) - sprockets-sass (1.3.1) - sprockets (~> 2.0) - tilt (~> 1.1) - sqlite3 (1.3.11) - thin (1.5.1) - daemons (>= 1.0.9) - eventmachine (>= 0.12.6) - rack (>= 1.0.0) - thread_safe (0.3.5) - tilt (1.4.1) - tzinfo (1.2.2) - thread_safe (~> 0.1) - uglifier (2.7.2) - execjs (>= 0.3.0) - json (>= 1.8.0) - websocket (1.2.2) - -PLATFORMS - ruby - -DEPENDENCIES - coffee-script - compass - mailcatcher! - minitest (~> 5.0) - rake - rdoc - sass - selenium-webdriver - sprockets - sprockets-helpers - sprockets-sass - uglifier - -BUNDLED WITH - 1.10.6