knife-essentials 1.3.2 → 1.4

data/lib/chef_fs/file_system/chef_repository_file_system_cookbook_dir.rb

@@ -0,0 +1,83 @@
+#
+# 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_cookbook_entry'
+require 'chef_fs/file_system/cookbook_dir'
+require 'chef/cookbook/chefignore'
+require 'chef/cookbook/cookbook_version_loader'
+
+module ChefFS
+  module FileSystem
+    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 Chef::Config[:versioned_cookbooks]
+            _canonical_name = canonical_cookbook_name(File.basename(file_path))
+            fail "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
+          return loader.cookbook_version
+        rescue
+          Chef::Log.error("Could not read #{path_for_printing} into a Chef object: #{$!}")
+        end
+        nil
+      end
+
+      def children
+        Dir.entries(file_path).sort.
+            select { |child_name| can_have_child?(child_name, File.directory?(File.join(file_path, child_name))) }.
+            map do |child_name|
+              segment_info = CookbookDir::COOKBOOK_SEGMENT_INFO[child_name.to_sym] || {}
+              ChefRepositoryFileSystemCookbookEntry.new(child_name, self, nil, segment_info[:ruby_only], segment_info[:recursive])
+            end.
+            select { |entry| !(entry.dir? && entry.children.size == 0) }
+      end
+
+      def can_have_child?(name, is_dir)
+        if is_dir
+          # Only the given directories will be uploaded.
+          return CookbookDir::COOKBOOK_SEGMENT_INFO.keys.include?(name.to_sym) && name != 'root_files'
+        end
+
+        super(name, is_dir)
+      end
+
+      # Exposed as a class method so that it can be used elsewhere
+      def self.canonical_cookbook_name(entry_name)
+        name_match = ChefFS::FileSystem::CookbookDir::VALID_VERSIONED_COOKBOOK_NAME.match(entry_name)
+        return nil if name_match.nil?
+        return name_match[1]
+      end
+
+      def canonical_cookbook_name(entry_name)
+        self.class.canonical_cookbook_name(entry_name)
+      end
+    end
+  end
+end

data/lib/chef_fs/file_system/chef_repository_file_system_cookbook_entry.rb

@@ -0,0 +1,69 @@
+#
+# 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/file_system/chef_repository_file_system_cookbooks_dir'
+
+module ChefFS
+  module FileSystem
+    class ChefRepositoryFileSystemCookbookEntry < ChefRepositoryFileSystemEntry
+      def initialize(name, parent, file_path = nil, ruby_only = false, recursive = false)
+        super(name, parent, file_path)
+        @ruby_only = ruby_only
+        @recursive = recursive
+      end
+
+      attr_reader :ruby_only
+      attr_reader :recursive
+
+      def children
+        Dir.entries(file_path).sort.
+            select { |child_name| can_have_child?(child_name, File.directory?(File.join(file_path, child_name))) }.
+            map { |child_name| ChefRepositoryFileSystemCookbookEntry.new(child_name, self, nil, ruby_only, recursive) }.
+            select { |entry| !(entry.dir? && entry.children.size == 0) }
+      end
+
+      def can_have_child?(name, is_dir)
+        if is_dir
+          return recursive && name != '.' && name != '..'
+        elsif ruby_only
+          return false if name[-3..-1] != '.rb'
+        end
+
+        # Check chefignore
+        ignorer = parent
+        begin
+          if ignorer.is_a?(ChefRepositoryFileSystemCookbooksDir)
+            # Grab the path from entry to child
+            path_to_child = name
+            child = self
+            while child.parent != ignorer
+              path_to_child = PathUtils.join(child.name, path_to_child)
+              child = child.parent
+            end
+            # Check whether that relative path is ignored
+            return !ignorer.chefignore || !ignorer.chefignore.ignored?(path_to_child)
+          end
+          ignorer = ignorer.parent
+        end while ignorer
+
+        true
+      end
+    end
+  end
+end

