Merge branch 'master' of github.com:AndrewRayCode/configs

Author: AndrewRayCode

.bashrc

@@ -688,9 +688,6 @@ function dvcs_commit_all {
     fi
 }
 
-# This code was auto generated by with these options:
-#  - file:///Users/aray/bash-prompt-builder/index.html#git=true&git-prefix=false&git-ahead=true&git-modified=true&git-conflicted=true&git-revno=false&git-bisect=true&hg=true&hg-prefix=false&hg-modified=true&hg-conflicted=true&hg-revno=false&hg-bisect=true&hg-patches=true&svn=true&svn-modified=true&svn-revno=true&comments=false&modified-char=%E2%9C%8E&conflict-char=%E2%98%A2&max-conflicted-files=2&no-branch-text=no%20branch!&bisecting-text=%CF%9F
-#
 # Requirements (other than git, svn and hg):
 #   hg-prompt: https://bitbucket.org/sjl/hg-prompt/src
 #   svnversion (you probably have it if you have svn)
@@ -903,7 +900,6 @@ dvcs_function="
     fi
 
     echo -e \$prompt"
-# End code auto generated by http://andrewray.me/bash-prompt-builder/index.html
 
 function error_test() {
     if [[ $? = "0" ]]; then
@@ -930,7 +926,7 @@ function ding() {
 }
 
 # Python development, requires pyenv from homebrew
-# Needs to go before GR stuff to 
+# Needs to go before GR stuff
 if [[ $(command -v pyenv) ]]; then
     export PYENV_ROOT="$HOME/.pyenv"
 
@@ -955,27 +951,8 @@ function gr_locked_gpg() {
     fi
 }
 
-sleep_rand() {
-    rand=${RANDOM:0:1} # 0 - 9 https://stackoverflow.com/questions/1194882/how-to-generate-random-number-in-bash
-    sleep "0.${rand}"
-}
 
 if [ -d "$GR_HOME" ]; then
-
-    sleep_rand
-    locked=$(gr_locked_gpg)
-    if [ "$locked" == "1" ]; then
-        echo 'Someone else is using the gpg agent, waitng...'
-        bail=0
-
-        while [ "$locked" == "1" ] && [ $bail != 100 ]
-        do
-            sleep_rand
-            locked=$(gr_locked_gpg)
-            let bail+=1
-        done
-    fi
-
     for file in ${GR_HOME}/engineering/bash/*.sh; do
         source "$file"
     done
@@ -1058,7 +1035,7 @@ function releaseCommits() {
 
 function jgrep() {
     #bundle exec rake routes > ~/dev/rake-routes
-    cat ~/dev/rake-routes | grep "$1"
+    cat ~/dev/rake-routes | grep -i "$1"
 }
 
 if type "bat" > /dev/null 2>&1; then
@@ -1158,6 +1135,11 @@ function docker_tag_exists() {
     fi
 }
 
+LEGACY_TERRAFORM_PATH="/usr/local/opt/[email protected]/bin"
+if [ -d "$LEGACY_TERRAFORM_PATH" ]; then
+  pathadd "$LEGACY_TERRAFORM_PATH"
+fi
+
 TRACKER_FLOW_PATH="$GR_HOME/tracker-flow"
 if [ -d "$TRACKER_FLOW_PATH" ]; then
   pathadd "$TRACKER_FLOW_PATH"

.jshintrc

@@ -11,7 +11,7 @@
 # -----------------------------------------------------------------------------
 # Rails app spits out lots of startup garbage, separate this
 def notice_me(msg)
-  puts '*' * 100
+  puts "☠ #{'❌' * 30} ☠"
   puts "❌ #{msg}"
   puts
 end
@@ -29,6 +29,16 @@ rescue Exception => ex # Did you know LoadError inherits from Exception, not Sta
     notice_me "Warning: colorize gem not found, make sure you:\n - Installed colorize locally (gem install colorize)\n - This path exists: #{colorize_init_file}\n#{ex.message}"
 end
 
+# -----------------------------------------------------------------------------
+# Load the route helpers in the terminal so you can generate page URLs
+# admin_stark_user_path / admin_stark_user_url
+begin
+    include Rails.application.routes.url_helpers
+    puts "✅ #{'include'.light_yellow} #{'Rails.application.routes.url_helpers'.cyan}"
+rescue LoadError
+    puts "Warning: factory_bot_rails gem not found"
+end
+
 # -----------------------------------------------------------------------------
 # Enables FactoryBot in a pry session
 begin
@@ -47,31 +57,33 @@ rescue StandardError
     notice_me "Warning: ./spec/support/anna_spec_helper not found"
 end
 
-# -----------------------------------------------------------------------------
-# Enables a lot more factories which explicilty need the domestic_phone_number
-# gem for creating factories that use phone numbers
-begin
-    require './spec/support/faker_phones.rb'
-    puts "✅ #{'require'.light_red} #{"'./spec/support/faker_phones.rb'".cyan}"
-rescue StandardError
-    notice_me "Warning: ./spec/support/faker_phones.rb not found"
-end
-
-
-# -----------------------------------------------------------------------------
-# Load the route helpers in the terminal so you can generate page URLs
-# admin_stark_user_path / admin_stark_user_url
-begin
-    include Rails.application.routes.url_helpers
-    puts "✅ #{'include'.light_yellow} #{'Rails.application.routes.url_helpers'.cyan}"
-rescue LoadError
-    puts "Warning: factory_bot_rails gem not found"
-end
-
 # =============================================================================
 # Helper functions (not meant to be run directly)
 # =============================================================================
 
+def globRequire(path)
+  successes = []
+  failures = []
+  Dir.glob(path).each do |file|
+    begin
+        require file
+        successes << file
+    rescue Exception => e
+        failures << "Warning: Could not require #{file}? #{e.message}"
+    end
+  end
+  if successes.count > 0
+      puts "✅ #{'require {'.light_red}#{successes.join(', ').cyan}#{'}'.light_red}"
+  end
+  notice_me failures if failures.present?
+end
+
+# -----------------------------------------------------------------------------
+# Enables a lot more factories which need our custom Faker plugins. I'm too
+# lazy to make the method a separate file and require it so that I can call
+# this method above the definitino
+globRequire('./spec/support/faker_*.rb')
+
 # -----------------------------------------------------------------------------
 # Print a full stack trace with colorized output for easier
 def colorized_stack_trace( stack, base_dir )

.pryrc

@@ -145,7 +145,7 @@ set guioptions=mer
 " Use spaces always
 set expandtab
 
-" Copy indent from current line when starting a new line 
+" Copy indent from current line when starting a new line
 set autoindent
 
 " Break at specific characters when wrapping long lines (:set breakat?)
@@ -373,6 +373,9 @@ nnoremap <Leader>ff ?^func\\|^[a-zA-Z].*func<CR>,/
 
 nnoremap <C-L> <C-w>l
 
+" Todo fix b
+nnoremap <Leader>cp dd?✅<cr>p0ls✅<esc><c-o>
+
 " experimental - enter to go into command mode (otherwise useless shortcut).
 " See clickable_maps for preventing vim clickable from messing this up. Also
 " see :h <cr> which is duplicated by BOTH ctrl-m AND + lol

.vimrc

@@ -8,6 +8,7 @@
   { "key": "cmd-k l", "command": "latex-workshop.tab", "when": "editorTextFocus" },
   { "key": "cmd-alt-m", "command": "workbench.action.terminal.focus" },
   { "key": "cmd-alt-m", "command": "workbench.action.terminal.focus" },
+  { "key": "cmd-shift-b", "command": "editor.action.revealDefinition", "when": "editorHasDefinitionProvider && editorTextFocus && !isInEmbeddedEditor" },
 
   // terrible defaults for "rails run specs"
   { "key": "shift+cmd+t",           "command": "workbench.action.reopenClosedEditor" },

code/keybindings.json

@@ -3,7 +3,7 @@
   "eslint.enable": true,
   "javascript.validate.enable": false,
   "editor.rulers": [80],
-  "window.zoomLevel": 1,
+  "window.zoomLevel": 2,
   "files.exclude": {
     "**/.DS_Store": true,
     "**/.git": true,
@@ -17,7 +17,6 @@
   "workbench.editor.enablePreview": true,
   "workbench.editor.enablePreviewFromQuickOpen": false,
   "workbench.colorTheme": "rainbow",
-
   "editor.renderWhitespace": "none",
   "gitlens.advanced.messages": {
     "suppressShowKeyBindingsNotice": true
@@ -26,8 +25,12 @@
   "javascript.updateImportsOnFileMove.enabled": "always",
   "typescript.updateImportsOnFileMove.enabled": "always",
   "breadcrumbs.enabled": true,
-  "editor.formatOnSave": true,
+  "[javascript]": {
+    "editor.formatOnSave": true,
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
   "editor.tabSize": 2,
+  "editor.tabCompletion": "on",
   "editor.snippetSuggestions": "top",
   "terminal.integrated.rendererType": "dom",
   "editor.tokenColorCustomizations": {
@@ -76,7 +79,6 @@
   "gitlens.hovers.currentLine.over": "line",
   "gitlens.codeLens.enabled": false,
   "errorLens.gutterIconsEnabled": true,
-  "[javascript]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
-  }
-}
+  "files.autoSave": "off",
+  "breadcrumbs.symbolPath": "off"
+}