Skip to content

Commit

Permalink
Merge branch 'feature/#1' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
luismayta committed Jan 17, 2017
2 parents 6c58a4c + e8d2358 commit 18b1096
Show file tree
Hide file tree
Showing 34 changed files with 973 additions and 0 deletions.
6 changes: 6 additions & 0 deletions .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[bumpversion]
files = VERSION .bumpversion.cfg
commit = True
tag = False
current_version = 0.0.1

7 changes: 7 additions & 0 deletions .codeclimate.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
engines:
fixme:
enabled: true
ratings:
paths: []
exclude_paths: []
3 changes: 3 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
etc/*
Makefile
script/*
28 changes: 28 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# http://editorconfig.org
root = true

[*]
indent_style = space
indent_size = 2
end_of_line = lf
trim_trailing_whitespace = true
charset = utf-8
insert_final_newline = false
max_line_length = 80

[*.{py,sh,sql}]
indent_size = 4

[*.md]
trim_trailing_whitespace = false

# Tabs
[*.{less,css}]
indent_style = tab

[Vagrantfile]
indent_style = tab

[Makefile]
indent_style = tab
indent_size = 4
134 changes: 134 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,134 @@
# Path-based git attributes
# https://www.kernel.org/pub/software/scm/git/docs/gitattributes.html

## Test/documentation

# Ignore all test and documentation with "export-ignore".
/.gitattributes export-ignore
/.githooks export-ignore
/.gitignore export-ignore
/.travis.yml export-ignore
/.travis.yaml export-ignore
/phpunit.xml.dist export-ignore
/.scrutinizer.yml export-ignore
/.scrutinizer.yaml export-ignore
/tests export-ignore

## Merging
CHANGELOG.md merge=union

## Line endings

### Automatic

# Handle line endings automatically for files detected as text
# and leave all files detected as binary untouched.
* text=auto eol=lf

### Text (should be normalized, convert crlf => lf)

# Source
*.php text eol=lf
*.css text eol=lf
*.sass text eol=lf
*.scss text eol=lf
*.less text eol=lf
*.styl text eol=lf
*.js text eol=lf
*.coffee text eol=lf
*.json text eol=lf
*.htm text eol=lf
*.html text eol=lf
*.xml text eol=lf
*.svg text eol=lf
*.txt text eol=lf
*.ini text eol=lf
*.inc text eol=lf
*.pl text eol=lf
*.rb text eol=lf
*.py text eol=lf
*.scm text eol=lf
*.sql text eol=lf
*.sh text eol=lf
*.bat text eol=lf

# Templates
*.ejs text eol=lf
*.hbt text eol=lf
*.jade text eol=lf
*.haml text eol=lf
*.hbs text eol=lf
*.dot text eol=lf
*.tmpl text eol=lf
*.phtml text eol=lf

# App config
.env text eol=lf
.env.example text eol=lf

# Server config
.htaccess text eol=lf

# Git config
.gitattributes text eol=lf
.gitignore text eol=lf

# Code analysis config
.jshintrc text eol=lf
.jscsrc text eol=lf
.jshintignore text eol=lf
.csslintrc text eol=lf

# Misc config
*.yaml text eol=lf
*.yml text eol=lf
*.yaml text eol=lf
.editorconfig text eol=lf

# Build config
composer.lock text eol=lf
*.npmignore text eol=lf
*.bowerrc text eol=lf

# Heroku
Procfile text eol=lf
.slugignore text eol=lf

# Documentation
*.md text eol=lf
LICENSE text eol=lf
AUTHORS text eol=lf

# Vagrant
Vagrantfile eol=lf

# Scripts
bin/* text eol=lf

### Binary (left untouched)

# (binary is a macro for -text -diff)
*.png binary
*.jpg binary
*.jpeg binary
*.gif binary
*.ico binary
*.mov binary
*.mp4 binary
*.mp3 binary
*.mwb binary
*.flv binary
*.fla binary
*.swf binary
*.gz binary
*.zip binary
*.7z binary
*.rar binary
*.ttf binary
*.eot binary
*.woff binary
*.woff2 binary
*.otf binary
*.pyc binary
*.pdf binary
*.bz2 binary
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.idea/
4 changes: 4 additions & 0 deletions .mailmap
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
@slovacus <[email protected]> luis mayta <[email protected]> luis alberto mayta <[email protected]>
@slovacus <[email protected]> Luis Alberto Mayta Mamani <[email protected]>
@slovacus <[email protected]> luis alberto mayta <[email protected]>
@slovacus <[email protected]> Lmayta <[email protected]> Luis Alberto Mayta M <[email protected]>
54 changes: 54 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
- repo: [email protected]:pre-commit/pre-commit-hooks
sha: 5da199bb8d60f764c0f77a20b0a1dc3a7640bcdd
hooks:
- id: detect-private-key
files: ^(?!\.?git-crypt)
- id: check-merge-conflict
- id: trailing-whitespace
files: ^tf|-|\.(py|tfvars|tf|tfenv|env|yml|yaml|pem|key|mock)$
- id: end-of-file-fixer
files: ^tf|-|\.(py|tfvars|tf|tfenv|env|yml|yaml|pem|key|mock)$
- id: check-added-large-files
- id: check-case-conflict
- id: check-json
- id: check-xml
- id: check-yaml
- id: check-case-conflict
- id: check-ast
- id: debug-statements
- id: autopep8-wrapper
args:
- -i
- --ignore=E501
- id: double-quote-string-fixer
- id: check-docstring-first
- id: pretty-format-json
- id: debug-statements
- id: requirements-txt-fixer
- id: name-tests-test
- repo: git://github.com/pre-commit/mirrors-pylint
sha: v1.6.4
hooks:
- id: pylint
args:
- --rcfile=.pylintrc
- repo: git://github.com/pre-commit/mirrors-scss-lint
sha: v0.50.2
hooks:
- id: scss-lint
files: \.(scss)$
- repo: [email protected]:pre-commit/pre-commit
sha: ba09a2dfffff2bfb8edbdc206354b6c1fae4ef8d
hooks:
- id: validate_config
- id: validate_manifest
- repo: git://github.com/FalconSocial/pre-commit-python-sorter
sha: 5991d2aea26858d3c3538e0b4e09255b6b99413e
hooks:
- id: python-import-sorter
args:
- --silent-overwrite
- repo: git://github.com/detailyang/pre-commit-shell
sha: 1fdffa0434cde2b87f19ad258201d3e81481af5f
hooks:
- id: shell-lint
8 changes: 8 additions & 0 deletions .projectile
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
-/log
-/tmp
-/.git
-/.vagrant
-/auto-save-list
-*.cache
-*.pyc
-projectile-bookmarks.eld
Loading

0 comments on commit 18b1096

Please sign in to comment.