remove commented inlined code

1 files changed, 1 insertions, 262 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 61c5a599f5..89270cc02c 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
@@ -25,70 +25,12 @@ class Chef
     module FileSystem
       module Repository
 
-        # Original
-        ## class ChefRepositoryFileSystemCookbooksDir < ChefRepositoryFileSystemEntry
-
-        # With ChefRepositoryFileSystemEntry inlined
-        #class ChefRepositoryFileSystemCookbooksDir < FileSystemEntry
-
-        # With FileSystemEntry inlined
-        #class ChefRepositoryFileSystemCookbooksDir < BaseFSDir
-
-        # With BaseFSDir inlined
-        #class ChefRepositoryFileSystemCookbooksDir < BaseFSObject
-
-        # With BaseFSObject inlined
         class ChefRepositoryFileSystemCookbooksDir
 
-          # Original initialize
-          ##  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
-
-          # ChefRepositoryFileSystemEntry#initialize
-          ##  def initialize(name, parent, file_path = nil, data_handler = nil)
-          ##    super(name, parent, file_path)
-          ##    @data_handler = data_handler
-          ##  end
-
-          # FileSystemEntry#initialize
-          ##  def initialize(name, parent, file_path = nil)
-          ##    super(name, parent)
-          ##    @file_path = file_path || "#{parent.file_path}/#{name}"
-          ##  end
-
-          # BaseFSObject#initialize
-          ##  def initialize(name, parent)
-          ##    @parent = parent
-          ##    @name = name
-          ##    if parent
-          ##      @path = Chef::ChefFS::PathUtils::join(parent.path, name)
-          ##    else
-          ##      if name != ""
-          ##        raise ArgumentError, "Name of root object must be empty string: was '#{name}' instead"
-          ##      end
-          ##      @path = "/"
-          ##    end
-          ##  end
-
-          # inlined initialize
           def initialize(name, parent, file_path)
             @parent = parent
             @name = name
-            ##  if parent
-              @path = Chef::ChefFS::PathUtils::join(parent.path, name)
-            ##  else
-            ##    if name != ""
-            ##      raise ArgumentError, "Name of root object must be empty string: was '#{name}' instead"
-            ##    end
-            ##    @path = "/"
-            ##  end
+            @path = Chef::ChefFS::PathUtils::join(parent.path, name)
             @file_path = file_path || "#{parent.file_path}/#{name}"
             @data_handler = nil
             begin
@@ -101,22 +43,7 @@ class Chef
 
           attr_reader :chefignore
 
-          # Original version:
-          ##  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
-
-          # Inlined with superclass version:
           def children
-            # Except cookbooks and data bag dirs, all things must be json files
             begin
               cookbooks = Dir.entries(file_path).sort.
                   map { |child_name| make_child_entry(child_name) }.
@@ -166,79 +93,16 @@ class Chef
 
           public
 
-          ##############################
-          # Inlined from ChefRepositoryFileSystemEntry
-          ##############################
-
-          ##  def write_pretty_json=(value)
-          ##    @write_pretty_json = value
-          ##  end
-
-          ##  def write_pretty_json
-          ##    @write_pretty_json.nil? ? root.write_pretty_json : @write_pretty_json
-          ##  end
-
           def data_handler
             @data_handler || parent.data_handler
           end
 
-          ##  def chef_object
-          ##    begin
-          ##      return data_handler.chef_object(Chef::JSONCompat.parse(read))
-          ##    rescue
-          ##      Chef::Log.error("Could not read #{path_for_printing} into a Chef object: #{$!}")
-          ##    end
-          ##    nil
-          ##  end
-
-          # overridden by subclass
-          ##  def can_have_child?(name, is_dir)
-          ##    !is_dir && name[-5..-1] == ".json"
-          ##  end
-
-          ##  def write(file_contents)
-          ##    if file_contents && write_pretty_json && name[-5..-1] == ".json"
-          ##      file_contents = minimize(file_contents, self)
-          ##    end
-          ##    super(file_contents)
-          ##  end
-
-          ##  def minimize(file_contents, entry)
-          ##    object = Chef::JSONCompat.parse(file_contents)
-          ##    object = data_handler.normalize(object, entry)
-          ##    object = data_handler.minimize(object, entry)
-          ##    Chef::JSONCompat.to_json_pretty(object)
-          ##  end
-
-          # overridden by subclass
-          ##  protected
-
-          ##  def make_child_entry(child_name)
-          ##    ChefRepositoryFileSystemEntry.new(child_name, self)
-          ##  end
-
-          ##############################
-          # Inlined from FileSystemEntry
-          ##############################
-
           attr_reader :file_path
 
           def path_for_printing
             file_path
           end
 
