misc fixes #414

Merged
merged 8 commits into from Apr 4, 2013

Projects

None yet

5 participants

@aspiers
aspiers commented Apr 4, 2013

This should get Travis builds working again, and fixes a few other things.
Please don't merge until the Travis build for the pull request is green.

Adam Spiers added some commits Apr 4, 2013
Adam Spiers .gitignore: add coverage/ subdirectory ecbaf45
Adam Spiers tag Guard.setup_signal_traps spec as slow
This allows these examples to be excluded via

  rspec -t ~speed:slow
fa74999
Adam Spiers include guard-rspec in test group environment since it's required by …
…guard_spec.rb

This fixes the breakage introduced by 613b11d into Travis builds.
4a33eda
@coveralls

Coverage increased (+0.1%) when pulling c90f42b on aspiers:master into 8f8f01e on guard:master.

View Details

@thibaudgg
Member

Thanks @aspiers , tmux specs failed on 2.0.0 & jruby-18mode can you have a look please? Thanks!

@aspiers
aspiers commented Apr 4, 2013

Yeah I'm already looking - I half-expected those failures ... I have seen them on 1.9.3 too.

@aspiers
aspiers commented Apr 4, 2013

@thibaudgg I'm struggling to understand why @rudicode added tmux set quiet on/off in d045182 - do you know?

@thibaudgg
Member

No idea, I don't use tmux myself.

Adam Spiers added some commits Apr 4, 2013
Adam Spiers Revert silent discard of NoMethodError from plugins introduced by 95d…
…9cd1 (fixes #413)

Rather than silently discarding all NoMethodErrors, we just check
whether the plugin implements the task and only execute it if it does.
b5a2f01
Adam Spiers fix indentation 2a32757
Adam Spiers refactor invocation of tmux client d6d369c
Adam Spiers fix typo 9044a0e
Adam Spiers prevent tmux output from messing up spec output ed1bb0f
@aspiers
aspiers commented Apr 4, 2013

Don't worry, I've worked around it ...

@coveralls

Coverage increased (+0.11%) when pulling ed1bb0f on aspiers:master into 8f8f01e on guard:master.

View Details

@aspiers
aspiers commented Apr 4, 2013

Alright! I think this is good to merge now. Please sanity check b5a2f01 first though - that is the only risky commit. All the others are very low risk.

@thibaudgg
Member

Great thanks!

@thibaudgg thibaudgg merged commit 0248bbc into guard:master Apr 4, 2013

1 check passed

default The Travis build passed
Details
@amiel
Contributor
amiel commented on b5a2f01 Apr 4, 2013

👍

@rymai
Member
rymai commented Apr 4, 2013

You forgot to update the changelog! :)

@thibaudgg
Member

I'll tomorrow!

@rymai
Member
rymai commented Apr 4, 2013

I was actually saying this to @aspiers (you can now directly update and push it without a pull-request)! ^^

@thibaudgg
Member

Really good point! :)

@aspiers
aspiers commented Apr 4, 2013

I know I have push access (thanks for that ;-) but I think it's a bad idea to push directly because it makes the changes less visible and also circumvents Travis - it was a direct push which broke Travis last time...

@rymai
Member
rymai commented Apr 4, 2013

You're right, I shouldn't have "direct pushed" (aka [ci skip]), my bad!

That said, I think the actual issue was that the test needed the guard-rspec gem to be loaded! Fortunately, I've fixed that with 762524c. :)

That said, for the Changelog I really encourage you to direct push with [ci skip] (or without if you're really afraid to break the build). ;-)

@aspiers
aspiers commented Apr 5, 2013

I didn't know about [ci skip] before - that explains the previous breakage. However, it is orthogonal to direct pushes. Even if you issue a pull request containing [ci skip], it still gives other people a chance to peer review your changes. This is good even when altering READMEs etc. because documentation can have bugs too :) So I would suggest that it is a good idea to never direct push except for real emergencies.

I would have updated the CHANGELOG.md but there are no instructions on how to add new sections after a release. Currently VERSION is still 1.7.0 but new changes cannot go in the 1.7.0 section of CHANGELOG.md. I've just looked at the history and it seems that creating a new ## Master section is the way to go.

@aspiers
aspiers commented Apr 5, 2013

Done: #417

@rymai
Member
rymai commented Apr 5, 2013

Sorry, I thought you were speaking about [ci skip], I understand what you meant now!

You're right there's no guidelines for updating the Changelog, I'll try to write them down soon! :)

And yes, we use ## Master when changes are not included in a gem release yet.

In the end, it's really up to you to choose to submit pull-requests for readme/changelog/docs changes, but don't worry we'll never complain about new pull-requests! ^^

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment