Merge pull request #264 from olleolleolle/fix/bundle-with-ruby-versio…

…n-marker Gemfile with ruby version marker, instead of specific gemfiles/ files
ruby-amqp · Nov 19, 2016 · 5e92111 · 5e92111
2 parents 694f104 + 71d61ce
commit 5e92111
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 13 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,17 +3,12 @@ cache: bundler
 before_install: gem i bundler
 matrix:
   include:
-    - rvm: 2.3.0
-      gemfile: gemfiles/Gemfile.activesupport5
+    - rvm: 2.3.2
     - rvm: 2.2
-      gemfile: gemfiles/Gemfile.activesupport4
     - rvm: 2.1
-      gemfile: gemfiles/Gemfile.activesupport4
     - rvm: 2.0
-      gemfile: gemfiles/Gemfile.activesupport4
-    - rvm: jruby-9.1.5.0
+    - rvm: jruby-9.1.6.0
       jdk: oraclejdk8
-      gemfile: gemfiles/Gemfile.activesupport5
       env:
         - JRUBY_OPTS='--debug'
 

diff --git a/Gemfile b/Gemfile
@@ -1,5 +1,7 @@
 source 'https://rubygems.org'
 
+ruby RUBY_VERSION
+
 gemspec
 
 group :development do

diff --git a/gemfiles/Gemfile.activesupport4 b/gemfiles/Gemfile.activesupport4
diff --git a/gemfiles/Gemfile.activesupport5 b/gemfiles/Gemfile.activesupport5
diff --git a/hutch.gemspec b/hutch.gemspec
@@ -10,11 +10,11 @@ Gem::Specification.new do |gem|
   end
   gem.add_runtime_dependency 'carrot-top', '~> 0.0.7'
   gem.add_runtime_dependency 'multi_json', '~> 1.12'
-  gem.add_runtime_dependency 'activesupport'
+  gem.add_runtime_dependency 'activesupport', '>= 4.2', '< 6'
 
   gem.name = 'hutch'
   gem.summary = 'Easy inter-service communication using RabbitMQ.'
-  gem.description = 'Hutch is a Ruby library for enabling asynchronous ' +
+  gem.description = 'Hutch is a Ruby library for enabling asynchronous ' \
                     'inter-service communication using RabbitMQ.'
   gem.version = Hutch::VERSION.dup
   gem.required_ruby_version = '>= 2.0'