Skip to content

Commit b6ea2a4

Browse files
committed
Merge pull request #375 from guard/misc_build_fixes
Misc fixes related to HoundCi/RubCop/Travis
2 parents c4226b6 + 2b8f16e commit b6ea2a4

10 files changed

+30
-41
lines changed

Diff for: .hound.yml

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
ruby:
2+
enabled: true
3+
config_file: .rubocop.yml

Diff for: .rubocop.yml

+3
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
inherit_from:
22
.rubocop_todo.yml
3+
4+
Style/StringLiterals:
5+
Enabled: false

Diff for: .travis.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
language: ruby
2-
bundler_args: --without tool
2+
bundler_args: --without=tool development
33
rvm:
44
- 2.2.5
55
- 2.3.1
6-
- jruby-9.0.5.0
6+
- jruby-9.1.1.0
77
gemfile:
88
- gemfiles/Gemfile.rspec-2.99
99
- gemfiles/Gemfile.rspec-3.4
1010
matrix:
1111
allow_failures:
12-
- rvm: jruby-9.0.50
12+
- rvm: jruby-9.1.1.0
1313
sudo: false
1414
cache: bundler

Diff for: Gemfile

+9-3
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,23 @@ source "https://rubygems.org"
22

33
if ENV["USE_INSTALLED_GUARD_RSPEC"] == "1"
44
gem "guard-rspec"
5-
gem "launchy"
65
else
7-
gemspec
6+
gemspec development_group: :gem_build_tools
7+
end
8+
9+
# bundler + rake - always included
10+
group :gem_build_tools do
11+
gem "bundler", "~> 1.12", "< 2.0"
12+
gem "rake", "~> 11.1"
813
end
914

1015
group :test do
1116
gem "coveralls", require: false
17+
gem "rspec", "~> 3.4"
18+
gem "launchy", "~> 2.4"
1219
end
1320

1421
group :development do
15-
gem "rspec", "~> 3.4"
1622
gem "rubocop", require: false
1723
gem "guard-rubocop", require: false
1824
gem "guard-compat", ">= 0.0.2", require: false

Diff for: gemfiles/Gemfile.rspec-2.99

+2-12
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,4 @@
1-
source "https://rubygems.org"
2-
3-
gemspec path: '../'
1+
filename = "gemfiles/common"
2+
instance_eval(IO.read(filename), filename, 1)
43

54
gem 'rspec', '~> 2.99'
6-
7-
group :test do
8-
gem 'coveralls', require: false
9-
gem "guard-compat", ">= 0.0.2", require: false
10-
end
11-
12-
group :tool do
13-
gem 'ruby_gntp', require: false
14-
end

Diff for: gemfiles/Gemfile.rspec-3.4

+2-12
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,4 @@
1-
source "https://rubygems.org"
2-
3-
gemspec path: '../'
1+
filename = "gemfiles/common"
2+
instance_eval(IO.read(filename), filename, 1)
43

54
gem 'rspec', '~> 3.4.0'
6-
7-
group :test do
8-
gem 'coveralls', require: false
9-
gem "guard-compat", ">= 0.0.2", require: false
10-
end
11-
12-
group :tool do
13-
gem 'ruby_gntp', require: false
14-
end

Diff for: gemfiles/common

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
source "https://rubygems.org"
2+
gemspec path: '../'
3+
4+
gem "bundler", "~> 1.12", "< 2.0"
5+
gem "rake", "~> 11.1"
6+
gem 'coveralls', require: false
7+
gem "launchy", "~> 2.4"

Diff for: guard-rspec.gemspec

-4
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,4 @@ Gem::Specification.new do |s|
2222
s.add_dependency "guard", "~> 2.1"
2323
s.add_dependency "guard-compat", "~> 1.1"
2424
s.add_dependency "rspec", ">= 2.99.0", "< 4.0"
25-
26-
s.add_development_dependency "bundler", ">= 1.3.5", "< 2.0"
27-
s.add_development_dependency "rake", "~> 10.1"
28-
s.add_development_dependency "launchy", "~> 2.4"
2925
end

Diff for: spec/lib/guard/rspec/rspec_process_spec.rb

-6
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,6 @@
33
require "guard/rspec/rspec_process"
44

55
RSpec.describe Guard::RSpec::RSpecProcess do
6-
before do
7-
allow(Kernel).to receive(:spawn) do |*args|
8-
raise "Not stubbed: Kernel.spawn(#{args.map(&:inspect) * ','})"
9-
end
10-
end
11-
126
let(:results) { instance_double(Guard::RSpec::Results) }
137

148
let(:cmd) { "foo" }

Diff for: spec/spec_helper.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ def instance_double(*args)
136136
end
137137

138138
%w(spawn system).each do |meth|
139-
allow(File).to receive(meth.to_sym) do |*args|
139+
allow(Kernel).to receive(meth.to_sym) do |*args|
140140
abort "stub me: Kernel.#{meth}(#{args.map(&:inspect) * ','})!"
141141
end
142142
end

0 commit comments

Comments
 (0)