data/lib/chef_fs/file_system/chef_repository_file_system_cookbooks_dir.rb

@@ -17,6 +17,7 @@
 #
 
 require 'chef_fs/file_system/chef_repository_file_system_entry'
+require 'chef_fs/file_system/chef_repository_file_system_cookbook_dir'
 require 'chef/cookbook/chefignore'
 
 module ChefFS
@@ -34,20 +35,23 @@ module ChefFS
 
       attr_reader :chefignore
 
-      def ignore_empty_directories?
-        true
+      def children
+        Dir.entries(file_path).sort.
+            select { |child_name| can_have_child?(child_name, File.directory?(File.join(file_path, child_name))) }.
+            map { |child_name| ChefRepositoryFileSystemCookbookDir.new(child_name, self) }.
+            select do |entry|
+              # empty cookbooks and cookbook directories are ignored
+              if entry.children.size == 0
+                Chef::Log.warn("Cookbook '#{entry.name}' is empty or entirely chefignored at #{entry.path_for_printing}")
+                false
+              else
+                true
+              end
+            end
       end
 
-      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
-        result
+      def can_have_child?(name, is_dir)
+        is_dir && !name.start_with?('.')
       end
     end
   end

data/lib/chef_fs/file_system/chef_repository_file_system_data_bags_dir.rb

@@ -26,9 +26,8 @@ module ChefFS
         super(name, parent, path, ChefFS::DataHandler::DataBagItemDataHandler.new)
       end
 
-      def ignored?(entry)
-        return true if entry.dir? && entry.name.start_with?('.')
-        super(entry)
+      def can_have_child?(name, is_dir)
+        is_dir && !name.start_with?('.')
       end
     end
   end

data/lib/chef_fs/file_system/chef_repository_file_system_entry.rb

@@ -18,7 +18,6 @@
 #
 
 require 'chef_fs/file_system/file_system_entry'
-require 'chef/cookbook/cookbook_version_loader'
 
 module ChefFS
   module FileSystem
@@ -30,38 +29,12 @@ module ChefFS
         @data_handler = data_handler
       end
 
-      def chefignore
-        nil
-      end
-
-      def ignore_empty_directories?
-        parent.ignore_empty_directories?
-      end
-
       def data_handler
         @data_handler || parent.data_handler
       end
 
       def chef_object
         begin
-          if parent.path == '/cookbooks'
-            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 Chef::Config[:versioned_cookbooks]
-
-              _canonical_name = canonical_cookbook_name(File.basename(file_path))
-              fail "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
-            return loader.cookbook_version
-          end
-
-          # Otherwise, inflate the file using the chosen JSON class (if any)
           return data_handler.chef_object(JSON.parse(read, :create_additions => false))
         rescue
           Chef::Log.error("Could not read #{path_for_printing} into a Chef object: #{$!}")
@@ -69,49 +42,15 @@ module ChefFS
         nil
       end
 
-      # Exposed as a class method so that it can be used elsewhere
-      def self.canonical_cookbook_name(entry_name)
-        name_match = ChefFS::FileSystem::CookbookDir::VALID_VERSIONED_COOKBOOK_NAME.match(entry_name)
-        return nil if name_match.nil?
-        return name_match[1]
-      end
-
-      def canonical_cookbook_name(entry_name)
-        self.class.canonical_cookbook_name(entry_name)
+      def can_have_child?(name, is_dir)
+        !is_dir && name[-5..-1] == '.json'
       end
 
       def children
+        # Except cookbooks and data bag dirs, all things must be json files
         Dir.entries(file_path).sort.
