Split repository versioned and unversioned cookbooksjk/chef-fs-cookbook-refactor

4 files changed, 89 insertions, 18 deletions

diff --git a/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_dir.rb b/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_dir.rb
index 1ebb8b42cf..e6557bd05d 100644
--- a/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_dir.rb
+++ b/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_dir.rb
@@ -28,25 +28,9 @@ class Chef
     module FileSystem
       module Repository
         class ChefRepositoryFileSystemCookbookDir < ChefRepositoryFileSystemCookbookEntry
-          def initialize(name, parent, file_path = nil)
-            super(name, parent, file_path)
-          end
-
           def chef_object
             begin
-              loader = Chef::Cookbook::CookbookVersionLoader.new(file_path, parent.chefignore)
-              # We need the canonical cookbook name if we are using versioned cookbooks, but we don't
-              # want to spend a lot of time adding code to the main Chef libraries
-              if root.versioned_cookbooks
-                canonical_name = canonical_cookbook_name(File.basename(file_path))
-                raise "When versioned_cookbooks mode is on, cookbook #{file_path} must match format <cookbook_name>-x.y.z"  unless canonical_name
-
-                # KLUDGE: We shouldn't have to use instance_variable_set
-                loader.instance_variable_set(:@cookbook_name, canonical_name)
-              end
-
-              loader.load_cookbooks
-              cb = loader.cookbook_version
+              cb = cookbook_version
               if !cb
                 Chef::Log.error("Cookbook #{file_path} empty.")
                 raise "Cookbook #{file_path} empty."
@@ -98,6 +82,12 @@ class Chef
             segment_info = Chef::ChefFS::FileSystem::ChefServer::CookbookDir::COOKBOOK_SEGMENT_INFO[child_name.to_sym] || {}
             ChefRepositoryFileSystemCookbookEntry.new(child_name, self, nil, segment_info[:ruby_only], segment_info[:recursive])
           end
+
+          def cookbook_version
+            loader = Chef::Cookbook::CookbookVersionLoader.new(file_path, parent.chefignore)
+            loader.load_cookbooks
+            cb = loader.cookbook_version
+          end
         end
       end
     end
diff --git a/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_root_dir.rb b/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_root_dir.rb
index c189323c9a..2e9eeea0ee 100644
--- a/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_root_dir.rb
+++ b/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_root_dir.rb
@@ -20,6 +20,7 @@ require 'chef/chef_fs/file_system/base_fs_dir'
 require 'chef/chef_fs/file_system/repository/chef_repository_file_system_entry'
 require 'chef/chef_fs/file_system/repository/chef_repository_file_system_acls_dir'
 require 'chef/chef_fs/file_system/repository/chef_repository_file_system_cookbooks_dir'
+require 'chef/chef_fs/file_system/repository/chef_repository_file_system_versioned_cookbooks_dir'
 require 'chef/chef_fs/file_system/repository/chef_repository_file_system_data_bags_dir'
 require 'chef/chef_fs/file_system/multiplexed_dir'
 require 'chef/chef_fs/data_handler/client_data_handler'
@@ -162,7 +163,11 @@ class Chef
             end
             case name
             when 'cookbooks'
-              dirs = paths.map { |path| ChefRepositoryFileSystemCookbooksDir.new(name, self, path) }
+              if versioned_cookbooks
+                dirs = paths.map { |path| ChefRepositoryFileSystemVersionedCookbooksDir.new(name, self, path) }
+              else
+                dirs = paths.map { |path| ChefRepositoryFileSystemCookbooksDir.new(name, self, path) }
+              end
             when 'data_bags'
               dirs = paths.map { |path| ChefRepositoryFileSystemDataBagsDir.new(name, self, path) }
             when 'acls'
diff --git a/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_versioned_cookbook_dir.rb b/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_versioned_cookbook_dir.rb
new file mode 100644
index 0000000000..cf9378dbf9
--- /dev/null
+++ b/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_versioned_cookbook_dir.rb
@@ -0,0 +1,42 @@
+#
+# 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_cookbook_dir'
+
+class Chef
+  module ChefFS
+    module FileSystem
+      module Repository
+        class ChefRepositoryFileSystemVersionedCookbookDir < ChefRepositoryFileSystemCookbookDir
+          # Override from parent
+          def cookbook_version
+            loader = Chef::Cookbook::CookbookVersionLoader.new(file_path, parent.chefignore)
+            # We need the canonical cookbook name if we are using versioned cookbooks, but we don't
+            # want to spend a lot of time adding code to the main Chef libraries
+            canonical_name = canonical_cookbook_name(File.basename(file_path))
+            raise "When versioned_cookbooks mode is on, cookbook #{file_path} must match format <cookbook_name>-x.y.z"  unless canonical_name
+            # KLUDGE: We shouldn't have to use instance_variable_set
+            loader.instance_variable_set(:@cookbook_name, canonical_name)
+            loader.load_cookbooks
+            loader.cookbook_version
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_versioned_cookbooks_dir.rb b/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_versioned_cookbooks_dir.rb
new file mode 100644
index 0000000000..322944fc82
--- /dev/null
+++ b/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_versioned_cookbooks_dir.rb
@@ -0,0 +1,34 @@
+#
+# 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_cookbooks_dir'
+require 'chef/chef_fs/file_system/repository/chef_repository_file_system_versioned_cookbook_dir'
+
+class Chef
+  module ChefFS
+    module FileSystem
+      module Repository
+        class ChefRepositoryFileSystemVersionedCookbooksDir < ChefRepositoryFileSystemCookbooksDir
+          def make_child_entry(child_name)
+            ChefRepositoryFileSystemVersionedCookbookDir.new(child_name, self)
+          end
+        end
+      end
+    end
+  end
+end