Commit f1c0d750 authored by Lamont Granquist's avatar Lamont Granquist

Backport of changes necessary for removal of dev gems

Signed-off-by: default avatarLamont Granquist <lamont@scriptkiddie.org>
parent f2cd26c3
$:.unshift(File.dirname(__FILE__) + "/lib") $:.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" require "chef/version"
Gem::Specification.new do |s| Gem::Specification.new do |s|
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
require "chef-utils/version_string" require "chef-utils/version_string" unless defined?(ChefUtils::VersionString)
class Chef class Chef
VersionString = ChefUtils::VersionString VersionString = ChefUtils::VersionString
......
...@@ -21,4 +21,4 @@ group :development do ...@@ -21,4 +21,4 @@ group :development do
gem "test-kitchen", ">= 1.23" gem "test-kitchen", ">= 1.23"
gem "kitchen-vagrant", ">= 1.3.1" gem "kitchen-vagrant", ">= 1.3.1"
gem "winrm-fs", "~> 1.0" gem "winrm-fs", "~> 1.0"
end end
\ No newline at end of file
...@@ -18,7 +18,7 @@ GIT ...@@ -18,7 +18,7 @@ GIT
GIT GIT
remote: https://github.com/chef/omnibus-software remote: https://github.com/chef/omnibus-software
revision: 1cff56e31219e2851d2651e9b92fffd15e42bd00 revision: 05f70739fb4a14d5c117c620ba7bb24dce6fd538
branch: master branch: master
specs: specs:
omnibus-software (4.0.0) omnibus-software (4.0.0)
...@@ -64,12 +64,12 @@ GEM ...@@ -64,12 +64,12 @@ GEM
solve (~> 4.0) solve (~> 4.0)
thor (>= 0.20) thor (>= 0.20)
builder (3.2.4) builder (3.2.4)
chef (16.9.20) chef (16.9.29)
addressable addressable
bcrypt_pbkdf (= 1.1.0.rc2) bcrypt_pbkdf (= 1.1.0.rc2)
bundler (>= 1.10) bundler (>= 1.10)
chef-config (= 16.9.20) chef-config (= 16.9.29)
chef-utils (= 16.9.20) chef-utils (= 16.9.29)
chef-vault chef-vault
chef-zero (>= 14.0.11) chef-zero (>= 14.0.11)
diff-lcs (>= 1.2.4, < 1.4.0) diff-lcs (>= 1.2.4, < 1.4.0)
...@@ -100,13 +100,13 @@ GEM ...@@ -100,13 +100,13 @@ GEM
tty-prompt (~> 0.21) tty-prompt (~> 0.21)
tty-screen (~> 0.6) tty-screen (~> 0.6)
tty-table (~> 0.11) tty-table (~> 0.11)
uuidtools (~> 2.1.5) uuidtools (>= 2.1.5, < 3.0)
chef (16.9.20-universal-mingw32) chef (16.9.29-universal-mingw32)
addressable addressable
bcrypt_pbkdf (= 1.1.0.rc2) bcrypt_pbkdf (= 1.1.0.rc2)
bundler (>= 1.10) bundler (>= 1.10)
chef-config (= 16.9.20) chef-config (= 16.9.29)
chef-utils (= 16.9.20) chef-utils (= 16.9.29)
chef-vault chef-vault
chef-zero (>= 14.0.11) chef-zero (>= 14.0.11)
diff-lcs (>= 1.2.4, < 1.4.0) diff-lcs (>= 1.2.4, < 1.4.0)
...@@ -138,7 +138,7 @@ GEM ...@@ -138,7 +138,7 @@ GEM
tty-prompt (~> 0.21) tty-prompt (~> 0.21)
tty-screen (~> 0.6) tty-screen (~> 0.6)
tty-table (~> 0.11) tty-table (~> 0.11)
uuidtools (~> 2.1.5) uuidtools (>= 2.1.5, < 3.0)
win32-api (~> 1.5.3) win32-api (~> 1.5.3)
win32-certstore (~> 0.3) win32-certstore (~> 0.3)
win32-event (~> 0.6.1) win32-event (~> 0.6.1)
...@@ -150,9 +150,9 @@ GEM ...@@ -150,9 +150,9 @@ GEM
win32-taskscheduler (~> 2.0) win32-taskscheduler (~> 2.0)
wmi-lite (~> 1.0) wmi-lite (~> 1.0)
chef-cleanroom (1.0.2) chef-cleanroom (1.0.2)
chef-config (16.9.20) chef-config (16.9.29)
addressable addressable
chef-utils (= 16.9.20) chef-utils (= 16.9.29)
fuzzyurl fuzzyurl
mixlib-config (>= 2.2.12, < 4.0) mixlib-config (>= 2.2.12, < 4.0)
mixlib-shellout (>= 2.0, < 4.0) mixlib-shellout (>= 2.0, < 4.0)
...@@ -161,7 +161,7 @@ GEM ...@@ -161,7 +161,7 @@ GEM
chef-config chef-config
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
ffi-yajl (~> 2.2) ffi-yajl (~> 2.2)
chef-utils (16.9.20) chef-utils (16.9.29)
chef-vault (4.1.0) chef-vault (4.1.0)
chef-zero (15.0.4) chef-zero (15.0.4)
ffi-yajl (~> 2.2) ffi-yajl (~> 2.2)
...@@ -399,7 +399,7 @@ GEM ...@@ -399,7 +399,7 @@ GEM
tty-screen (~> 0.8) tty-screen (~> 0.8)
unicode-display_width (1.7.0) unicode-display_width (1.7.0)
unicode_utils (1.4.0) unicode_utils (1.4.0)
uuidtools (2.1.5) uuidtools (2.2.0)
webrick (1.7.0) webrick (1.7.0)
win32-api (1.5.3-universal-mingw32) win32-api (1.5.3-universal-mingw32)
win32-certstore (0.4.1) win32-certstore (0.4.1)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment