diff options
| author | John Keiser <john@johnkeiser.com> | 2016-01-12 16:34:38 -0800 |
|---|---|---|
| committer | John Keiser <john@johnkeiser.com> | 2016-01-13 09:23:07 -0800 |
| commit | b698c86bff0d031574e610a8c6e5243d9e5aeac7 (patch) | |
| tree | ae332fd259686bcda95b24684fb35e776f84fd93 | |
| parent | 6d9c8b03466632b3cd11042a2b99a08ae5047309 (diff) | |
| download | chef-b698c86bff0d031574e610a8c6e5243d9e5aeac7.tar.gz | |
Restore backcompat include for external libraries that reference root directories directly
| -rw-r--r-- | chef.gemspec | 4 | ||||
| -rw-r--r-- | lib-backcompat/chef/chef_fs/file_system/chef_repository_file_system_root_dir.rb | 5 | ||||
| -rw-r--r-- | lib-backcompat/chef/chef_fs/file_system/chef_server_root_dir.rb | 5 |
3 files changed, 12 insertions, 2 deletions
diff --git a/chef.gemspec b/chef.gemspec index 5200f7cf3e..359e002189 100644 --- a/chef.gemspec +++ b/chef.gemspec @@ -54,6 +54,6 @@ Gem::Specification.new do |s| s.bindir = "bin" s.executables = %w( chef-client chef-solo knife chef-shell chef-apply ) - s.require_path = 'lib' - s.files = %w(Gemfile Rakefile LICENSE README.md CONTRIBUTING.md) + Dir.glob("{distro,lib,tasks,spec}/**/*", File::FNM_DOTMATCH).reject {|f| File.directory?(f) } + Dir.glob("*.gemspec") + s.require_path = %w( lib lib-backcompat ) + s.files = %w(Gemfile Rakefile LICENSE README.md CONTRIBUTING.md) + Dir.glob("{distro,lib,lib-backcompat,tasks,spec}/**/*", File::FNM_DOTMATCH).reject {|f| File.directory?(f) } + Dir.glob("*.gemspec") end diff --git a/lib-backcompat/chef/chef_fs/file_system/chef_repository_file_system_root_dir.rb b/lib-backcompat/chef/chef_fs/file_system/chef_repository_file_system_root_dir.rb new file mode 100644 index 0000000000..88ede9c692 --- /dev/null +++ b/lib-backcompat/chef/chef_fs/file_system/chef_repository_file_system_root_dir.rb @@ -0,0 +1,5 @@ +require 'chef/chef_fs/file_system/repository/chef_repository_file_system_root_dir' + +module Chef::ChefFS::FileSystem + ChefRepositoryFileSystemRootDir = Repository::ChefRepositoryFileSystemRootDir +end diff --git a/lib-backcompat/chef/chef_fs/file_system/chef_server_root_dir.rb b/lib-backcompat/chef/chef_fs/file_system/chef_server_root_dir.rb new file mode 100644 index 0000000000..c475057e7a --- /dev/null +++ b/lib-backcompat/chef/chef_fs/file_system/chef_server_root_dir.rb @@ -0,0 +1,5 @@ +require 'chef/chef_fs/file_system/chef_server/chef_server_root_dir' + +module Chef::ChefFS::FileSystem + ChefServerRootDir = ChefServer::ChefServerRootDir +end |