diff options
20 files changed, 3 insertions, 267 deletions
diff --git a/lib-backcompat/chef/chef_fs/file_system/acl_entry.rb b/lib-backcompat/chef/chef_fs/file_system/acl_entry.rb deleted file mode 100644 index f28b9f86e3..0000000000 --- a/lib-backcompat/chef/chef_fs/file_system/acl_entry.rb +++ /dev/null @@ -1,5 +0,0 @@ -require "chef/chef_fs/file_system/chef_server/acl_entry" - -module Chef::ChefFS::FileSystem - AclEntry = ChefServer::AclEntry -end diff --git a/lib-backcompat/chef/chef_fs/file_system/already_exists_error.rb b/lib-backcompat/chef/chef_fs/file_system/already_exists_error.rb deleted file mode 100644 index 75cebe5497..0000000000 --- a/lib-backcompat/chef/chef_fs/file_system/already_exists_error.rb +++ /dev/null @@ -1,20 +0,0 @@ -# -# Author:: John Keiser (<jkeiser@chef.io>) -# Copyright:: Copyright 2012-2016, Chef Software Inc. -# License:: Apache License, Version 2.0 -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -require "chef/chef_fs/file_system/exceptions" -Chef.deprecated :internal_api, "Individual ChefFS error files are deprecated. Please require 'chef/chef_fs/file_system/exceptions' rather than 'chef/chef_fs/file_system/#{File.basename(__FILE__, ".rb")}'." 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 deleted file mode 100644 index 123fb9ee9a..0000000000 --- a/lib-backcompat/chef/chef_fs/file_system/chef_repository_file_system_root_dir.rb +++ /dev/null @@ -1,5 +0,0 @@ -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 deleted file mode 100644 index acb81dd08a..0000000000 --- a/lib-backcompat/chef/chef_fs/file_system/chef_server_root_dir.rb +++ /dev/null @@ -1,5 +0,0 @@ -require "chef/chef_fs/file_system/chef_server/chef_server_root_dir" - -module Chef::ChefFS::FileSystem - ChefServerRootDir = ChefServer::ChefServerRootDir -end diff --git a/lib-backcompat/chef/chef_fs/file_system/cookbook_frozen_error.rb b/lib-backcompat/chef/chef_fs/file_system/cookbook_frozen_error.rb deleted file mode 100644 index 75cebe5497..0000000000 --- a/lib-backcompat/chef/chef_fs/file_system/cookbook_frozen_error.rb +++ /dev/null @@ -1,20 +0,0 @@ -# -# Author:: John Keiser (<jkeiser@chef.io>) -# Copyright:: Copyright 2012-2016, Chef Software Inc. -# License:: Apache License, Version 2.0 -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -require "chef/chef_fs/file_system/exceptions" -Chef.deprecated :internal_api, "Individual ChefFS error files are deprecated. Please require 'chef/chef_fs/file_system/exceptions' rather than 'chef/chef_fs/file_system/#{File.basename(__FILE__, ".rb")}'." diff --git a/lib-backcompat/chef/chef_fs/file_system/default_environment_cannot_be_modified_error.rb b/lib-backcompat/chef/chef_fs/file_system/default_environment_cannot_be_modified_error.rb deleted file mode 100644 index 75cebe5497..0000000000 --- a/lib-backcompat/chef/chef_fs/file_system/default_environment_cannot_be_modified_error.rb +++ /dev/null @@ -1,20 +0,0 @@ -# -# Author:: John Keiser (<jkeiser@chef.io>) -# Copyright:: Copyright 2012-2016, Chef Software Inc. -# License:: Apache License, Version 2.0 -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -require "chef/chef_fs/file_system/exceptions" -Chef.deprecated :internal_api, "Individual ChefFS error files are deprecated. Please require 'chef/chef_fs/file_system/exceptions' rather than 'chef/chef_fs/file_system/#{File.basename(__FILE__, ".rb")}'." diff --git a/lib-backcompat/chef/chef_fs/file_system/file_system_error.rb b/lib-backcompat/chef/chef_fs/file_system/file_system_error.rb deleted file mode 100644 index 75cebe5497..0000000000 --- a/lib-backcompat/chef/chef_fs/file_system/file_system_error.rb +++ /dev/null @@ -1,20 +0,0 @@ -# -# Author:: John Keiser (<jkeiser@chef.io>) -# Copyright:: Copyright 2012-2016, Chef Software Inc. -# License:: Apache License, Version 2.0 -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -require "chef/chef_fs/file_system/exceptions" -Chef.deprecated :internal_api, "Individual ChefFS error files are deprecated. Please require 'chef/chef_fs/file_system/exceptions' rather than 'chef/chef_fs/file_system/#{File.basename(__FILE__, ".rb")}'." diff --git a/lib-backcompat/chef/chef_fs/file_system/must_delete_recursively_error.rb b/lib-backcompat/chef/chef_fs/file_system/must_delete_recursively_error.rb deleted file mode 100644 index 75cebe5497..0000000000 --- a/lib-backcompat/chef/chef_fs/file_system/must_delete_recursively_error.rb +++ /dev/null @@ -1,20 +0,0 @@ -# -# Author:: John Keiser (<jkeiser@chef.io>) -# Copyright:: Copyright 2012-2016, Chef Software Inc. -# License:: Apache License, Version 2.0 -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -require "chef/chef_fs/file_system/exceptions" -Chef.deprecated :internal_api, "Individual ChefFS error files are deprecated. Please require 'chef/chef_fs/file_system/exceptions' rather than 'chef/chef_fs/file_system/#{File.basename(__FILE__, ".rb")}'." diff --git a/lib-backcompat/chef/chef_fs/file_system/not_found_error.rb b/lib-backcompat/chef/chef_fs/file_system/not_found_error.rb deleted file mode 100644 index 75cebe5497..0000000000 --- a/lib-backcompat/chef/chef_fs/file_system/not_found_error.rb +++ /dev/null @@ -1,20 +0,0 @@ -# -# Author:: John Keiser (<jkeiser@chef.io>) -# Copyright:: Copyright 2012-2016, Chef Software Inc. -# License:: Apache License, Version 2.0 -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -require "chef/chef_fs/file_system/exceptions" -Chef.deprecated :internal_api, "Individual ChefFS error files are deprecated. Please require 'chef/chef_fs/file_system/exceptions' rather than 'chef/chef_fs/file_system/#{File.basename(__FILE__, ".rb")}'." diff --git a/lib-backcompat/chef/chef_fs/file_system/operation_failed_error.rb b/lib-backcompat/chef/chef_fs/file_system/operation_failed_error.rb deleted file mode 100644 index 75cebe5497..0000000000 --- a/lib-backcompat/chef/chef_fs/file_system/operation_failed_error.rb +++ /dev/null @@ -1,20 +0,0 @@ -# -# Author:: John Keiser (<jkeiser@chef.io>) -# Copyright:: Copyright 2012-2016, Chef Software Inc. -# License:: Apache License, Version 2.0 -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -require "chef/chef_fs/file_system/exceptions" -Chef.deprecated :internal_api, "Individual ChefFS error files are deprecated. Please require 'chef/chef_fs/file_system/exceptions' rather than 'chef/chef_fs/file_system/#{File.basename(__FILE__, ".rb")}'." diff --git a/lib-backcompat/chef/chef_fs/file_system/operation_not_allowed_error.rb b/lib-backcompat/chef/chef_fs/file_system/operation_not_allowed_error.rb deleted file mode 100644 index 75cebe5497..0000000000 --- a/lib-backcompat/chef/chef_fs/file_system/operation_not_allowed_error.rb +++ /dev/null @@ -1,20 +0,0 @@ -# -# Author:: John Keiser (<jkeiser@chef.io>) -# Copyright:: Copyright 2012-2016, Chef Software Inc. -# License:: Apache License, Version 2.0 -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -require "chef/chef_fs/file_system/exceptions" -Chef.deprecated :internal_api, "Individual ChefFS error files are deprecated. Please require 'chef/chef_fs/file_system/exceptions' rather than 'chef/chef_fs/file_system/#{File.basename(__FILE__, ".rb")}'." diff --git a/lib-backcompat/chef/chef_fs/file_system/repository/chef_repository_file_system_acls_dir.rb b/lib-backcompat/chef/chef_fs/file_system/repository/chef_repository_file_system_acls_dir.rb deleted file mode 100644 index d9bdbc104c..0000000000 --- a/lib-backcompat/chef/chef_fs/file_system/repository/chef_repository_file_system_acls_dir.rb +++ /dev/null @@ -1,5 +0,0 @@ -require "chef/chef_fs/file_system/repository/acls_dir" - -module Chef::ChefFS::FileSystem::Repository - ChefRepositoryFileSystemAclsDir = AclsDir -end diff --git a/lib-backcompat/chef/chef_fs/file_system/repository/chef_repository_file_system_client_keys_dir.rb b/lib-backcompat/chef/chef_fs/file_system/repository/chef_repository_file_system_client_keys_dir.rb deleted file mode 100644 index 4ebcb5f010..0000000000 --- a/lib-backcompat/chef/chef_fs/file_system/repository/chef_repository_file_system_client_keys_dir.rb +++ /dev/null @@ -1,5 +0,0 @@ -require "chef/chef_fs/file_system/repository/client_keys_dir" - -module Chef::ChefFS::FileSystem::Repository - ChefRepositoryFileSystemClientKeysDir = ClientKeysDir -end diff --git a/lib-backcompat/chef/chef_fs/file_system/repository/chef_repository_file_system_entry.rb b/lib-backcompat/chef/chef_fs/file_system/repository/chef_repository_file_system_entry.rb deleted file mode 100644 index 7668c6b174..0000000000 --- a/lib-backcompat/chef/chef_fs/file_system/repository/chef_repository_file_system_entry.rb +++ /dev/null @@ -1,6 +0,0 @@ -require "chef/chef_fs/file_system/repository/file_system_entry" - -module Chef::ChefFS::FileSystem::Repository - Chef.deprecated :internal_api, "Chef::ChefFS::FileSystem::Repository::ChefRepositoryFileSystemEntry is deprecated. Please use FileSystemEntry directly" - ChefRepositoryFileSystemEntry = FileSystemEntry -end diff --git a/lib-backcompat/chef/chef_fs/file_system/repository/chef_repository_file_system_policies_dir.rb b/lib-backcompat/chef/chef_fs/file_system/repository/chef_repository_file_system_policies_dir.rb deleted file mode 100644 index 393e4aa85d..0000000000 --- a/lib-backcompat/chef/chef_fs/file_system/repository/chef_repository_file_system_policies_dir.rb +++ /dev/null @@ -1,5 +0,0 @@ -require "chef/chef_fs/file_system/repository/policies_dir" - -module Chef::ChefFS::FileSystem::Repository - ChefRepositoryFileSystemPoliciesDir = PoliciesDir -end diff --git a/lib-backcompat/chef/chef_fs/file_system/repository/file_system_root_dir.rb b/lib-backcompat/chef/chef_fs/file_system/repository/file_system_root_dir.rb deleted file mode 100644 index 1c8bb87d72..0000000000 --- a/lib-backcompat/chef/chef_fs/file_system/repository/file_system_root_dir.rb +++ /dev/null @@ -1,34 +0,0 @@ -# -# Author:: John Keiser (<jkeiser@chef.io>) -# Copyright:: Copyright 2012-2016, Chef Software Inc. -# License:: Apache License, Version 2.0 -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -require "chef/chef_fs/file_system/repository/file_system_entry" - -class Chef - module ChefFS - module FileSystem - module Repository - class FileSystemRootDir < FileSystemEntry - def initialize(file_path) - Chef.deprecated :internal_api, "Chef::ChefFS::FileSystem::Repository::FileSystemRootDir is deprecated." - super("", nil, file_path) - end - end - end - end - end -end diff --git a/lib/chef/knife/edit.rb b/lib/chef/knife/edit.rb index 8489e4e179..46903e7420 100644 --- a/lib/chef/knife/edit.rb +++ b/lib/chef/knife/edit.rb @@ -9,7 +9,7 @@ class Chef deps do require "chef/chef_fs/file_system" - require "chef/chef_fs/file_system/not_found_error" + require "chef/chef_fs/file_system/exceptions" end option :local, diff --git a/lib/chef/knife/xargs.rb b/lib/chef/knife/xargs.rb index 6559ca2e74..7f436d7936 100644 --- a/lib/chef/knife/xargs.rb +++ b/lib/chef/knife/xargs.rb @@ -9,7 +9,7 @@ class Chef deps do require "chef/chef_fs/file_system" - require "chef/chef_fs/file_system/not_found_error" + require "chef/chef_fs/file_system/exceptions" end # TODO modify to remote-only / local-only pattern (more like delete) diff --git a/spec/unit/chef_fs/file_system/operation_failed_error_spec.rb b/spec/unit/chef_fs/file_system/operation_failed_error_spec.rb index 7f3eb6efe2..acdbe35c45 100644 --- a/spec/unit/chef_fs/file_system/operation_failed_error_spec.rb +++ b/spec/unit/chef_fs/file_system/operation_failed_error_spec.rb @@ -17,7 +17,7 @@ # require "spec_helper" -require "chef/chef_fs/file_system/operation_failed_error" +require "chef/chef_fs/file_system/exceptions" describe Chef::ChefFS::FileSystem::OperationFailedError do context "message" do diff --git a/spec/unit/lib_backcompat_spec.rb b/spec/unit/lib_backcompat_spec.rb deleted file mode 100644 index c7dfee5bcd..0000000000 --- a/spec/unit/lib_backcompat_spec.rb +++ /dev/null @@ -1,34 +0,0 @@ -# -# Author:: Adam Jacob (<adam@chef.io>) -# Copyright:: Copyright 2008-2016, Chef Software Inc. -# License:: Apache License, Version 2.0 -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -require "spec_helper" - -describe "lib-backcompat" do - it "require 'chef/chef_fs/file_system/chef_server_root_dir' yields the proper class" do - require "chef/chef_fs/file_system/chef_server_root_dir" - expect(Chef::ChefFS::FileSystem::ChefServerRootDir).to eq(Chef::ChefFS::FileSystem::ChefServer::ChefServerRootDir) - end - it "require 'chef/chef_fs/file_system/chef_repository_file_system_root_dir' yields the proper class" do - require "chef/chef_fs/file_system/chef_repository_file_system_root_dir" - expect(Chef::ChefFS::FileSystem::ChefRepositoryFileSystemRootDir).to eq(Chef::ChefFS::FileSystem::Repository::ChefRepositoryFileSystemRootDir) - end - it "require 'chef/chef_fs/file_system/acl_entry' yields the proper class" do - require "chef/chef_fs/file_system/acl_entry" - expect(Chef::ChefFS::FileSystem::AclEntry).to eq(Chef::ChefFS::FileSystem::ChefServer::AclEntry) - end -end |