Merge pull request #7332 from chef/lcg/inspec-core-ffi-and-bump

Use inspec-core, new ffi gem, and bump deps

5 files changed, 19 insertions, 129 deletions

diff --git a/Gemfile b/Gemfile
index 527199f80f..a6fe2d24ae 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,14 +11,9 @@ gem "chef-config", path: File.expand_path("../chef-config", __FILE__) if File.ex
 gem "cheffish", "~> 14"
 
 group(:omnibus_package) do
-  # override for unf_ext for inspec 2 until
-  # https://github.com/knu/ruby-unf_ext/pull/39
-  # is merged and released
-  gem "unf_ext", "=0.0.7.6", :git => "https://github.com/jquick/ruby-unf_ext.git"
-
   gem "appbundler"
   gem "rb-readline"
-  gem "inspec", "~> 2"
+  gem "inspec-core", "~> 2"
   gem "chef-vault"
 end
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 17826e8f5a..7c67a50718 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,17 +1,11 @@
 GIT
   remote: https://github.com/chef/chefstyle.git
-  revision: 297373563c6177a90c2f5f07cb2a68f31a57dc2b
+  revision: fac2105b132fddc5f671411b2b5f1cba7a2307c3
   branch: master
   specs:
     chefstyle (0.10.0)
       rubocop (= 0.55.0)
 
-GIT
-  remote: https://github.com/jquick/ruby-unf_ext.git
-  revision: c0b3bd922214a172976f6f368c0b4e4fbf91ed78
-  specs:
-    unf_ext (0.0.7.6)
-
 PATH
   remote: .
   specs:
@@ -22,7 +16,7 @@ PATH
       chef-zero (>= 13.0)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
-      ffi (< 1.9.22)
+      ffi (~> 1.9, >= 1.9.25)
       ffi-yajl (~> 2.2)
       highline (~> 1.6, >= 1.6.9)
       iniparse (~> 1.4)
@@ -53,7 +47,7 @@ PATH
       chef-zero (>= 13.0)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
-      ffi (< 1.9.22)
+      ffi (~> 1.9, >= 1.9.25)
       ffi-yajl (~> 2.2)
       highline (~> 1.6, >= 1.6.9)
       iniparse (~> 1.4)
@@ -107,16 +101,6 @@ GEM
       mixlib-cli (~> 1.4)
       mixlib-shellout (~> 2.0)
     ast (2.4.0)
-    aws-sdk (2.11.50)
-      aws-sdk-resources (= 2.11.50)
-    aws-sdk-core (2.11.50)
-      aws-sigv4 (~> 1.0)
-      jmespath (~> 1.0)
-    aws-sdk-resources (2.11.50)
-      aws-sdk-core (= 2.11.50)
-    aws-sigv4 (1.0.2)
-    azure_mgmt_resources (0.16.0)
-      ms_rest_azure (~> 0.10.0)
     backports (3.11.3)
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
@@ -133,31 +117,21 @@ GEM
       chef-zero (~> 14.0)
       net-ssh
     coderay (1.1.2)
-    concurrent-ruby (1.0.5)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     debug_inspector (0.0.3)
     diff-lcs (1.3)
-    docile (1.3.0)
-    docker-api (1.34.2)
-      excon (>= 0.47.0)
-      multi_json
-    domain_name (0.5.20180417)
-      unf (>= 0.0.5, < 1.0.0)
+    docile (1.3.1)
     erubis (2.7.0)
     ethon (0.11.0)
       ffi (>= 1.3.0)
-    excon (0.62.0)
-    faraday (0.15.1)
+    faraday (0.15.2)
       multipart-post (>= 1.2, < 3)
-    faraday-cookie_jar (0.0.6)
-      faraday (>= 0.7.4)
-      http-cookie (~> 1.0.0)
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
-    ffi (1.9.21)
-    ffi (1.9.21-x64-mingw32)
-    ffi (1.9.21-x86-mingw32)
+    ffi (1.9.25)
+    ffi (1.9.25-x64-mingw32)
+    ffi (1.9.25-x86-mingw32)
     ffi-win32-extensions (1.0.3)
       ffi
     ffi-yajl (2.3.1)
