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

rubocop: lib/jekyll/document.rb style fixes #5030

Merged
merged 2 commits into from Jun 27, 2016

Conversation

Projects
None yet
3 participants
@ayastreb
Contributor

ayastreb commented Jun 25, 2016

#4885

As discussed with @parkr I moved out code style fixes from bigger PR (#4961).

In this PR I fixed all the style issues in document.rb
I did not remove document.rb from .rubocop.yml because there are still a couple of "ABC too high"/"method too long" errors.
I will fix those in a separate PR by refactoring complex methods into smaller methods when this PR is merged.

Show outdated Hide outdated lib/jekyll/document.rb
Jekyll.logger.warn "Deprecation:", "Document##{method} is now a key in the #data hash."
Jekyll.logger.warn "", "Called by #{caller.first}."
Jekyll::Deprecator.deprecation_message "Document##{method} is now a key "\
"in the #data hash. Called by #{caller.first}."

This comment has been minimized.

@parkr

parkr Jun 25, 2016

Member

These should be printed on separate lines. Could you please put "Called by" with its own call to deprecation_message?

@parkr

parkr Jun 25, 2016

Member

These should be printed on separate lines. Could you please put "Called by" with its own call to deprecation_message?

@parkr parkr added the refactor label Jun 27, 2016

@parkr

This comment has been minimized.

Show comment
Hide comment
@parkr

parkr Jun 27, 2016

Member

👍 thanks! Failing fmt tests are unrelated.

@jekyllbot: merge +dev

Member

parkr commented Jun 27, 2016

👍 thanks! Failing fmt tests are unrelated.

@jekyllbot: merge +dev

@jekyllbot jekyllbot merged commit 549371f into jekyll:master Jun 27, 2016

1 check failed

continuous-integration/travis-ci/pr The Travis CI build failed
Details

jekyllbot added a commit that referenced this pull request Jun 27, 2016

parkr added a commit that referenced this pull request Jun 29, 2016

Merge branch 'master' into remove-jruby-and-ruby-head
* master: (41 commits)
  Fix rubocop offenses on master.
  script/fmt: print Rubocop version
  Update history to reflect merge of #5030 [ci skip]
  rubocop: separate deprecator error messages
  Update history to reflect merge of #5031 [ci skip]
  Update history to reflect merge of #5032 [ci skip]
  rubocop: fix code style
  rubocop: fix code style
  rubocop: fix code style
  Update history to reflect merge of #5024 [ci skip]
  Update history to reflect merge of #5025 [ci skip]
  utils: check that the object is a hash when merging default_proc
  Update history to reflect merge of #5026 [ci skip]
  rubocop: refactor modified? method
  Add a benchmark for capture vs. assign in Liquid. [ci skip]
  Update history to reflect merge of #5027 [ci skip]
  Add generator-jekyllized to third party plugins
  rubocop: fix code style
  rubocop: fix code style
  rubocop: fix code style
  ...

@parkr parkr referenced this pull request Aug 30, 2016

Closed

Make jekyll/jekyll code compliant with rubocop rules #4885

114 of 115 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment