diff options
author | danielsdeleo <dan@chef.io> | 2016-02-05 16:37:03 -0800 |
---|---|---|
committer | danielsdeleo <dan@chef.io> | 2016-02-16 15:26:43 -0800 |
commit | 0ec54bd9f92a7c525871ea4b4a408dc8ba22cb1a (patch) | |
tree | 9119baed46c34dc9855ee6c6859c85f8e42c4829 /lib/chef/chef_fs | |
parent | 3ac7cd59f9ee46286afa5f9e30e1bab3e65277c9 (diff) | |
download | chef-0ec54bd9f92a7c525871ea4b4a408dc8ba22cb1a.tar.gz |
Reorganize inlined cheffs cookbooks dir per normal organization
Diffstat (limited to 'lib/chef/chef_fs')
-rw-r--r-- | lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbooks_dir.rb | 37 |
1 files changed, 17 insertions, 20 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 index 89270cc02c..072b36e356 100644 --- 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 @@ -27,12 +27,18 @@ class Chef class ChefRepositoryFileSystemCookbooksDir + attr_reader :name + attr_reader :parent + attr_reader :path + attr_reader :chefignore + attr_reader :file_path + def initialize(name, parent, file_path) @parent = parent @name = name @path = Chef::ChefFS::PathUtils::join(parent.path, name) @file_path = file_path || "#{parent.file_path}/#{name}" - @data_handler = nil + #@data_handler = nil begin @chefignore = Chef::Cookbook::Chefignore.new(self.file_path) rescue Errno::EISDIR @@ -41,8 +47,6 @@ class Chef end end - attr_reader :chefignore - def children begin cookbooks = Dir.entries(file_path).sort. @@ -85,19 +89,10 @@ class Chef end end - protected - - def make_child_entry(child_name) - ChefRepositoryFileSystemCookbookDir.new(child_name, self) - end - - public - - def data_handler - @data_handler || parent.data_handler - end - - attr_reader :file_path + # no data handler used here. + ## def data_handler + ## @data_handler || parent.data_handler + ## end def path_for_printing file_path @@ -136,10 +131,6 @@ class Chef children.empty? end - attr_reader :name - attr_reader :parent - attr_reader :path - def child(name) if can_have_child?(name, true) || can_have_child?(name, false) result = make_child_entry(name) @@ -151,6 +142,12 @@ class Chef parent.root end + protected + + def make_child_entry(child_name) + ChefRepositoryFileSystemCookbookDir.new(child_name, self) + end + end end end |