pull upstream

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 La Loco SAS, head of Le Wagon Group
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,8 +1,7 @@
-This repository is used by [Le Wagon](https://www.lewagon.com) students during our 9-week [coding bootcamp](https://www.lewagon.com).
+This repository is used by [Le Wagon](https://www.lewagon.com) students.
 
 ## Toolset
 
 - [oh-my-zsh](http://ohmyz.sh/)
-- [Sublime Text](https://www.sublimetext.com/)
+- [Visual Studio Code](https://code.visualstudio.com/)
 - [git](https://git-scm.com/)
-- Ruby via [`rbenv`](https://github.com/rbenv/rbenv)

aliases

@@ -1,7 +1,9 @@
-# Get External IP / local IPs
-alias ip="curl ipinfo.io/ip"
-alias ips="ifconfig -a | perl -nle'/(\d+\.\d+\.\d+\.\d+)/ && print $1'"
-alias speedtest="wget -O /dev/null http://speedtest.wdc01.softlayer.com/downloads/test10.zip"
+# Get External IP / Internet Speed
+alias myip="curl https://ipinfo.io/json" # or /ip for plain-text ip
+alias speedtest="curl -s https://raw.githubusercontent.com/sivel/speedtest-cli/master/speedtest.py | python -"
 
 # Quickly serve the current directory as HTTP
-alias serve='ruby -run -e httpd . -p 8000'  # Or python -m SimpleHTTPServer :)
+alias serve='ruby -run -e httpd . -p 8000' # Or python -m SimpleHTTPServer :)
+
+# NOTE: On Q3 2021, Le Wagon decided to change the Web Dev curriculum default text editor
+alias stt="echo 'Launching VS Code instead of Sublime Text... (cf ~/.aliases)' && code ."

config

@@ -0,0 +1,4 @@
+Host *
+  UseKeychain yes
+  AddKeysToAgent yes
+  IdentityFile ~/.ssh/id_ed25519

git_setup.sh

@@ -4,8 +4,8 @@ read full_name
 echo "Type in your email address (the one used for your GitHub account): "
 read email
 
-git config --global user.email $email
-git config --global user.name $full_name
+git config --global user.email "$email"
+git config --global user.name "$full_name"
 
 git add .
 git commit --message "My identity for @lewagon in the gitconfig"

gitconfig

@@ -11,6 +11,7 @@
 
 [core]
   pager = less -FRSX
+  editor = code --wait
 
 [alias]
   co = checkout
@@ -22,8 +23,14 @@
   dt  = difftool
   stat = !git --no-pager diff --stat
 
-  # Clean merged branches
-  sweep = !git branch --merged master | grep -v 'master$' | xargs git branch -d && git remote prune origin
+  # Set remotes/origin/HEAD -> defaultBranch (copied from https://stackoverflow.com/a/67672350/14870317)
+  remoteSetHead = remote set-head origin --auto
+
+  # Get default branch name (copied from https://stackoverflow.com/a/67672350/14870317)
+  defaultBranch = !git symbolic-ref refs/remotes/origin/HEAD | cut -d'/' -f4
+
+  # Clean merged branches (adapted from https://stackoverflow.com/a/6127884/14870317)
+  sweep = !git branch --merged $(git defaultBranch) | grep -E -v " $(git defaultBranch)$" | xargs -r git branch -d && git remote prune origin
 
   # http://www.jukie.net/bart/blog/pimping-out-git-log
   lg = log --graph --all --pretty=format:'%Cred%h%Creset - %s %Cgreen(%cr) %C(bold blue)%an%Creset %C(yellow)%d%Creset'
@@ -32,7 +39,8 @@
   # Then other can access via `git clone git://#{YOUR_IP_ADDRESS}/
   serve = !git daemon --reuseaddr --verbose  --base-path=. --export-all ./.git
 
-  m = checkout master
+  # Checkout to defaultBranch
+  m = !git checkout $(git defaultBranch)
 
   # Removes a file from the index
   unstage = reset HEAD --
@@ -41,7 +49,13 @@
   autocorrect = 1
 
 [push]
-	default = simple
+  default = simple
 
 [branch "master"]
   mergeoptions = --no-edit
+
+[pull]
+  rebase = false
+
+[init]
+  defaultBranch = master

install.sh

@@ -1,64 +1,75 @@
+#!/bin/zsh
+
+# Define a function which rename a `target` file to `target.backup` if the file
+# exists and if it's a 'real' file, ie not a symlink
 backup() {
   target=$1
-  if [ -e "$target" ]; then           # Does the config file already exist?
-    if [ ! -L "$target" ]; then       # as a pure file?
-      mv "$target" "$target.backup"   # Then backup it
+  if [ -e "$target" ]; then
+    if [ ! -L "$target" ]; then
+      mv "$target" "$target.backup"
       echo "-----> Moved your old $target config file to $target.backup"
     fi
   fi
 }
 
-#!/bin/zsh
-for name in *; do
+symlink() {
+  file=$1
+  link=$2
+  if [ ! -e "$link" ]; then
+    echo "-----> Symlinking your new $link"
+    ln -s $file $link
+  fi
+}
+
+# For all files `$name` in the present folder except `*.sh`, `README.md`, `settings.json`,
+# and `config`, backup the target file located at `~/.$name` and symlink `$name` to `~/.$name`
+for name in aliases gitconfig irbrc pryrc rspec zprofile zshrc; do
   if [ ! -d "$name" ]; then
     target="$HOME/.$name"
-    if [[ ! "$name" =~ '\.sh$' ]] && [ "$name" != 'README.md' ] && [[ ! "$name" =~ '\.sublime-settings$' ]]; then
-      backup $target
-
-      if [ ! -e "$target" ]; then
-        echo "-----> Symlinking your new $target"
-        ln -s "$PWD/$name" "$target"
-      fi
-    fi
+    backup $target
+    symlink $PWD/$name $target
   fi
 done
 
-REGULAR="\\033[0;39m"
-YELLOW="\\033[1;33m"
-GREEN="\\033[1;32m"
-
-# zsh plugins
+# Install zsh-syntax-highlighting plugin
 CURRENT_DIR=`pwd`
 ZSH_PLUGINS_DIR="$HOME/.oh-my-zsh/custom/plugins"
 mkdir -p "$ZSH_PLUGINS_DIR" && cd "$ZSH_PLUGINS_DIR"
 if [ ! -d "$ZSH_PLUGINS_DIR/zsh-syntax-highlighting" ]; then
   echo "-----> Installing zsh plugin 'zsh-syntax-highlighting'..."
-  git clone git://github.com/zsh-users/zsh-syntax-highlighting.git
+  git clone https://github.com/zsh-users/zsh-autosuggestions
+  git clone https://github.com/zsh-users/zsh-syntax-highlighting
 fi
 cd "$CURRENT_DIR"
 
-setopt nocasematch
-if [[ ! `uname` =~ "darwin" ]]; then
-  git config --global core.editor "subl -n -w $@ >/dev/null 2>&1"
-  echo 'export BUNDLER_EDITOR="subl $@ >/dev/null 2>&1 -a"' >> zshrc
+# Symlink VS Code settings and keybindings to the present `settings.json` and `keybindings.json` files
+# If it's a macOS
+if [[ `uname` =~ "Darwin" ]]; then
+  CODE_PATH=~/Library/Application\ Support/Code/User
+# Else, it's a Linux
 else
-  git config --global core.editor "'/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl' -n -w"
-  bundler_editor="'/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl'"
-  echo "export BUNDLER_EDITOR=\"${bundler_editor} -a\"" >> zshrc
+  CODE_PATH=~/.config/Code/User
+  # If this folder doesn't exist, it's a WSL
+  if [ ! -e $CODE_PATH ]; then
+    CODE_PATH=~/.vscode-server/data/Machine
+  fi
 fi
 
-# Sublime Text
-if [[ ! `uname` =~ "darwin" ]]; then
-  SUBL_PATH=~/.config/sublime-text-3
-else
-  SUBL_PATH=~/Library/Application\ Support/Sublime\ Text\ 3
+for name in settings.json keybindings.json; do
+  target="$CODE_PATH/$name"
+  backup $target
+  symlink $PWD/$name $target
+done
+
+# Symlink SSH config file to the present `config` file for macOS and add SSH passphrase to the keychain
+if [[ `uname` =~ "Darwin" ]]; then
+  target=~/.ssh/config
+  backup $target
+  symlink $PWD/config $target
+  ssh-add --apple-use-keychain ~/.ssh/id_ed25519
 fi
-mkdir -p $SUBL_PATH/Packages/User $SUBL_PATH/Installed\ Packages
-backup "$SUBL_PATH/Packages/User/Preferences.sublime-settings"
-curl -k https://sublime.wbond.net/Package%20Control.sublime-package > $SUBL_PATH/Installed\ Packages/Package\ Control.sublime-package
-ln -s $PWD/Preferences.sublime-settings $SUBL_PATH/Packages/User/Preferences.sublime-settings
-ln -s $PWD/Package\ Control.sublime-settings $SUBL_PATH/Packages/User/Package\ Control.sublime-settings
 
-zsh ~/.zshrc
+# Refresh the current terminal with the newly installed configuration
+exec zsh
 
-echo "👌  Carry on with git setup!"
+echo "👌 Carry on with git setup!"

keybindings.json

@@ -0,0 +1,13 @@
+// Place your key bindings in this file to override the defaults
+[
+  {
+    "key": "ctrl+shift+v",
+    "command": "pasteAndIndent.action",
+    "when": "editorTextFocus && !editorReadonly"
+  },
+  {
+    "key": "cmd+shift+v",
+    "command": "pasteAndIndent.action",
+    "when": "editorTextFocus && !editorReadonly"
+  }
+]

pryrc

@@ -0,0 +1,36 @@
+# https://github.com/pry/pry/tree/master/lib/pry
+
+if defined?(Rails)
+  short_env_name_options = {
+    'development' => 'dev',
+    'production'  => 'prod'
+  } 
+  app_name = Rails.application.class.module_parent_name.underscore.dasherize
+  env_name = short_env_name_options.fetch(Rails.env) { Rails.env }
+  description = 'Prompt has to match the rails app name'
+else
+  current_directory = Dir.pwd.split('/').last.to_s
+  description = 'Prompt has to match the current directory name'
+end
+
+# https://github.com/pry/pry/blob/master/lib/pry/prompt.rb
+Pry::Prompt.add(:current_app) do |context, nesting, pry_instance, sep|
+  format(
+    '[%<in_count>s] %<current_app>s(%<context>s)%<nesting>s%<separator>s ',
+    in_count: pry_instance.input_ring.count,
+    current_app: app_name || current_directory,
+    context: env_name || Pry.view_clip(context),
+    nesting: (nesting > 0 ? ":#{nesting}" : ''),
+    separator: sep
+  )
+end
+
+prompt = Pry::Prompt[:current_app]
+procs = [
+  proc { |*args| prompt.wait_proc.call(*args).to_s },
+  proc { |*args| prompt.incomplete_proc.call(*args).to_s }
+]
+
+Pry.config.prompt = Pry::Prompt.new(
+  'custom_app_prompt', description, procs
+)