Backport of changes necessary for removal of dev gemslcg/backport-dev-gem-removal

Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>

4 files changed, 24 insertions, 15 deletions

diff --git a/chef.gemspec b/chef.gemspec
index 8aae76615a..c471646df4 100644
--- a/chef.gemspec
+++ b/chef.gemspec
@@ -1,4 +1,13 @@
 $:.unshift(File.dirname(__FILE__) + "/lib")
+vs_path = File.expand_path("chef-utils/lib/chef-utils/version_string.rb", __dir__)
+
+if File.exist?(vs_path)
+  # this is the moral equivalent of a require_relative since bundler makes require_relative here fail hard
+  eval(IO.read(vs_path))
+else
+  # if the path doesn't exist then we're just in the wild gem and not in the git repo
+  require "chef-utils/version_string"
+end
 require "chef/version"
 
 Gem::Specification.new do |s|
diff --git a/lib/chef/version_string.rb b/lib/chef/version_string.rb
index 8da5df570a..c98d4c9a75 100644
--- a/lib/chef/version_string.rb
+++ b/lib/chef/version_string.rb
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "chef-utils/version_string"
+require "chef-utils/version_string" unless defined?(ChefUtils::VersionString)
 
 class Chef
   VersionString = ChefUtils::VersionString
diff --git a/omnibus/Gemfile b/omnibus/Gemfile
index df94943a3d..232d6b6551 100644
--- a/omnibus/Gemfile
+++ b/omnibus/Gemfile
@@ -21,4 +21,4 @@ group :development do
   gem "test-kitchen", ">= 1.23"
   gem "kitchen-vagrant", ">= 1.3.1"
   gem "winrm-fs", "~> 1.0"
-end
\ No newline at end of file
+end
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 52939848ab..7d0019534c 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -18,7 +18,7 @@ GIT
 
 GIT
   remote: https://github.com/chef/omnibus-software
-  revision: 1cff56e31219e2851d2651e9b92fffd15e42bd00
+  revision: 05f70739fb4a14d5c117c620ba7bb24dce6fd538
   branch: master
   specs:
     omnibus-software (4.0.0)
@@ -64,12 +64,12 @@ GEM
       solve (~> 4.0)
       thor (>= 0.20)
     builder (3.2.4)
-    chef (16.9.20)
+    chef (16.9.29)
       addressable
       bcrypt_pbkdf (= 1.1.0.rc2)
       bundler (>= 1.10)
-      chef-config (= 16.9.20)
-      chef-utils (= 16.9.20)
+      chef-config (= 16.9.29)
+      chef-utils (= 16.9.29)
       chef-vault
       chef-zero (>= 14.0.11)
       diff-lcs (>= 1.2.4, < 1.4.0)
@@ -100,13 +100,13 @@ GEM
       tty-prompt (~> 0.21)
       tty-screen (~> 0.6)
       tty-table (~> 0.11)
-      uuidtools (~> 2.1.5)
-    chef (16.9.20-universal-mingw32)
+      uuidtools (>= 2.1.5, < 3.0)
+    chef (16.9.29-universal-mingw32)
       addressable
       bcrypt_pbkdf (= 1.1.0.rc2)
       bundler (>= 1.10)
-      chef-config (= 16.9.20)
-      chef-utils (= 16.9.20)
+      chef-config (= 16.9.29)
+      chef-utils (= 16.9.29)
       chef-vault
       chef-zero (>= 14.0.11)
       diff-lcs (>= 1.2.4, < 1.4.0)
@@ -138,7 +138,7 @@ GEM
       tty-prompt (~> 0.21)
       tty-screen (~> 0.6)
       tty-table (~> 0.11)
-      uuidtools (~> 2.1.5)
+      uuidtools (>= 2.1.5, < 3.0)
       win32-api (~> 1.5.3)
       win32-certstore (~> 0.3)
       win32-event (~> 0.6.1)
@@ -150,9 +150,9 @@ GEM
       win32-taskscheduler (~> 2.0)
       wmi-lite (~> 1.0)
     chef-cleanroom (1.0.2)
-    chef-config (16.9.20)
+    chef-config (16.9.29)
       addressable
-      chef-utils (= 16.9.20)
+      chef-utils (= 16.9.29)
       fuzzyurl
       mixlib-config (>= 2.2.12, < 4.0)
       mixlib-shellout (>= 2.0, < 4.0)
@@ -161,7 +161,7 @@ GEM
       chef-config
       concurrent-ruby (~> 1.0)
       ffi-yajl (~> 2.2)
-    chef-utils (16.9.20)
+    chef-utils (16.9.29)
     chef-vault (4.1.0)
     chef-zero (15.0.4)
       ffi-yajl (~> 2.2)
@@ -399,7 +399,7 @@ GEM
       tty-screen (~> 0.8)
     unicode-display_width (1.7.0)
     unicode_utils (1.4.0)
-    uuidtools (2.1.5)
+    uuidtools (2.2.0)
     webrick (1.7.0)
     win32-api (1.5.3-universal-mingw32)
     win32-certstore (0.4.1)