Move server and repository fs objects to their own directories

1 files changed, 84 insertions, 0 deletions

diff --git a/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbooks_dir.rb b/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbooks_dir.rb
new file mode 100644
index 0000000000..5c88aa2aa1
--- /dev/null
+++ b/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbooks_dir.rb
@@ -0,0 +1,84 @@
+#
+# Author:: John Keiser (<jkeiser@opscode.com>)
+# Copyright:: Copyright (c) 2013 Opscode, 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/chef_repository_file_system_entry'
+require 'chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_dir'
+require 'chef/cookbook/chefignore'
+
+class Chef
+  module ChefFS
+    module FileSystem
+      module Repository
+        class ChefRepositoryFileSystemCookbooksDir < ChefRepositoryFileSystemEntry
+          def initialize(name, parent, file_path)
+            super(name, parent, file_path)
+            begin
+              @chefignore = Chef::Cookbook::Chefignore.new(self.file_path)
+            rescue Errno::EISDIR
+            rescue Errno::EACCES
+              # Work around a bug in Chefignore when chefignore is a directory
+            end
+          end
+
+          attr_reader :chefignore
+
+          def children
+            super.select do |entry|
+              # empty cookbooks and cookbook directories are ignored
+              if !entry.can_upload?
+                Chef::Log.warn("Cookbook '#{entry.name}' is empty or entirely chefignored at #{entry.path_for_printing}")
+                false
+              else
+                true
+              end
+            end
+          end
+
+          def can_have_child?(name, is_dir)
+            is_dir && !name.start_with?('.')
+          end
+
+          def write_cookbook(cookbook_path, cookbook_version_json, from_fs)
+            cookbook_name = File.basename(cookbook_path)
+            child = make_child_entry(cookbook_name)
+
+            # Use the copy/diff algorithm to copy it down so we don't destroy
+            # chefignored data.  This is terribly un-thread-safe.
+            Chef::ChefFS::FileSystem.copy_to(Chef::ChefFS::FilePattern.new("/#{cookbook_path}"), from_fs, child, nil, {:purge => true})
+
+            # Write out .uploaded-cookbook-version.json
+            cookbook_file_path = File.join(file_path, cookbook_name)
+            if !File.exists?(cookbook_file_path)
+              FileUtils.mkdir_p(cookbook_file_path)
+            end
+            uploaded_cookbook_version_path = File.join(cookbook_file_path, Chef::Cookbook::CookbookVersionLoader::UPLOADED_COOKBOOK_VERSION_FILE)
+            File.open(uploaded_cookbook_version_path, 'w') do |file|
+              file.write(cookbook_version_json)
+            end
+          end
+
+          protected
+
+          def make_child_entry(child_name)
+            ChefRepositoryFileSystemCookbookDir.new(child_name, self)
+          end
+        end
+      end
+    end
+  end
+end