Skip to content

Commit

Permalink
Chore: Update to the most recent config files
Browse files Browse the repository at this point in the history
  • Loading branch information
jfelchner committed Aug 15, 2016
1 parent 7d1480c commit dc75f6d
Show file tree
Hide file tree
Showing 5 changed files with 170 additions and 11 deletions.
28 changes: 26 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# Vendored Dependencies
access
bower_components
disk_images
node_modules
site/web/app/mu-plugins
site/web/app/plugins
Expand Down Expand Up @@ -51,6 +49,26 @@ variables.sls
*.o
*.rbc
*.so
*.xcuserdatad
**/cordova/platforms/android/CordovaLib/ant-build
**/cordova/platforms/android/CordovaLib/ant-gen
**/cordova/platforms/android/CordovaLib/bin
**/cordova/platforms/android/CordovaLib/gen
**/cordova/platforms/android/ant-build
**/cordova/platforms/android/ant-gen
**/cordova/platforms/android/assets/www
**/cordova/platforms/android/bin
**/cordova/platforms/android/gen
**/cordova/platforms/browser/build
**/cordova/platforms/browser/www
**/cordova/platforms/ios/build/
**/cordova/platforms/ios/www/
**/cordova/platforms/wp8/*.csproj.user
**/cordova/platforms/wp8/*.suo
**/cordova/platforms/wp8/.staging
**/cordova/platforms/wp8/bin
**/cordova/platforms/wp8/obj
**/cordova/platforms/wp8/www
coverage
coverage.data
dist
Expand All @@ -74,6 +92,8 @@ rdoc
.foreman
.htaccess
.idea
.powenv
.powrc
.railsrc
.rspec
.rvmrc
Expand All @@ -84,11 +104,14 @@ Gemfile.local
config.yml
config/database.yml
config/secrets.yml
**/cordova/platforms/android/CordovaLib/local.properties
**/cordova/platforms/android/local.properties
nbproject

# Temporary files
*.backup
*.bak
*.lck
*.lock
*.log*
*.old
Expand All @@ -103,6 +126,7 @@ nbproject
db-sync
dump.rdb
log
solr/*
sql-dump-*.sql
tmp

Expand Down
5 changes: 2 additions & 3 deletions .overcommit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ PreCommit:
enabled: true

Brakeman:
enabled: true
enabled: false

BrokenSymlinks:
enabled: true
Expand Down Expand Up @@ -61,7 +61,6 @@ PreCommit:
exclude:
- 'bin/**/*'
- 'script/**/*'
- 'scripts/**/*'

GoLint:
enabled: true
Expand Down Expand Up @@ -149,7 +148,7 @@ PreCommit:
- '**/db/structure.sql'

Reek:
enabled: true
enabled: false

RuboCop:
enabled: true
Expand Down
63 changes: 57 additions & 6 deletions .rubocop_core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,12 @@ AllCops:
- '**/spec/dummy/**/*'
- '**/vendor/**/*'
- 'bin/rails'
- 'bin/rails'
- 'bin/rake'
- 'bin/spring'
- 'dist/**/*'

DefaultFormatter: 'fuubar'
TargetRubyVersion: 2.3
DisplayCopNames: true

################################################################################
Expand Down Expand Up @@ -52,6 +55,7 @@ Style/AlignHash:
Style/AlignParameters:
Enabled: true
EnforcedStyle: 'with_first_parameter'
IndentationWidth: ~

Style/AndOr:
Enabled: true
Expand Down Expand Up @@ -170,7 +174,7 @@ Style/Copyright:
Style/DefWithParentheses:
Enabled: true

Style/DeprecatedHashMethods:
Style/PreferredHashMethods:
Enabled: true

Style/Documentation:
Expand All @@ -183,12 +187,18 @@ Style/DotPosition:
Style/DoubleNegation:
Enabled: true

Style/EachForSimpleLoop:
Enabled: true

Style/EachWithObject:
Enabled: true

Style/ElseAlignment:
Enabled: true

Style/EmptyCaseCondition:
Enabled: true

Style/EmptyElse:
Enabled: true
EnforcedStyle: 'both'
Expand Down Expand Up @@ -225,7 +235,8 @@ Style/EmptyLiteral:
Enabled: true

Style/Encoding:
Enabled: false
Enabled: true
EnforcedStyle: 'never'

Style/EndBlock:
Enabled: true
Expand Down Expand Up @@ -297,6 +308,7 @@ Style/GuardClause:
Style/HashSyntax:
Enabled: true
EnforcedStyle: 'ruby19'
PreferHashRocketsForNonAlnumEndingSymbols: true

Style/IdenticalConditionalBranches:
Enabled: true
Expand All @@ -314,6 +326,9 @@ Style/IfUnlessModifierOfIfUnless:
Style/IfWithSemicolon:
Enabled: true

Style/ImplicitRuntimeError:
Enabled: true

Style/IndentationConsistency:
Enabled: true

Expand Down Expand Up @@ -358,7 +373,7 @@ Style/LineEndConcatenation:
Enabled: true

Style/MethodCalledOnDoEndBlock:
Enabled: false
Enabled: true

Style/MethodCallParentheses:
Enabled: true
Expand All @@ -381,9 +396,11 @@ Style/MissingElse:

