Skip to content

Commit

Permalink
Merge pull request chocolatey-archive#72 from ThoughtCrhyme/master
Browse files Browse the repository at this point in the history
(MODULES-4601) Fail rototiller task correctly.
  • Loading branch information
glennsarti authored Mar 28, 2017
2 parents 2be3e28 + 52a68be commit b0e7ec3
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
3 changes: 3 additions & 0 deletions .sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ Gemfile:
':system_tests':
- gem: beaker-windows
version: '~> 0.6'
':development':
- gem: rototiller
version: '~> 1.0'
Rakefile:
unmanaged: true
spec/spec_helper.rb:
Expand Down
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ group :development do
gem 'fast_gettext', '1.1.0', :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0')
gem 'fast_gettext', :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0')
gem 'rainbow', '< 2.2.0', :require => false
gem 'rototiller', '~> 1.0', :require => false
end

group :system_tests do
Expand Down
6 changes: 4 additions & 2 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,8 @@ begin
end
end
end
rescue LoadError
#Do nothing, rototiller only installed with system_tests group
rescue LoadError => e
STDERR.puts "Unable to load rototiller:"
raise e
end

0 comments on commit b0e7ec3

Please sign in to comment.