-            select { |entry| entry != '.' && entry != '..' }.
-            map { |entry| ChefRepositoryFileSystemEntry.new(entry, self) }.
-            select { |entry| !ignored?(entry) }
-      end
-
-      private
-
-      def ignored?(child_entry)
-        if child_entry.dir?
-          # empty cookbooks and cookbook directories are ignored
-          if ignore_empty_directories? && child_entry.children.size == 0
-            return true
-          end
-        else
-          ignorer = parent
-          begin
-            if ignorer.chefignore
-              # Grab the path from entry to child
-              path_to_child = child_entry.name
-              child = self
-              while child.parent != ignorer
-                path_to_child = PathUtils.join(child.name, path_to_child)
-                child = child.parent
-              end
-              # Check whether that relative path is ignored
-              return ignorer.chefignore.ignored?(path_to_child)
-            end
-            ignorer = ignorer.parent
-          end while ignorer
-        end
+            select { |child_name| can_have_child?(child_name, File.directory?(File.join(file_path, child_name))) }.
+            map { |child_name| ChefRepositoryFileSystemEntry.new(child_name, self) }
       end
 
     end

data/lib/chef_fs/file_system/chef_repository_file_system_root_dir.rb

@@ -55,14 +55,6 @@ module ChefFS
         make_child_entry(name)
       end
 
-      def ignore_empty_directories?
-        false
-      end
-
-      def chefignore
-        nil
-      end
-
       def json_class
         nil
       end

data/lib/chef_fs/file_system/cookbooks_dir.rb

@@ -21,6 +21,7 @@ require 'chef_fs/file_system/cookbook_dir'
 require 'chef_fs/raw_request'
 require 'chef_fs/file_system/operation_failed_error'
 require 'chef_fs/file_system/cookbook_frozen_error'
+require 'chef_fs/file_system/chef_repository_file_system_cookbook_dir'
 
 require 'tmpdir'
 
@@ -84,7 +85,7 @@ module ChefFS
       # to make this work. So instead, we make a temporary cookbook
       # symlinking back to real cookbook, and upload the proxy.
       def upload_versioned_cookbook(other, options)
-        cookbook_name = ChefFS::FileSystem::ChefRepositoryFileSystemEntry.canonical_cookbook_name(other.name)
+        cookbook_name = ChefFS::FileSystem::ChefRepositoryFileSystemCookbookDir.canonical_cookbook_name(other.name)
 
         Dir.mktmpdir do |temp_cookbooks_path|
           proxy_cookbook_path = "#{temp_cookbooks_path}/#{cookbook_name}"

data/lib/chef_fs/version.rb

@@ -1,3 +1,3 @@
 module ChefFS
-  VERSION = "1.3.2"
+  VERSION = "1.4"
 end

data/spec/integration/chef_repo_path_spec.rb

@@ -223,9 +223,11 @@ EOM
           directory 'clients/blah.json'
           file 'clients2/blah.json', {}
           it 'knife show /clients/blah.json succeeds' do
-            pending "don't count directories in clients" do
-              knife('show --local /clients/blah.json').should_succeed ''
-            end
+            knife('show --local /clients/blah.json').should_succeed <<EOM
+/clients/blah.json:
+{
+}
+EOM
           end
         end
 
@@ -278,16 +280,14 @@ EOM
           file 'data_bags/blah', ''
           file 'data_bags2/blah/item.json', ''
           it 'knife list -Rfp data_bags shows files in blah' do
-            pending "Don't count files as data bags" do
-              knife('list --local -Rfp /data_bags').should_succeed <<EOM
+            knife('list --local -Rfp /data_bags').should_succeed <<EOM
 /data_bags/bag/
 /data_bags/bag/item.json
 /data_bags/bag2/
 /data_bags/bag2/item2.json
 /data_bags/blah/
-/data_bags/blah/item1.json
+/data_bags/blah/item.json
 EOM
-            end
           end
         end
 
@@ -310,9 +310,11 @@ EOM
           directory 'environments/blah.json'
           file 'environments2/blah.json', {}
           it 'knife show /environments/blah.json succeeds' do