@@ -170,20 +144,12 @@ GEM
       multi_json (~> 1.0)
       net-http-persistent (~> 2.9)
       net-http-pipeline
-    gssapi (1.2.0)
-      ffi (>= 1.0.1)
-    gyoku (1.3.1)
-      builder (>= 2.1.2)
     hashdiff (0.3.7)
     hashie (3.5.7)
     highline (1.7.10)
     htmlentities (4.3.4)
-    http-cookie (1.0.3)
-      domain_name (~> 0.5)
-    httpclient (2.8.3)
-    inifile (3.0.0)
     iniparse (1.4.4)
-    inspec (2.1.67)
+    inspec-core (2.1.84)
       addressable (~> 2.4)
       faraday (>= 0.9.0)
       hashie (~> 3.4)
@@ -201,18 +167,13 @@ GEM
       sslshake (~> 1.2)
       thor (~> 0.20)
       tomlrb (~> 1.2)
-      train (~> 1.4)
+      train-core (~> 1.4)
     ipaddress (0.8.3)
     iso8601 (0.9.1)
-    jmespath (1.4.0)
     json (2.1.0)
     launchy (2.4.3)
       addressable (~> 2.3)
     libyajl2 (1.2.0)
-    little-plugger (1.1.4)
-    logging (2.2.2)
-      little-plugger (~> 1.1)
-      multi_json (~> 1.10)
     method_source (0.9.0)
     mixlib-archive (0.4.6)
       mixlib-log
@@ -225,15 +186,6 @@ GEM
     mixlib-shellout (2.3.2-universal-mingw32)
       win32-process (~> 0.8.2)
       wmi-lite (~> 1.0)
-    ms_rest (0.7.2)
-      concurrent-ruby (~> 1.0)
-      faraday (~> 0.9)
-      timeliness (~> 0.3)
-    ms_rest_azure (0.10.6)
-      concurrent-ruby (~> 1.0)
-      faraday (~> 0.9)
-      faraday-cookie_jar (~> 0.0.6)
-      ms_rest (~> 0.7.2)
     multi_json (1.13.1)
     multipart-post (2.0.0)
     net-http-persistent (2.9.4)
@@ -250,7 +202,6 @@ GEM
       net-ssh-gateway (>= 1.2.0)
     net-telnet (0.1.1)
     netrc (0.11.0)
-    nori (2.6.0)
     octokit (4.9.0)
       sawyer (~> 0.8.0, >= 0.5.3)
     ohai (14.1.3)
@@ -320,7 +271,6 @@ GEM
     ruby-prof (0.17.0)
     ruby-progressbar (1.9.0)
     ruby-shadow (2.5.0)
-    rubyntlm (0.6.2)
     rubyzip (1.2.1)
     safe_yaml (1.0.4)
     sawyer (0.8.1)
@@ -349,19 +299,10 @@ GEM
     syslog-logger (1.6.8)
     systemu (2.6.5)
     thor (0.20.0)
-    timeliness (0.3.8)
     tomlrb (1.2.6)
-    train (1.4.4)
-      aws-sdk (~> 2)
-      azure_mgmt_resources (~> 0.15)
-      docker-api (~> 1.26)
-      inifile
+    train-core (1.4.11)
       json (>= 1.8, < 3.0)
       mixlib-shellout (~> 2.0)
-      net-scp (~> 1.2)
-      net-ssh (>= 2.9, < 5.0)
-      winrm (~> 2.0)
-      winrm-fs (~> 1.0)
     travis (1.8.8)
       backports
       faraday (~> 0.9)
@@ -373,15 +314,13 @@ GEM
       typhoeus (~> 0.6, >= 0.6.8)
     typhoeus (0.8.0)
       ethon (>= 0.8.0)
-    unf (0.1.4)
-      unf_ext
-    unicode-display_width (1.3.2)
+    unicode-display_width (1.3.3)
     uuidtools (2.1.5)
