Skip to content

Commit ee28633

Browse files
committed
meow
1 parent 0b117b8 commit ee28633

4 files changed

Lines changed: 26 additions & 17 deletions

File tree

.bash_profile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ fi
77
export IPSEC_SECRETS_FILE=/etc/ipsec.secrets
88
export KEY_SUFFIX=grandrounds.com
99

10-
source /usr/local/share/chruby/chruby.sh
11-
source /usr/local/share/chruby/auto.sh
12-
chruby ruby-2.1.5
10+
#source /usr/local/share/chruby/chruby.sh
11+
#source /usr/local/share/chruby/auto.sh
12+
#chruby ruby-2.1.5
1313

1414
# These were installed by the bin/setup script of the jarvis repo, however
1515
# they seem to be not needed, and cause errors like:

.bashrc

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,6 @@ pathrm() {
2626
PATH="$(echo $PATH | sed -e "s;\(^\|:\)${1%/}\(:\|\$\);\1\2;g" -e 's;^:\|:$;;g' -e 's;::;:;g')"
2727
}
2828

29-
# RVM
30-
pathadd "$HOME/.rvm/bin" # Add RVM to PATH for scripting
31-
[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function*
32-
33-
# node modules path
34-
pathadd "./node_modules/.bin"
35-
3629
# Configuration for the command line tool "hh" (history searcher to replace ctrl-r, brew install hh)
3730
export HH_CONFIG=hicolor,rawhistory,favorites # get more colors
3831
shopt -s histappend # append new history items to .bash_history
@@ -907,6 +900,12 @@ PS1="\n\[$COLOR_YELLOW\]\u\[\$(error_test)\]@\[$COLOR_GREEN\]\w\$(${dvcs_functio
907900
export GR_HOME=${HOME}/dev
908901
export GR_USERNAME=andrew.ray
909902

903+
function fixrvm() {
904+
source ~/.rvm/scripts/rvm
905+
rvm reload
906+
rvm list
907+
}
908+
910909
function gr_locked_gpg() {
911910
if pgrep -f "gpg --use-agent --no-tty --quiet -o" > /dev/null
912911
then
@@ -916,12 +915,6 @@ function gr_locked_gpg() {
916915
fi
917916
}
918917

919-
function fixrvm() {
920-
source ~/.rvm/scripts/rvm
921-
rvm reload
922-
rvm list
923-
}
924-
925918
sleep_rand() {
926919
rand=${RANDOM:0:1} # 0 - 9 https://stackoverflow.com/questions/1194882/how-to-generate-random-number-in-bash
927920
sleep "0.${rand}"
@@ -1130,3 +1123,10 @@ if [ -d "$TRACKER_FLOW_PATH" ]; then
11301123
. "$TRACKER_FLOW_PATH/tracker_completion.bash"
11311124
fi
11321125

1126+
# RVM
1127+
pathadd "$HOME/.rvm/bin" # Add RVM to PATH for scripting
1128+
[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function*
1129+
1130+
# node modules path
1131+
pathadd "./node_modules/.bin"
1132+

.pryrc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,15 @@ rescue LoadError
1515
puts "Warning: factory_bot_rails gem not found"
1616
end
1717

18+
# Gives domestic_phone_number for creating factories that use phone numbers
19+
begin
20+
require './spec/support/faker_phones.rb'
21+
puts "#{'require'.light_red} #{"'./spec/support/faker_phones.rb'".cyan}"
22+
rescue LoadError
23+
puts "Warning: ./spec/support/faker_phones.rb not found"
24+
end
25+
26+
1827
# rails 5.1 break?
1928
#begin
2029
#Rails.application.routes.url_helpers

code/settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"eslint.enable": true,
55
"javascript.validate.enable": false,
66
"editor.rulers": [80],
7-
"window.zoomLevel": 0,
7+
"window.zoomLevel": 1,
88
"files.exclude": {
99
"**/.git": true, // this is a default value
1010
"**/.DS_Store": true, // this is a default value

0 commit comments

Comments
 (0)