Merge pull request #29 from andrewhuynh/master

Address vulnerabilities and fix xcode check

Author: andrewhuynh

install.sh

@@ -48,8 +48,8 @@ for i in {1..3}; do
   # .dist code in Apple's SUS catalog
   touch /tmp/.com.apple.dt.CommandLineTools.installondemand.in-progress
   # find the CLI Tools update
-  OSX_VERSION=$(sw_vers -productVersion | awk -F'.' '{print $1"."$2}')
-  XCODE_PATTERN="Command Line.*${OSX_VERSION}"
+  OSX_VERSION=$(sw_vers -productVersion | awk -F'.' '{print $1""$2}')
+  XCODE_PATTERN="com.apple.pkg.CLTools_SDK_macOS${OSX_VERSION}"
   XCODE_INSTALLER=$(softwareupdate -l |
     grep "\*.*${XCODE_PATTERN}" |
     head -n 1 |

omnibus/Gemfile.lock

@@ -82,10 +82,10 @@ GEM
     coderay (1.1.1)
     diff-lcs (1.3)
     docker-api (1.33.2)
-      excon (>= 0.38.0)
+      excon (>= 0.71.0)
       json
     erubis (2.7.0)
-    excon (0.54.0)
+    excon (>= 0.71.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     ffi (>= 1.9.24)
@@ -117,7 +117,7 @@ GEM
       train (>= 0.22.0, < 1.0)
     ipaddress (0.8.3)
     jmespath (1.3.1)
-    json (2.0.3)
+    json (2.3.0)
     kitchen-inspec (0.17.0)
       hashie (~> 3.4)
       inspec (>= 0.34.0, < 2.0.0)

workup.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '~> 1.12'
-  spec.add_development_dependency 'rake', '~> 11.2'
+  spec.add_development_dependency 'rake', '>= 12.3.3'
   spec.add_development_dependency 'rubocop', '~> 0.49.0'
   spec.add_development_dependency 'rspec', '~> 3.0'