-    webmock (3.4.1)
+    webmock (3.4.2)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
-    websocket (1.2.5)
+    websocket (1.2.8)
     win32-api (1.5.3-universal-mingw32)
     win32-dir (0.5.1)
       ffi (>= 1.0.0)
@@ -405,22 +344,8 @@ GEM
       structured_warnings
     windows-api (0.4.4)
       win32-api (>= 1.4.5)
-    winrm (2.2.3)
-      builder (>= 2.1.2)
-      erubis (~> 2.7)
-      gssapi (~> 1.2)
-      gyoku (~> 1.0)
-      httpclient (~> 2.2, >= 2.2.0.2)
-      logging (>= 1.6.1, < 3.0)
-      nori (~> 2.0)
-      rubyntlm (~> 0.6.0, >= 0.6.1)
-    winrm-fs (1.2.0)
-      erubis (~> 2.7)
-      logging (>= 1.6.1, < 3.0)
-      rubyzip (~> 1.1)
-      winrm (~> 2.0)
     wmi-lite (1.0.0)
-    yard (0.9.12)
+    yard (0.9.14)
 
 PLATFORMS
   ruby
@@ -434,7 +359,7 @@ DEPENDENCIES
   chef-vault
   cheffish (~> 14)
   chefstyle!
-  inspec (~> 2)
+  inspec-core (~> 2)
   netrc
   octokit
   pry
@@ -448,7 +373,6 @@ DEPENDENCIES
   simplecov
   tomlrb
   travis
-  unf_ext (= 0.0.7.6)!
   webmock
   yard
 
diff --git a/chef.gemspec b/chef.gemspec
index dc64f73ae9..425dcf5f53 100644
--- a/chef.gemspec
+++ b/chef.gemspec
@@ -24,8 +24,7 @@ Gem::Specification.new do |s|
   s.add_dependency "mixlib-archive", "~> 0.4"
   s.add_dependency "ohai", "~> 14.0"
 
-  # ffi 1.9.22+1.9.23 are buggy in our spec/unit/application/client_spec.rb tests on el6/el7
-  s.add_dependency "ffi", "< 1.9.22"
+  s.add_dependency "ffi", "~> 1.9", ">= 1.9.25"
   s.add_dependency "ffi-yajl", "~> 2.2"
   s.add_dependency "net-ssh", "~> 4.2"
   s.add_dependency "net-ssh-multi", "~> 1.2", ">= 1.2.1"
diff --git a/omnibus/config/projects/chef.rb b/omnibus/config/projects/chef.rb
index 10032b44a4..117dcec94c 100644
--- a/omnibus/config/projects/chef.rb
+++ b/omnibus/config/projects/chef.rb
@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2017, Chef Software Inc.
+# Copyright 2012-2018, Chef Software Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -47,11 +47,6 @@ instance_eval(IO.read(overrides_path), overrides_path)
 
 dependency "preparation"
 
-# InSpec 2 depends on unf_ext, which doesn't currently build on solaris on aix. There exists a fork
-# of unf_ext which fixes this, so let's use that in Chef for now.
-# FIXME: must remove this ASAP.
-dependency "unf_ext"
-
 dependency "chef"
 
 #
diff --git a/omnibus/config/software/unf_ext.rb b/omnibus/config/software/unf_ext.rb
deleted file mode 100644
index 269fa933b7..0000000000
--- a/omnibus/config/software/unf_ext.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-# encoding: utf-8
-# override for unf_ext until
-# https://github.com/knu/ruby-unf_ext/pull/39
-# is merged and released
-
-name "unf_ext"
-
-dependency "ruby"
-dependency "rubygems"
-dependency "bundler"
-dependency "appbundler"
-
-license :project_license
-default_version "c0b3bd922214a172976f6f368c0b4e4fbf91ed78"
-source git: "https://github.com/jquick/ruby-unf_ext.git"
-skip_transitive_dependency_licensing true
-
-build do
-  env = with_standard_compiler_flags(with_embedded_path)
-  delete "#{name}-*.gem"
-  gem "build #{name}.gemspec", env: env
-  gem "install #{name}-*.gem --no-document", env: env
-end