diff options
| author | Zack Hobson | 2015-06-08 17:41:31 -0700 |
|---|---|---|
| committer | Zack Hobson | 2015-06-08 17:41:31 -0700 |
| commit | 6f1fabf5c1faf328ff194d42d2e23246daa9aa54 (patch) | |
| tree | 2afe46bd115a6bc60d448fe8994845a19a55c14c | |
| parent | d5ca9a70a27a1992fea4fb7603e9a0a039cff88b (diff) | |
| parent | 23e2bec903de778956ce3e4939a4c943bba915ea (diff) | |
| download | hcl-6f1fabf5c1faf328ff194d42d2e23246daa9aa54.tar.bz2 | |
Merge pull request #66 from asymmetric/multiple-gemfiles
Multiple gemfiles
| -rw-r--r-- | .travis.yml | 16 | ||||
| -rw-r--r-- | Gemfile | 17 | ||||
| -rw-r--r-- | Gemfile.lock | 13 | ||||
| -rw-r--r-- | gemfiles/Gemfile.rbx | 16 |
4 files changed, 35 insertions, 27 deletions
diff --git a/.travis.yml b/.travis.yml index 86dd4bc..9e58dad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,10 @@ -language: ruby -rvm: - - 2.0.0 - - 2.1.6 - - 2.2.2 - - rbx-2.5.3 +matrix: + include: + - rvm: 2.0.0 + gemfile: Gemfile + - rvm: 2.1.6 + gemfile: Gemfile + - rvm: 2.2.2 + gemfile: Gemfile + - rvm: rbx-2.5.3 + gemfile: gemfiles/Gemfile.rbx @@ -1,11 +1,10 @@ source "https://rubygems.org" gemspec -gem 'ronn', group:['development'] -# XXX this is dumb but it's crazy hard to get platform specfic deps into a gemspec -gem 'byebug', group:['test','development'], platform:'ruby_20' -gem 'rubysl-abbrev', platform:'rbx' -gem 'rubysl-singleton', platform:'rbx' -gem 'rubysl-rexml', platform:'rbx' -gem 'rubysl-coverage', platform:'rbx', group:'test' -gem 'rubinius-coverage', platform:'rbx', group:'test' -gem 'yajl-ruby', platform:'rbx', group:'test' + +group :development do + gem 'ronn' +end + +group :test, :development do + gem 'byebug' +end diff --git a/Gemfile.lock b/Gemfile.lock index 3af24e0..7052d9c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -52,12 +52,7 @@ GEM hpricot (>= 0.8.2) mustache (>= 0.7.0) rdiscount (>= 1.5.8) - rubinius-coverage (2.0.3) rubygems-tasks (0.2.4) - rubysl-abbrev (2.0.4) - rubysl-coverage (2.0.3) - rubysl-rexml (2.0.4) - rubysl-singleton (2.0.0) simplecov (0.10.0) docile (~> 1.1.0) json (~> 1.8) @@ -81,15 +76,9 @@ DEPENDENCIES mocha rake ronn - rubinius-coverage rubygems-tasks - rubysl-abbrev - rubysl-coverage - rubysl-rexml - rubysl-singleton simplecov - yajl-ruby yard BUNDLED WITH - 1.10.2 + 1.10.3 diff --git a/gemfiles/Gemfile.rbx b/gemfiles/Gemfile.rbx new file mode 100644 index 0000000..ffd28fc --- /dev/null +++ b/gemfiles/Gemfile.rbx @@ -0,0 +1,16 @@ +source "https://rubygems.org" +gemspec path: '..' + +gem 'rubysl-abbrev' +gem 'rubysl-singleton' +gem 'rubysl-rexml' + +group :development do + gem 'ronn' +end + +group :test do + gem 'rubysl-coverage' + gem 'rubinius-coverage' + gem 'yajl-ruby' +end |