-            pending "don't count directories in environments" do
-              knife('show --local /environments/blah.json').should_succeed ''
-            end
+            knife('show --local /environments/blah.json').should_succeed <<EOM
+/environments/blah.json:
+{
+}
+EOM
           end
         end
 
@@ -320,9 +322,11 @@ EOM
           directory 'nodes/blah.json'
           file 'nodes2/blah.json', {}
           it 'knife show /nodes/blah.json succeeds' do
-            pending "don't count directories in nodes" do
-              knife('show --local /nodes/blah.json').should_succeed ''
-            end
+            knife('show --local /nodes/blah.json').should_succeed <<EOM
+/nodes/blah.json:
+{
+}
+EOM
           end
         end
 
@@ -330,9 +334,11 @@ EOM
           directory 'roles/blah.json'
           file 'roles2/blah.json', {}
           it 'knife show /roles/blah.json succeeds' do
-            pending "don't count directories in roles" do
-              knife('show --local /roles/blah.json').should_succeed ''
-            end
+            knife('show --local /roles/blah.json').should_succeed <<EOM
+/roles/blah.json:
+{
+}
+EOM
           end
         end
 
@@ -340,9 +346,11 @@ EOM
           directory 'users/blah.json'
           file 'users2/blah.json', {}
           it 'knife show /users/blah.json succeeds' do
-            pending "don't count directories in users" do
-              knife('show --local /users/blah.json').should_succeed ''
-            end
+            knife('show --local /users/blah.json').should_succeed <<EOM
+/users/blah.json:
+{
+}
+EOM
           end
         end
 

data/spec/integration/chef_repository_file_system_spec.rb

@@ -119,8 +119,7 @@ EOM
       end
 
       it "knife list --local -Rfp / should NOT return them" do
-        pending "Decide whether this is a good/bad idea" do
-          knife('list --local -Rfp /').should_succeed <<EOM
+        knife('list --local -Rfp /').should_succeed <<EOM
 /data_bags/
 /data_bags/bag1/
 /data_bags/bag1/item1.json
@@ -129,7 +128,6 @@ EOM
 /roles/
 /roles/role1.json
 EOM
-        end
       end
     end
 
@@ -188,8 +186,7 @@ EOM
       end
 
       it "knife list --local -Rfp / should NOT return them" do
-        pending "Decide whether this is a good idea" do
-          knife('list --local -Rfp /').should_succeed <<EOM
+        knife('list --local -Rfp /').should_succeed <<EOM
 /cookbooks/
 /cookbooks/cookbook1/
 /cookbooks/cookbook1/a.rb
@@ -222,7 +219,6 @@ EOM
 /cookbooks/cookbook1/templates/c/d.rb
 /cookbooks/cookbook1/templates/c/e.json
 EOM
-        end
       end
     end
 
@@ -238,11 +234,9 @@ EOM
     when_the_repository "has a file in data_bags/" do
       file 'data_bags/file', ''
       it 'does not show up in list -Rfp' do
-        pending "don't show files when only directories are allowed" do
-          knife('list --local -Rfp /').should_succeed <<EOM
+        knife('list --local -Rfp /').should_succeed <<EOM
 /data_bags/
 EOM
-        end
       end
     end
   end

data/spec/integration/chefignore_spec.rb

@@ -31,14 +31,10 @@ describe 'chefignore tests' do
 /cookbooks/cookbook1/x.json
 /data_bags/
 /data_bags/bag1/
-/data_bags/bag1/chefignore
 /data_bags/bag1/x.json
-/data_bags/chefignore
 /environments/
-/environments/chefignore
 /environments/x.json
 /roles/
-/roles/chefignore
 /roles/x.json
 EOM
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-essentials
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: '1.4'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-12 00:00:00.000000000 Z
+date: 2013-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -150,6 +150,8 @@ files:
 - lib/chef_fs/file_system/already_exists_error.rb
 - 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_cookbook_dir.rb
+- lib/chef_fs/file_system/chef_repository_file_system_cookbook_entry.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