Upgrade gems.

Author: tobyclemson

Gemfile

@@ -6,7 +6,6 @@ gem 'git'
 gem 'nokogiri'
 gem 'rake'
 gem 'rake_circle_ci'
-gem 'rake_dependencies'
 gem 'rake_github'
 gem 'rake_gpg'
 gem 'rake_ssh'

Gemfile.lock

@@ -1313,7 +1313,7 @@ GEM
       excon (~> 0.72)
       rake_factory (~> 0.23)
       sshkey (~> 2.0)
-    rake_dependencies (2.13.0)
+    rake_dependencies (3.1.0)
       hamster (~> 3.0)
       minitar (~> 0.9)
       rake_factory (~> 0.23)
@@ -1333,9 +1333,9 @@ GEM
       colored2 (~> 3.1)
       rake_factory (~> 0.23)
       sshkey (~> 2.0)
-    rake_terraform (1.21.0)
+    rake_terraform (1.22.0)
       colored2 (~> 3.1)
-      rake_dependencies (~> 2.11)
+      rake_dependencies (~> 3.1)
       rake_factory (~> 0.23)
       ruby-terraform (~> 1.4)
     rchardet (1.8.0)
@@ -1396,7 +1396,6 @@ DEPENDENCIES
   nokogiri
   rake
   rake_circle_ci
-  rake_dependencies
   rake_github
   rake_gpg
   rake_ssh

LICENSE.txt

@@ -18,4 +18,4 @@ 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.
+THE SOFTWARE.

go

@@ -3,54 +3,68 @@
 [ -n "$GO_DEBUG" ] && set -x
 set -e
 
-project_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+project_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
 verbose="no"
-skip_checks="no"
 offline="no"
+skip_checks="no"
 
 missing_dependency="no"
 
 [ -n "$GO_DEBUG" ] && verbose="yes"
 [ -n "$GO_SKIP_CHECKS" ] && skip_checks="yes"
 [ -n "$GO_OFFLINE" ] && offline="yes"
 
+function loose_version() {
+  local version="$1"
+
+  IFS="." read -r -a version_parts <<<"$version"
+
+  echo "${version_parts[0]}.${version_parts[1]}"
+}
 
-if [[ "$skip_checks" = "no" ]]; then
-    echo "Checking for system dependencies."
-    ruby_version="$(cat "$project_dir"/.ruby-version)"
-    if ! type ruby >/dev/null 2>&1 || ! ruby -v | grep -q "$ruby_version"; then
-        echo "This codebase requires Ruby $ruby_version."
-        missing_dependency="yes"
-    fi
+ruby_full_version="$(cat "$project_dir"/.ruby-version)"
+ruby_loose_version="$(loose_version "$ruby_full_version")"
 
-    if [[ "$missing_dependency" = "yes" ]]; then
-        echo "Please install missing dependencies to continue."
-        exit 1
-    fi
+if [[ "$skip_checks" == "no" ]]; then
+echo "Checking for system dependencies."
+  if ! type ruby >/dev/null 2>&1 || ! ruby -v | grep -q "$ruby_loose_version"; then
+    echo "This codebase requires Ruby $ruby_loose_version."
+    missing_dependency="yes"
+  fi
 
-    echo "All system dependencies present. Continuing."
+  if ! type bundler >/dev/null 2>&1; then
+    echo "This codebase requires Bundler."
+    missing_dependency="yes"
+  fi
+
+  if [[ "$missing_dependency" = "yes" ]]; then
+    echo "Please install missing dependencies to continue."
+    exit 1
+  fi
+
+  echo "All system dependencies present. Continuing."
 fi
 
-if [[ "$offline" = "no" ]]; then
-    echo "Installing bundler."
-    if [[ "$verbose" = "yes" ]]; then
-        gem install --no-document bundler
-    else
-        gem install --no-document bundler > /dev/null
-    fi
-
-    echo "Installing ruby dependencies."
-    if [[ "$verbose" = "yes" ]]; then
-        bundle install
-    else
-        bundle install > /dev/null
-    fi
+if [[ "$offline" == "no" ]]; then
+  echo "Installing bundler."
+  if [[ "$verbose" == "yes" ]]; then
+    gem install --no-document bundler
+  else
+    gem install --no-document bundler >/dev/null
+  fi
+
+  echo "Installing ruby dependencies."
+  if [[ "$verbose" == "yes" ]]; then
+    bundle install
+  else
+    bundle install >/dev/null
+  fi
 fi
 
 echo "Starting rake."
-if [[ "$verbose" = "yes" ]]; then
-    time bundle exec rake --verbose "$@"
+if [[ "$verbose" == "yes" ]]; then
+  time bundle exec rake --verbose "$@"
 else
-    time bundle exec rake "$@"
+  time bundle exec rake "$@"
 fi