From b84b729e6d466a9de31720ca05f044feabd57c7d Mon Sep 17 00:00:00 2001
From: Jim Myhrberg <contact@jimeh.me>
Date: Sun, 31 Jan 2016 19:51:46 +0000
Subject: [PATCH] Update various dotfiles

---
 bundle/config |   5 ++++-
 gitignore     |   1 +
 irbrc         |   1 +
 rubocop.yml   |  21 +++++++++++++++------
 shell/ruby.sh |   5 ++++-
 tmux.conf     | Bin 1474 -> 1859 bytes
 6 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/bundle/config b/bundle/config
index 4296669..5ea5b64 100644
--- a/bundle/config
+++ b/bundle/config
@@ -1,2 +1,5 @@
 ---
-BUNDLE_BUILD__NOKOGIRI: --use-system-libraries
+BUNDLE_BUILD__NOKOGIRI: "--use-system-libraries"
+BUNDLE_GEM__COC: 'false'
+BUNDLE_GEM__MIT: 'false'
+BUNDLE_GEM__TEST: rspec
diff --git a/gitignore b/gitignore
index 6eef023..d02674f 100644
--- a/gitignore
+++ b/gitignore
@@ -1,4 +1,5 @@
 .DS_Store
+.AppleDouble
 .bin
 .bundle
 .projectile
diff --git a/irbrc b/irbrc
index e78bc13..dc6104a 100644
--- a/irbrc
+++ b/irbrc
@@ -1,3 +1,4 @@
+require 'irb/completion'
 require 'irb/ext/save-history'
 IRB.conf[:SAVE_HISTORY] = 1000
 IRB.conf[:HISTORY_FILE] = "#{ENV['HOME']}/.irb-history"
diff --git a/rubocop.yml b/rubocop.yml
index d7b374c..4a6f140 100644
--- a/rubocop.yml
+++ b/rubocop.yml
@@ -1,5 +1,5 @@
-AllCops:
-  RunRailsCops: true
+Rails:
+  Enabled: true
 
 Documentation:
   Enabled: false
@@ -7,7 +7,7 @@ Documentation:
 Style/AlignParameters:
   EnforcedStyle: with_fixed_indentation
 
-Style/ClassLength:
+Metrics/ClassLength:
   CountComments: false
   Max: 200
 
@@ -18,7 +18,10 @@ Style/CollectionMethods:
 Style/EachWithObject:
   Enabled: false
 
-Style/EmptyLinesAroundBody:
+Style/EmptyLinesAroundBlockBody:
+  Enabled: false
+
+Style/EmptyLinesAroundClassBody:
   Enabled: false
 
 Style/EmptyLineBetweenDefs:
@@ -33,14 +36,14 @@ Style/HashSyntax:
 Style/IndentHash:
   EnforcedStyle: consistent
 
-Style/LineLength:
+Metrics/LineLength:
   Max: 80
   AllowURI: true
 
 Style/IfUnlessModifier:
   MaxLineLength: 80
 
-Style/MethodLength:
+Metrics/MethodLength:
   CountComments: false
   Max: 20
 
@@ -52,3 +55,9 @@ Style/StringLiterals:
 
 Style/WhileUntilModifier:
   MaxLineLength: 80
+
+Style/LineEndConcatenation:
+  Enabled: false
+
+Style/WordArray:
+  Enabled: false
diff --git a/shell/ruby.sh b/shell/ruby.sh
index 6836b45..197b9f6 100644
--- a/shell/ruby.sh
+++ b/shell/ruby.sh
@@ -39,7 +39,10 @@ elif [ -s "$HOME/.rvm/scripts/rvm" ]; then
   source "$HOME/.rvm/scripts/rvm"
 fi
 
+# lunchy auto-completion
 LUNCHY_DIR="$(dirname `gem which lunchy`)/../extras"
-if [ -f "$LUNCHY_DIR/lunchy-completion.bash" ]; then
+if [ -n "$BASH_VERSION" ] && [ -f "$LUNCHY_DIR/lunchy-completion.bash" ]; then
   source "$LUNCHY_DIR/lunchy-completion.bash"
+elif [ -n "$ZSH_VERSION" ] && [ -f "$LUNCHY_DIR/lunchy-completion.zsh" ]; then
+  source "$LUNCHY_DIR/lunchy-completion.zsh"
 fi
diff --git a/tmux.conf b/tmux.conf
index dadd34e5a42bf19707b3579f384df7e78a61ea46..73887be2effd8319fc11a2008faaf79237b13712 100644
GIT binary patch
delta 407
zcmY+8F;2rk5Jhq5f<%cZzw9E_#<EE$5~V{l2q^`K2FY^lvAtrwYkAi|6h*m05DoXp
z4WQ!~oPv_YDZtHW{`@yz|NZFWc>DHx=$r<s(FEO8m8wl&lL5<7wnru5;ihb!5e@^y
zGKGi@)h}DI>3f*h^k?oLbW$rJxXiJjB7Wqmwj3C;T9p$N##DOZ`#Cp7vlu3-^o<SQ
z53Y4X+7Cu!uU)NMk~AzB2SIpt9*+78ZVNDpyMkyVZmW4L2|Q!EAR)jm!3<__y;a*K
zisdrOM4Yc(xSC|j9%!k-uC3&m#mx)@Z&lflh|8!{DXj+>{3lx}C^77pvhlMi5>+i(
lsjgD1X^IZ+b}EVs^(5PlnmQr4@BZyhoG-^Y*nRgtdq03UhV=jd

delta 22
ecmX@icZhq!jEOH(CQg*!Je%n*<K{}1Q%nGRa|#du