Merge pull request #376 from guard/fix_rubocop_gemfiles

misc build fixes

Author: e2

Gemfile

@@ -1,4 +1,13 @@
-source "https://rubygems.org"
+# Note: on Travis, this Gemfile is only for installing
+# dependencies. The actual builds use the Gemfiles in
+# the gemspecs/* directory.
+
+filename = "gemfiles/common"
+instance_eval(IO.read(filename), filename, 1)
+
+group :test do
+  gem "rspec", "~> 3.4"
+end
 
 if ENV["USE_INSTALLED_GUARD_RSPEC"] == "1"
   gem "guard-rspec"
@@ -12,12 +21,6 @@ group :gem_build_tools do
   gem "rake", "~> 11.1"
 end
 
-group :test do
-  gem "coveralls", require: false
-  gem "rspec", "~> 3.4"
-  gem "launchy", "~> 2.4"
-end
-
 group :development do
   gem "rubocop", require: false
   gem "guard-rubocop", require: false

Rakefile

@@ -21,7 +21,7 @@ namespace :test do
   task :all_versions do
     system(*%w(bundle install --quiet)) || abort
     system(*%w(bundle update --quiet)) || abort
-    system(*%w(bundle exec rubocop -c .hound.yml)) || abort
+    system(*%w(bundle exec rubocop -c .rubocop.yml)) || abort
 
     travis = YAML.load(IO.read(".travis.yml"))
     travis["gemfile"].each do |gemfile|

gemfiles/Gemfile.rspec-2.99

@@ -1,3 +1,5 @@
+gemspec path: '../'
+
 filename = "gemfiles/common"
 instance_eval(IO.read(filename), filename, 1)
 

gemfiles/Gemfile.rspec-3.4

@@ -1,3 +1,5 @@
+gemspec path: '../'
+
 filename = "gemfiles/common"
 instance_eval(IO.read(filename), filename, 1)
 

gemfiles/common

@@ -1,7 +1,9 @@
 source "https://rubygems.org"
-gemspec path: '../'
 
-gem "bundler", "~> 1.12", "< 2.0"
-gem "rake", "~> 11.1"
-gem 'coveralls', require: false
-gem "launchy", "~> 2.4"
+group :test do
+  gem "bundler", "~> 1.12", "< 2.0"
+  gem "rake", "~> 11.1"
+  gem 'coveralls', require: false
+  gem "launchy", "~> 2.4"
+  gem "gem_isolator", '~> 0.2', '>= 0.2.1'
+end