Skip to content

Rubocop #596

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

Merged
merged 14 commits into from
Sep 9, 2015
Merged

Rubocop #596

merged 14 commits into from
Sep 9, 2015

Conversation

tamird
Copy link
Contributor

@tamird tamird commented Mar 13, 2015

builds further on #595

@sodabrew apologies for the chain of PRs ❤️

@brianmario
Copy link
Owner

Holy hell this is amazing haha. I love this but would it be a huge pain to split it up into smaller pull requests that are easier to grok? Maybe one to convert the rspec syntax, one fixing up the shell script syntax, one fixing all the warnings in ruby code from Rubocop, one fixing the C code, etc... ?

@tamird
Copy link
Contributor Author

tamird commented Mar 13, 2015

@brianmario totally, let's land #592 and #595 first, and then I'll break this one up some more

@sodabrew sodabrew added this to the 0.4.0 milestone Apr 3, 2015
@sodabrew
Copy link
Collaborator

sodabrew commented Jun 7, 2015

Ok, ready to rebase here.

@tamird
Copy link
Contributor Author

tamird commented Jun 8, 2015

Rebased (and green). I found a bug in extconf.rb that uncovered a bunch more C warnings, which I've fixed in #628 and then rebased this on top.

@sodabrew
Copy link
Collaborator

Ready for another rebase.

@tamird
Copy link
Contributor Author

tamird commented Jun 12, 2015

Rebased but Travis is refusing to build.

@sodabrew
Copy link
Collaborator

Looks like Travis backed up this afternoon. I'll check back tomorrow.

sodabrew added a commit to sodabrew/mysql2 that referenced this pull request Jun 12, 2015
@tamird
Copy link
Contributor Author

tamird commented Jun 15, 2015

green except for a spurious failure

@tamird
Copy link
Contributor Author

tamird commented Jul 14, 2015

Looks like rbx is still grumpy about the 10000 statements tests

@sodabrew
Copy link
Collaborator

I think there's a more general Rubinius GC problem with calls to rb_gc_mark, I have a ticket open there.

This crash is a new one, it's in rb_to_encoding, Huh. I may need to file a new ticket too.

Thanks for updating the PR!

@sodabrew sodabrew modified the milestones: 0.4.1, 0.4.0 Jul 31, 2015
@tamird
Copy link
Contributor Author

tamird commented Aug 7, 2015

Rebased but rbx is still grumpy and now mysql 5.7 is throwing a fit?

@tamird
Copy link
Contributor Author

tamird commented Aug 7, 2015

Oh RBX is actually leaking a connection now. MySQL 5.7 says Table 'performance_schema.session_variables' doesn't exist

@sodabrew
Copy link
Collaborator

sodabrew commented Aug 7, 2015

I did some reading about the MySQL 5.7.8 changes to performance-schema, but I didn't get it. https://dev.mysql.com/doc/refman/5.7/en/performance-schema-variable-table-migration.html

Thanks for the rebase! I marked this as a 0.4.1 item because I want to get 0.4.0 out the door this month, so just FYI it'll be at least a little longer before I get to merging it.

@tamird
Copy link
Contributor Author

tamird commented Aug 7, 2015

@sodabrew ok, seems like the mysql issue isn't caused by this PR, and I'm not able to reproduce the RBX issue locally. Let me know if there's anything I can help with.

@sodabrew
Copy link
Collaborator

sodabrew commented Sep 9, 2015

Has merge conflicts - Presumably the be_an_instance_of change touches the same diff context.

@tamird
Copy link
Contributor Author

tamird commented Sep 9, 2015

Yep, rebased now!

header = [prefix, h].compact.join '/'
asplode h unless have_header h
asplode h unless have_header header
Copy link
Collaborator

Choose a reason for hiding this comment

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

Was this a bug?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yes i believe it was

).select do |flag|
try_link('int main() {return 0;}', flag)
end.each do |flag|
).select { |flag| try_link('int main() {return 0;}', flag) }.each do |flag|
Copy link
Collaborator

Choose a reason for hiding this comment

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

I prefer the extra lines

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done


if !encoding.nil? && encoding[1] != "NULL"
name = "\"#{encoding[1]}\""
name = if encoding.nil? || encoding[1] == 'NULL'
Copy link
Collaborator

Choose a reason for hiding this comment

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

nice improvement to readability here.

@sodabrew
Copy link
Collaborator

sodabrew commented Sep 9, 2015

And we're off to the races!

sodabrew added a commit that referenced this pull request Sep 9, 2015
@sodabrew sodabrew merged commit 6d231ce into brianmario:master Sep 9, 2015
@tamird
Copy link
Contributor Author

tamird commented Sep 9, 2015

🎊

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.

3 participants