Merge pull request #691 from getsentry/ravenexe

Fix raven test executable not being included in gemspec

Author: nateberkopec

.travis.yml

@@ -8,15 +8,14 @@ branches:
   only: [master]
 
 rvm:
-  - 1.9
   - 2.2.7
   - 2.3.4
-  - ruby-head
   - 2.4.1
 
-gemfile:
-  - gemfiles/rails42.gemfile
-  - gemfiles/rails5.gemfile
+env:
+  - RAILS_VERSION=4
+  - RAILS_VERSION=5
+  - RAILS_VERSION=0
 
 addons:
   apt:
@@ -28,23 +27,15 @@ before_install:
 
 matrix:
   include:
+    - rvm: 1.9
+      env: RAILS_VERSION=4
     - rvm: jruby-1.7.27
-      env: JRUBY_OPTS="--dev"
-      gemfile: gemfiles/rails42.gemfile
+      env: JRUBY_OPTS="--dev" RAILS_VERSION=4
     - rvm: jruby-9.1.10.0
-      env: JRUBY_OPTS="--dev -J-Djruby.launch.inproc=true -J-Xmx1024M"
-      gemfile: gemfiles/rails42.gemfile
+      env: JRUBY_OPTS="--dev -J-Djruby.launch.inproc=true -J-Xmx1024M" RAILS_VERSION=4
     - rvm: jruby-9.1.10.0
-      env: JRUBY_OPTS="--dev -J-Djruby.launch.inproc=true -J-Xmx1024M"
-      gemfile: gemfiles/rails5.gemfile
-  allow_failures:
+      env: JRUBY_OPTS="--dev -J-Djruby.launch.inproc=true -J-Xmx1024M" RAILS_VERSION=5
     - rvm: ruby-head
-  exclude:
-    - rvm: 2.2.7
-      gemfile: gemfiles/rails32.gemfile
+      env: RAILS_VERSION=0
+  allow_failures:
     - rvm: ruby-head
-      gemfile: gemfiles/rails32.gemfile
-    - rvm: 2.4.1
-      gemfile: gemfiles/rails32.gemfile
-    - rvm: 1.9
-      gemfile: gemfiles/rails5.gemfile

Gemfile

@@ -2,15 +2,29 @@ source "https://rubygems.org/"
 
 gemspec
 
-group :test do
-  gem "rack"
-  gem "sidekiq"
+if ENV["RAILS_VERSION"] && (ENV["RAILS_VERSION"].to_i == 4)
+  gem "rails", "< 5"
+elsif ENV["RAILS_VERSION"] && (ENV["RAILS_VERSION"].to_i == 5)
+  gem "rails", "< 6"
 end
 
-group :development do
-  gem "pry"
-  gem "pry-coolline"
-  gem "benchmark-ips"
-  gem "benchmark-ipsa"
-  gem "ruby-prof"
+if RUBY_VERSION < '2.0'
+  gem "mime-types", "< 3.0.0"
+  gem "nokogiri", "~> 1.6.8"
+  gem "rack", "~> 1.6.8"
+  gem "sidekiq", "< 3.2"
+else
+  gem "rack"
+  gem "sidekiq"
 end
+gem "pry"
+gem "pry-coolline"
+gem "benchmark-ips"
+gem "benchmark-ipsa" if RUBY_VERSION > '2.0'
+gem "ruby-prof", platform: :mri
+gem "rake"
+gem "rubocop", "~> 0.41.1"
+gem "rspec"
+gem "rspec-rails"
+gem "timecop"
+gem "test-unit", platform: :mri if RUBY_VERSION > '2.2'

gemfiles/rails42.gemfile

@@ -3,25 +3,20 @@ require 'raven/version'
 
 Gem::Specification.new do |gem|
   gem.name = "sentry-raven"
-  gem.version = Raven::VERSION
-  gem.platform = Gem::Platform::RUBY
+  gem.authors = ["Sentry Team"]
   gem.description = gem.summary = "A gem that provides a client interface for the Sentry error logger"
   gem.email = "[email protected]"
+  gem.license = 'Apache-2.0'
   gem.homepage = "https://github.com/getsentry/raven-ruby"
-  gem.authors = ["Sentry Team"]
+
+  gem.version = Raven::VERSION
+  gem.platform = Gem::Platform::RUBY
+  gem.required_ruby_version = '>= 1.9.0'
   gem.has_rdoc = true
   gem.extra_rdoc_files = ["README.md", "LICENSE"]
-  gem.files = Dir['lib/**/*']
-  gem.executables = gem.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  gem.license = 'Apache-2.0'
-  gem.required_ruby_version = '>= 1.9.0'
+  gem.files = `git ls-files | grep -Ev '^(spec|benchmarks|examples)'`.split("\n")
+  gem.bindir = "exe"
+  gem.executables = "raven"
 
   gem.add_dependency "faraday", ">= 0.7.6", "< 1.0"
-
-  gem.add_development_dependency "rake"
-  gem.add_development_dependency "rubocop", "~> 0.41.1"
-  gem.add_development_dependency "rspec"
-  gem.add_development_dependency "rspec-rails"
-  gem.add_development_dependency "timecop"
-  gem.add_development_dependency "test-unit" if RUBY_VERSION > '2.2'
 end