Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make it compatible with ruby 2.2 #91

Merged
merged 1 commit into from
Mar 14, 2015
Merged

Make it compatible with ruby 2.2 #91

merged 1 commit into from
Mar 14, 2015

Conversation

deees
Copy link
Contributor

@deees deees commented Mar 13, 2015

Fixes:

daemon-kit/lib/daemon_kit/initializer.rb:337: warning: circular argument reference - instance

@kennethkalmer @marcbowes

@coveralls
Copy link

Coverage Status

Coverage remained the same at 78.14% when pulling 4e1eaef on deees:fix/ruby_2_2 into 0c87223 on kennethkalmer:master.

@@ -334,7 +334,7 @@ def at_shutdown( proc = nil, &block )
@shutdown_hooks << ( proc || block )
end

def pid_file( instance = instance )
def pid_file( instance = instance() )
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd appreciate it if you completely removed the ambiguity.

For example:

def pid_file an_instance = instance()
  "... #{an_instance}.pid"

The nuclear option is to copy #pid_file to a class method with an arity of 1 and then have the instance version have an arity of 0. This is a breaking change though.

@marcbowes
Copy link
Collaborator

Thanks! I have a small line comment, if you don't mind addressing :-).

@deees
Copy link
Contributor Author

deees commented Mar 14, 2015

@marcbowes: fixed 😄

@coveralls
Copy link

Coverage Status

Coverage remained the same at 78.14% when pulling 0909286 on deees:fix/ruby_2_2 into 0c87223 on kennethkalmer:master.

marcbowes added a commit that referenced this pull request Mar 14, 2015
Make it compatible with ruby 2.2
@marcbowes marcbowes merged commit f1461fb into kennethkalmer:master Mar 14, 2015
@marcbowes
Copy link
Collaborator

Thanks. Do you need this released (to Rubygems) or are you happy to pull from GitHub?

@deees
Copy link
Contributor Author

deees commented Mar 14, 2015

Rubygems release would be great! Thanks!

@deees deees deleted the fix/ruby_2_2 branch March 14, 2015 10:39
@kennethkalmer
Copy link
Owner

Such speed, thanks @marcbowes for getting this through and @deees for the fix!

@marcbowes
Copy link
Collaborator

@deees
Copy link
Contributor Author

deees commented Mar 16, 2015

Thanks! 👍

@kennethkalmer
Copy link
Owner

👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants