From 230556a8e1dcebd14904e04240bf647f36b7a0e4 Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Wed, 30 Nov 2016 15:11:21 +0000 Subject: [PATCH] Update various things --- eslintrc.js | 15 +++++++-------- gitconfig | 2 +- install.sh | 8 ++++++++ rubocop.yml | 3 +++ shell/_main.sh | 2 ++ shell/docker.sh | 4 ++-- shell/golang.sh | 22 ++++++++++++++++++++-- shell/kubernetes.sh | 10 ++++++++++ shell/nodejs.sh | 3 +++ shell/ruby.sh | 10 ++++++++++ shell/travis-ci.sh | 5 +++++ 11 files changed, 71 insertions(+), 13 deletions(-) create mode 100644 shell/kubernetes.sh mode change 100644 => 100755 shell/nodejs.sh create mode 100644 shell/travis-ci.sh diff --git a/eslintrc.js b/eslintrc.js index fbbe65c..9058c05 100644 --- a/eslintrc.js +++ b/eslintrc.js @@ -3,11 +3,10 @@ module.exports = { 'installedESLint': true, 'plugins': [ 'standard' - ] -// , -// 'rules': { -// 'semi': [2, 'always'], -// 'no-extra-semi': 2, -// 'semi-spacing': [2, { 'before': false, 'after': true }] -// } -} + ], + 'rules': { + 'semi': [2, 'always'], + 'no-extra-semi': 2, + 'semi-spacing': [2, { 'before': false, 'after': true }] + } +}; diff --git a/gitconfig b/gitconfig index b89a761..ef24355 100644 --- a/gitconfig +++ b/gitconfig @@ -1,7 +1,7 @@ [user] name = Jim Myhrberg email = contact@jimeh.me - signingkey = 6BBB670E + signingkey = 887AA501FE5A45FA [core] excludesfile = ~/.gitignore [color] diff --git a/install.sh b/install.sh index 116e38e..000bb11 100755 --- a/install.sh +++ b/install.sh @@ -78,6 +78,10 @@ install_nvm () { git_clone 'https://github.com/creationix/nvm.git' "$TARGET/.nvm" } +install_gvm () { + bash < <(curl -s -S -L https://raw.githubusercontent.com/moovweb/gvm/master/binscripts/gvm-installer) +} + install_virtualenv () { curl -s https://raw.github.com/brainsik/virtualenv-burrito/master/virtualenv-burrito.sh | bash } @@ -140,6 +144,9 @@ case "$1" in nvm) install_nvm ;; + gvm) + install_gvm + ;; virtualenv|venv) install_virtualenv ;; @@ -163,6 +170,7 @@ case "$1" in echo ' homebrew: Install Homebrew (Mac OS X only).' echo ' rbenv: Install rbenv, a Ruby version manager.' echo ' nvm: Install nvm, a Node.js version manager.' + echo ' gvm: Install gvm, a Go version manager.' echo ' virtualenv: Install virtualenv-burrito, a Python version and' \ 'environment manager.' echo ' dokku: Clone dokku to ~/.dokku enabling use of' \ diff --git a/rubocop.yml b/rubocop.yml index 4a6f140..67c794b 100644 --- a/rubocop.yml +++ b/rubocop.yml @@ -1,3 +1,6 @@ +AllCops: + TargetRubyVersion: 2.1 + Rails: Enabled: true diff --git a/shell/_main.sh b/shell/_main.sh index 19d9c0c..bff23ac 100755 --- a/shell/_main.sh +++ b/shell/_main.sh @@ -40,8 +40,10 @@ source "$DOTSHELL/python.sh" source "$DOTSHELL/ruby.sh" source "$DOTSHELL/golang.sh" source "$DOTSHELL/docker.sh" +source "$DOTSHELL/kubernetes.sh" source "$DOTSHELL/dokku.sh" source "$DOTSHELL/sbcl.sh" +source "$DOTSHELL/travis-ci.sh" source "$DOTSHELL/amdsdk.sh" # Applications diff --git a/shell/docker.sh b/shell/docker.sh index da24ad6..207b51f 100644 --- a/shell/docker.sh +++ b/shell/docker.sh @@ -8,8 +8,8 @@ alias d="docker" alias co="docker-compose" alias dc="docker-cloud" -alias redis-cli="docker run -it --net=host --rm redis redis-cli" -alias mysql="docker run -it --net=host --rm mysql mysql" +# alias redis-cli="docker run -it --net=host --rm redis redis-cli" +# alias mysql="docker run -it --net=host --rm mysql mysql" docker_remove_exited () { docker rm $(docker ps -f="status=exited" -q) diff --git a/shell/golang.sh b/shell/golang.sh index b72233d..43321a7 100755 --- a/shell/golang.sh +++ b/shell/golang.sh @@ -2,8 +2,21 @@ # Go (golang) environment setup. # -export GOPATH="$HOME/.go:$HOME/Projects/Go" -path_prepend "$HOME/Projects/Go/bin:$HOME/.go/bin" +export MYGOPATH="$HOME/Projects/Go" + +# load gvm +[[ -s "/Users/jimeh/.gvm/scripts/gvm" ]] && source "/Users/jimeh/.gvm/scripts/gvm" + +# setup GOPATH after loading gvm +export GOPATH="$GOPATH:$MYGOPATH" +path_prepend "$MYGOPATH/bin" + +# aliases +alias gv="govendor" +gvm-use() { + gvm use $@ + export GOPATH="$GOPATH:$MYGOPATH" +} install_go_global_packages () { local packages=( \ @@ -13,9 +26,12 @@ install_go_global_packages () { github.com/golang/lint/golint \ github.com/kardianos/govendor \ github.com/kisielk/errcheck \ + github.com/kovetskiy/manul \ github.com/kr/pretty \ github.com/laher/goxc \ + github.com/mailgun/godebug \ github.com/mdempsky/unconvert \ + github.com/mitchellh/gox \ github.com/motemen/gore \ github.com/nsf/gocode \ github.com/pmezard/go-difflib/difflib \ @@ -24,6 +40,8 @@ install_go_global_packages () { github.com/tools/godep \ github.com/vektra/mockery/.../ \ golang.org/x/tools/cmd/goimports \ + golang.org/x/tools/cmd/gorename \ + golang.org/x/tools/cmd/guru \ launchpad.net/gorun \ ) diff --git a/shell/kubernetes.sh b/shell/kubernetes.sh new file mode 100644 index 0000000..9a45dd4 --- /dev/null +++ b/shell/kubernetes.sh @@ -0,0 +1,10 @@ +# +# Kubernetes Related +# + +alias kc="kubectl" +alias hl="helm" + +if command -v kubectl > /dev/null; then + eval "$(kubectl completion zsh)" +fi diff --git a/shell/nodejs.sh b/shell/nodejs.sh old mode 100644 new mode 100755 index 9a50862..e451c9b --- a/shell/nodejs.sh +++ b/shell/nodejs.sh @@ -20,13 +20,16 @@ install_node_global_packages () { eslint-plugin-react \ eslint-plugin-standard \ eslint-plugin-standard \ + htmllint-cli \ jsfmt \ jslinter \ jsonlint \ + localtunnel \ semistandard \ semistandard-format \ standard \ standard-format \ + stylefmt \ tslint \ typescript \ typescript-formatter diff --git a/shell/ruby.sh b/shell/ruby.sh index 67025b7..90b6308 100755 --- a/shell/ruby.sh +++ b/shell/ruby.sh @@ -2,6 +2,16 @@ # Ruby environment setup. # +install_ruby_global_packages () { + gem install --no-rdoc --no-ri \ + bundler \ + foreman \ + rubocop \ + lunchy \ + rbenv-rehash \ + travis +} + # Aliases alias po="powify" alias lu="lunchy" diff --git a/shell/travis-ci.sh b/shell/travis-ci.sh new file mode 100644 index 0000000..38cd80f --- /dev/null +++ b/shell/travis-ci.sh @@ -0,0 +1,5 @@ +# +# Travis-CI +# + +[ -f /Users/jimeh/.travis/travis.sh ] && source /Users/jimeh/.travis/travis.sh