knife-essentials 0.9.0 → 0.9.1

data/lib/chef_fs/file_system/chef_repository_file_system_cookbooks_dir.rb

@@ -40,7 +40,10 @@ module ChefFS
 
       def ignored?(entry)
         return true if !entry.dir?
+        return true if entry.name.start_with?('.')
+
         result = super(entry)
+
         if result
           Chef::Log.warn("Cookbook '#{entry.name}' is empty or entirely chefignored at #{entry.path_for_printing}")
         end

data/lib/chef_fs/file_system/chef_repository_file_system_data_bags_dir.rb

@@ -0,0 +1,35 @@
+#
+# 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_fs/file_system/chef_repository_file_system_entry'
+require 'chef_fs/data_handler/data_bag_item_data_handler'
+
+module ChefFS
+  module FileSystem
+    class ChefRepositoryFileSystemDataBagsDir < ChefRepositoryFileSystemEntry
+      def initialize(name, parent, path = nil)
+        super(name, parent, path, ChefFS::DataHandler::DataBagItemDataHandler.new)
+      end
+
+      def ignored?(entry)
+        return true if entry.dir? && entry.name.start_with?('.')
+        super(entry)
+      end
+    end
+  end
+end

data/lib/chef_fs/file_system/chef_repository_file_system_root_dir.rb

@@ -19,9 +19,9 @@
 require 'chef_fs/file_system/base_fs_dir'
 require 'chef_fs/file_system/chef_repository_file_system_entry'
 require 'chef_fs/file_system/chef_repository_file_system_cookbooks_dir'
+require 'chef_fs/file_system/chef_repository_file_system_data_bags_dir'
 require 'chef_fs/file_system/multiplexed_dir'
 require 'chef_fs/data_handler/client_data_handler'
-require 'chef_fs/data_handler/data_bag_item_data_handler'
 require 'chef_fs/data_handler/environment_data_handler'
 require 'chef_fs/data_handler/node_data_handler'
 require 'chef_fs/data_handler/role_data_handler'
@@ -75,12 +75,12 @@ module ChefFS
         end
         if name == 'cookbooks'
           dirs = paths.map { |path| ChefRepositoryFileSystemCookbooksDir.new(name, self, path) }
+        elsif name == 'data_bags'
+          dirs = paths.map { |path| ChefRepositoryFileSystemDataBagsDir.new(name, self, path) }
         else
           data_handler = case name
             when 'clients'
               ChefFS::DataHandler::ClientDataHandler.new
-            when 'data_bags'
-              ChefFS::DataHandler::DataBagItemDataHandler.new
             when 'environments'
               ChefFS::DataHandler::EnvironmentDataHandler.new
             when 'nodes'

data/lib/chef_fs/version.rb

@@ -1,4 +1,4 @@
 module ChefFS
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end
 

data/spec/integration/chef_repository_file_system_spec.rb

@@ -246,4 +246,20 @@ EOM
       end
     end
   end
+
+  when_the_repository 'has a cookbook starting with .' do
+    file 'cookbooks/.svn/metadata.rb', ''
+    file 'cookbooks/a.b/metadata.rb', ''
+    it 'knife list does not show it' do
+      knife('list --local -fp /cookbooks').should_succeed "/cookbooks/a.b/\n"
+    end
+  end
+
+  when_the_repository 'has a data bag starting with .' do
+    file 'data_bags/.svn/x.json', {}
+    file 'data_bags/a.b/x.json', {}
+    it 'knife list does not show it' do
+      knife('list --local -fp /data_bags').should_succeed "/data_bags/a.b/\n"
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-essentials
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -59,6 +59,7 @@ files:
 - lib/chef_fs/file_system/base_fs_dir.rb
 - lib/chef_fs/file_system/base_fs_object.rb
 - lib/chef_fs/file_system/chef_repository_file_system_cookbooks_dir.rb
+- lib/chef_fs/file_system/chef_repository_file_system_data_bags_dir.rb
 - lib/chef_fs/file_system/chef_repository_file_system_entry.rb
 - lib/chef_fs/file_system/chef_repository_file_system_root_dir.rb
 - lib/chef_fs/file_system/chef_server_root_dir.rb