-          # overridden by subclass
-          ## def children
-          ##   # Except cookbooks and data bag dirs, all things must be json files
-          ##   begin
-          ##     Dir.entries(file_path).sort.
-          ##         map { |child_name| make_child_entry(child_name) }.
-          ##         select { |child| child && can_have_child?(child.name, child.dir?) }
-          ##   rescue Errno::ENOENT
-          ##     raise Chef::ChefFS::FileSystem::NotFoundError.new(self, $!)
-          ##   end
-          ## end
-
           def create_child(child_name, file_contents=nil)
             child = make_child_entry(child_name)
             if child.exists?
@@ -252,11 +116,6 @@ class Chef
             child
           end
 
-          # this becomes unused when you remove code branches that we cannot hit
-          ## def dir?
-          ##   File.directory?(file_path)
-          ## end
-
           def delete(recurse)
             if exists?
               if !recurse
@@ -272,70 +131,15 @@ class Chef
             File.exists?(file_path) # && (parent.nil? || parent.can_have_child?(name, dir?))
           end
 
-          # unused
-          ##  def read
-          ##    begin
-          ##      File.open(file_path, "rb") {|f| f.read}
-          ##    rescue Errno::ENOENT
-          ##      raise Chef::ChefFS::FileSystem::NotFoundError.new(self, $!)
-          ##    end
-          ##  end
-
-          # unused
-          ##  def write(content)
-          ##    File.open(file_path, "wb") do |file|
-          ##      file.write(content)
-          ##    end
-          ##  end
-
-          ##  protected
-
-          ##  def make_child_entry(child_name)
-          ##    FileSystemEntry.new(child_name, self)
-          ##  end
-
-          ##############################
-          # Inlined from BaseFSDir
-          ##############################
-
-          # trivial initializer
-          ## def initialize(name, parent)
-          ##   super
-          ## end
-
-          # No longer needed
-          ##  def dir?
-          ##    true
-          ##  end
-
-          # overridden by subclass
-          ## def can_have_child?(name, is_dir)
-          ##   true
-          ## end
-
           # An empty children array is an empty dir
           def empty?
             children.empty?
           end
 
-          ##############################
-          # Inlined from BaseFSObject
-          ##############################
-
           attr_reader :name
           attr_reader :parent
           attr_reader :path
 
-          # Unused?
-          ## def compare_to(other)
-          ##   nil
-          ## end
-
-          # overridden in subclass
-          ##  def can_have_child?(name, is_dir)
-          ##    false
-          ##  end
-
           def child(name)
             if can_have_child?(name, true) || can_have_child?(name, false)
               result = make_child_entry(name)
@@ -343,75 +147,10 @@ class Chef
             result || NonexistentFSObject.new(name, self)
           end
 
-          # overridden in subclass
-          ##  def children
-          ##    raise NotFoundError.new(self) if !exists?
-          ##    []
-          ##  end
-
-          # unused
-          ##  def chef_object
-          ##    raise NotFoundError.new(self) if !exists?
-          ##    nil
-          ##  end
-
-          # overridden in subclass
-          ##  def create_child(name, file_contents)
-          ##    raise NotFoundError.new(self) if !exists?
-          ##    raise OperationNotAllowedError.new(:create_child, self)
-          ##  end
-
-          # overridden in subclass
-          ##  def delete(recurse)
-          ##    raise NotFoundError.new(self) if !exists?
-          ##    raise OperationNotAllowedError.new(:delete, self)
-          ##  end
-
-          # overridden and also not used
-          ##  def dir?
-          ##    false
-          ##  end
-
-          # overridden
-          ## def exists?
-          ##   true
-          ## end
-
-          # overridden
-          ##  def path_for_printing
-          ##    if parent
-          ##      parent_path = parent.path_for_printing
-          ##      if parent_path == "."
-          ##        name
-          ##      else
-          ##        Chef::ChefFS::PathUtils::join(parent.path_for_printing, name)
-          ##      end
-          ##    else
-          ##      name
-          ##    end
-          ##  end
-
-          # we're never root, don't need to branch here
-          ## def root
-          ##   parent ? parent.root : self
-          ## end
-
           def root
             parent.root
           end
 
-          # overridden and unused
-          ## def read
-          ##   raise NotFoundError.new(self) if !exists?
-          ##   raise OperationNotAllowedError.new(:read, self)
-          ## end
-
-          # overridden and unused
-          ##  def write(file_contents)
-          ##    raise NotFoundError.new(self) if !exists?
-          ##    raise OperationNotAllowedError.new(:write, self)
-          ##  end
-
         end
       end
     end