Merge pull request #161 from skalee/fixed-sinatra-dep

Fixed problematic Sinatra dependency
sendgrid · May 2, 2017 · b518327 · b518327
2 parents 9e4b38b + 92d177c
commit b518327
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,9 @@
 language: ruby
 rvm:
 - 2.2
+gemfile:
+- gemfiles/Sinatra_1.gemfile
+- gemfiles/Sinatra_2.gemfile
 before_script:
 - mkdir prism
 - mkdir prism/bin

diff --git a/gemfiles/Sinatra_1.gemfile b/gemfiles/Sinatra_1.gemfile
@@ -0,0 +1,6 @@
+source 'http://rubygems.org'
+
+gemspec path: '..'
+
+gem 'ruby_http_client'
+gem 'sinatra', '~> 1.4'
diff --git a/gemfiles/Sinatra_2.gemfile b/gemfiles/Sinatra_2.gemfile
@@ -0,0 +1,6 @@
+source 'http://rubygems.org'
+
+gemspec path: '..'
+
+gem 'ruby_http_client'
+gem 'sinatra', '>= 2.0.0.rc2'
diff --git a/sendgrid-ruby.gemspec b/sendgrid-ruby.gemspec
@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(/^(test|spec|features)/)
   spec.require_paths = ['lib']
   spec.add_dependency 'ruby_http_client', '~> 3.0'
-  spec.add_dependency 'sinatra', '2.0.0.rc2'
+  spec.add_dependency 'sinatra', '>= 1.4.7', '< 3'
   spec.add_development_dependency 'rake', '~> 0'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'pry'