Style/ModuleFunction:
Enabled: true
EnforcedStyle: 'module_function'

Style/MultilineArrayBraceLayout:
Enabled: true
EnforcedStyle: 'symmetrical'

Style/MultilineAssignmentLayout:
Enabled: true
Expand All @@ -399,20 +416,23 @@ Style/MultilineBlockLayout:

Style/MultilineHashBraceLayout:
Enabled: true
EnforcedStyle: 'symmetrical'

Style/MultilineIfThen:
Enabled: true

Style/MultilineMethodCallBraceLayout:
Enabled: true
EnforcedStyle: 'symmetrical'

Style/MultilineMethodCallIndentation:
Enabled: false
EnforcedStyle: 'aligned'
Enabled: true
EnforcedStyle: 'indented_relative_to_receiver'
IndentationWidth: 0

Style/MultilineMethodDefinitionBraceLayout:
Enabled: true
EnforcedStyle: 'symmetrical'

Style/MultilineOperationIndentation:
Enabled: false
Expand Down Expand Up @@ -455,6 +475,10 @@ Style/NonNilCheck:
Style/Not:
Enabled: true

Style/NumericLiteralPrefix:
Enabled: true
EnforcedOctalStyle: 'zero_with_o'

Style/NumericLiterals:
Enabled: true
MinDigits: 5
Expand Down Expand Up @@ -651,9 +675,15 @@ Style/SpaceInsideHashLiteralBraces:
EnforcedStyle: 'space'
EnforcedStyleForEmptyBraces: 'no_space'

Style/SpaceInsideArrayPercentLiteral:
Enabled: true

Style/SpaceInsideParens:
Enabled: true

Style/SpaceInsidePercentLiteralDelimiters:
Enabled: true

Style/SpaceInsideRangeLiteral:
Enabled: true

Expand Down Expand Up @@ -699,6 +729,7 @@ Style/SymbolProc:
Enabled: true
IgnoredMethods:
- 'respond_to'
- 'define_method'

Style/Tab:
Enabled: true
Expand Down Expand Up @@ -902,6 +933,10 @@ Lint/ImplicitStringConcatenation:
Lint/IneffectiveAccessModifier:
Enabled: true

Lint/InheritException:
Enabled: true
EnforcedStyle: 'standard_error'

Lint/InvalidCharacterLiteral:
Enabled: true

Expand All @@ -923,6 +958,12 @@ Lint/NonLocalExitFromIterator:
Lint/ParenthesesAsGroupedExpression:
Enabled: true

Lint/PercentStringArray:
Enabled: true

Lint/PercentSymbolArray:
Enabled: true

Lint/RandOne:
Enabled: true

Expand All @@ -932,6 +973,9 @@ Lint/RequireParentheses:
Lint/RescueException:
Enabled: true

Lint/ShadowedException:
Enabled: true

Lint/ShadowingOuterLocalVariable:
Enabled: true

Expand All @@ -946,6 +990,7 @@ Lint/UnneededDisable:

Lint/UnusedBlockArgument:
Enabled: true
AllowUnusedKeywordArguments: true
IgnoreEmptyBlocks: true

Lint/UnusedMethodArgument:
Expand All @@ -959,6 +1004,9 @@ Lint/UnreachableCode:
Lint/UselessAccessModifier:
Enabled: true

Lint/UselessArraySplat:
Enabled: true

Lint/UselessAssignment:
Enabled: true

Expand Down Expand Up @@ -1008,6 +1056,9 @@ Performance/HashEachMethods:
Performance/LstripRstrip:
Enabled: true

Performance/PushSplat:
Enabled: true

Performance/RangeInclude:
Enabled: true

Expand Down
40 changes: 40 additions & 0 deletions CODE-OF-CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# Contributor Code of Conduct

As contributors and maintainers of this project, and in the interest of
fostering an open and welcoming community, we pledge to respect all people who
contribute through reporting issues, posting feature requests, updating
documentation, submitting pull requests or patches, and other activities.

We are committed to making participation in this project a harassment-free
experience for everyone, regardless of level of experience, gender, gender
identity and expression, sexual orientation, disability, personal appearance,
body size, race, ethnicity, age, religion, or nationality.

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery
* Personal attacks
* Trolling or insulting/derogatory comments
* Public or private harassment
* Publishing other's private information, such as physical or electronic
addresses, without explicit permission
* Other unethical or unprofessional conduct.

Project maintainers have the right and responsibility to remove, edit, or reject
comments, commits, code, wiki edits, issues, and other contributions that are
not aligned to this Code of Conduct. By adopting this Code of Conduct, project
maintainers commit themselves to fairly and consistently applying these
principles to every aspect of managing this project. Project maintainers who do
not follow or enforce the Code of Conduct may be permanently removed from the
project team.

This code of conduct applies both within project spaces and in public spaces
when an individual is representing the project or its community.

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by opening an issue or contacting one or more of the project
maintainers.

This Code of Conduct is adapted from the [Contributor
Covenant](http://contributor-covenant.org), version 1.2.0, available at
[http://contributor-covenant.org/version/1/2/0/](http://contributor-covenant.org/version/1/2/0/)
Loading

0 comments on commit dc75f6d

Please sign in to comment.