knife-essentials 0.8.2 → 0.8.3

data/lib/chef/knife/deps_essentials.rb

@@ -1,5 +1,6 @@
 require 'chef_fs/knife'
 require 'chef_fs/file_system'
+require 'chef/run_list'
 
 class Chef
   class Knife
@@ -71,42 +72,54 @@ class Chef
 
       def get_dependencies(entry)
         begin
-          object = entry.chef_object
-        rescue ChefFS::FileSystem::NotFoundError
-          ui.error "#{format_path(entry.path)}: No such file or directory"
-          self.exit_code = 2
-          return []
-        end
-        if !object
-          # If it's not a Chef object, it has no deps
-          return []
-        end
+          if entry.parent && entry.parent.path == '/cookbooks'
+            return entry.chef_object.metadata.dependencies.keys.map { |cookbook| "/cookbooks/#{cookbook}"}
 
-        if object.is_a?(Chef::CookbookVersion)
-          return object.metadata.dependencies.keys.map { |cookbook| "/cookbooks/#{cookbook}"}
-        elsif object.is_a?(Chef::Node)
-          result = []
-          # /environments/_default.json is an annoying dependency, since you
-          # can't upload it anyway
-          if object.chef_environment != '_default'
-            result << "/environments/#{object.chef_environment}.json"
-          end
-          return result + dependencies_from_runlist(object.run_list)
-        elsif object.is_a?(Chef::Role)
-          result = []
-          object.env_run_lists.each_pair do |env,run_list|
-            dependencies_from_runlist(run_list).each do |dependency|
-              result << dependency if !result.include?(dependency)
+          elsif entry.parent && entry.parent.path == '/nodes'
+            node = JSON.parse(entry.read, :create_additions => false)
+            result = []
+            if node['chef_environment'] && node['chef_environment'] != '_default'
+              result << "/environments/#{node['chef_environment']}.json"
+            end
+            if node['run_list']
+              result += dependencies_from_runlist(node['run_list'])
+            end
+            result
+
+          elsif entry.parent && entry.parent.path == '/roles'
+            role = JSON.parse(entry.read, :create_additions => false)
+            result = []
+            if role['run_list']
+              dependencies_from_runlist(role['run_list']).each do |dependency|
+                result << dependency if !result.include?(dependency)
+              end
+            end
+            if role['env_run_lists']
+              role['env_run_lists'].each_pair do |env,run_list|
+                dependencies_from_runlist(run_list).each do |dependency|
+                  result << dependency if !result.include?(dependency)
+                end
+              end
             end
+            result
+
+          elsif !entry.exists?
+            raise ChefFS::FileSystem::NotFoundError, "Nonexistent #{entry.path_for_printing}"
+
+          else
+            []
           end
-          return result
-        else
-          return []
+        rescue ChefFS::FileSystem::NotFoundError
+          ui.error "#{format_path(entry.path)}: No such file or directory"
+          self.exit_code = 2
+          []
         end
       end
 
       def dependencies_from_runlist(run_list)
-        result = run_list.map do |run_list_item|
+        chef_run_list = Chef::RunList.new
+        chef_run_list.reset!(run_list)
+        chef_run_list.map do |run_list_item|
           case run_list_item.type
           when :role
             "/roles/#{run_list_item.name}.json"

data/lib/chef/knife/raw_essentials.rb

@@ -4,7 +4,6 @@ class Chef
   class Knife
     remove_const(:Raw) if const_defined?(:Raw) && Raw.name == 'Chef::Knife::Raw' # override Chef's version
     class Raw < Chef::Knife
-      ChefFS = ::ChefFS
       banner "knife raw REQUEST_PATH"
 
       option :method,

data/lib/chef_fs/file_system/chef_repository_file_system_entry.rb

@@ -18,19 +18,15 @@
 
 require 'chef_fs/file_system/file_system_entry'
 require 'chef/cookbook/cookbook_version_loader'
-require 'chef/node'
-require 'chef/role'
-require 'chef/environment'
-require 'chef/data_bag_item'
-require 'chef/client'
 
 module ChefFS
   module FileSystem
     # ChefRepositoryFileSystemEntry works just like FileSystemEntry,
     # except can inflate Chef objects
     class ChefRepositoryFileSystemEntry < FileSystemEntry
-      def initialize(name, parent, file_path = nil, ignore_empty_directories = nil, chefignore = nil)
+      def initialize(name, parent, file_path = nil, json_class = nil)
         super(name, parent, file_path)
+        @json_class = json_class
       end
 
       def chefignore
@@ -41,6 +37,10 @@ module ChefFS
         parent.ignore_empty_directories?
       end
 
+      def json_class
+        @json_class || parent.json_class
+      end
+
       def chef_object
         begin
           if parent.path == '/cookbooks'
@@ -49,8 +49,10 @@ module ChefFS
             return loader.cookbook_version
           end
 
-          # Otherwise the information to inflate the object, is in the file (json_class).
-          return Chef::JSONCompat.from_json(read)
+          # Otherwise, inflate the file using the chosen JSON class (if any)
+          if json_class
+            return json_class.json_create(JSON.parse(read, :create_additions => false))
+          end
         rescue
           Chef::Log.error("Could not read #{path_for_printing} into a Chef object: #{$!}")
         end

data/lib/chef_fs/file_system/chef_repository_file_system_root_dir.rb

@@ -20,6 +20,11 @@ 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/multiplexed_dir'
+require 'chef/api_client'
+require 'chef/data_bag_item'
+require 'chef/environment'
+require 'chef/node'
+require 'chef/role'
 
 module ChefFS
   module FileSystem
@@ -54,6 +59,10 @@ module ChefFS
         nil
       end
 
+      def json_class
+        nil
+      end
+
       private
 
       def make_child_entry(name)
@@ -66,7 +75,23 @@ module ChefFS
         if name == 'cookbooks'
           dirs = paths.map { |path| ChefRepositoryFileSystemCookbooksDir.new(name, self, path) }
         else
-          dirs = paths.map { |path| ChefRepositoryFileSystemEntry.new(name, self, path) }
+          json_class = case name
+            when 'clients'
+              Chef::ApiClient
+            when 'data_bags'
+              Chef::DataBagItem
+            when 'environments'
+              Chef::Environment
+            when 'nodes'
+              Chef::Node
+            when 'roles'
+              Chef::Role
+            when 'users'
+              nil
+            else
+              raise "Unknown top level path #{name}"
+            end
+          dirs = paths.map { |path| ChefRepositoryFileSystemEntry.new(name, self, path, json_class) }
         end
         MultiplexedDir.new(dirs)
       end

data/lib/chef_fs/file_system/file_system_entry.rb

@@ -33,7 +33,7 @@ module ChefFS
       attr_reader :file_path
 
       def path_for_printing
-        ChefFS::PathUtils::relative_to(file_path, File.expand_path(Dir.pwd))
+        file_path
       end
 
       def children

data/lib/chef_fs/file_system/multiplexed_dir.rb

@@ -23,7 +23,7 @@ module ChefFS
           multiplexed_dirs.each do |dir|
             dir.children.each do |child|
               if seen[child.name]
-                Chef::Log.warn("Child with name '#{child.name}' found in multiple directories: #{child} and #{seen[child.name]}")
+                Chef::Log.warn("Child with name '#{child.name}' found in multiple directories: #{child.path_for_printing} and #{seen[child.name].path_for_printing}")
               else
                 result << child
                 seen[child.name] = child

data/lib/chef_fs/knife.rb

@@ -112,22 +112,23 @@ module ChefFS
     # If the path does not reach into ANY specified directory, nil is returned.
     def server_path(file_path)
       pwd = File.expand_path(Dir.pwd)
-      absolute_path = File.expand_path(file_path, pwd)
+      absolute_path = ChefFS::PathUtils.realest_path(File.expand_path(file_path, pwd))
 
       # Check all object paths (cookbooks_dir, data_bags_dir, etc.)
       object_paths.each_pair do |name, paths|
         paths.each do |path|
-          if absolute_path[0,path.length] == path
-            relative_path = ChefFS::PathUtils::relative_to(path, absolute_path)
+          realest_path = ChefFS::PathUtils.realest_path(path)
+          if absolute_path[0,realest_path.length] == realest_path
+            relative_path = ChefFS::PathUtils::relative_to(absolute_path, realest_path)
             return relative_path == '.' ? "/#{name}" : "/#{name}/#{relative_path}"
           end
         end
       end
 
       # Check chef_repo_path
-      if chef_repo_path[0,absolute_path.length] == absolute_path
-        relative_path = ChefFS::PathUtils::relative_to(chef_repo_path, absolute_path)
-        return relative_path == '.' ? '/' : "/#{relative_path}"
+      realest_chef_repo_path = ChefFS::PathUtils.realest_path(chef_repo_path)
+      if absolute_path == realest_chef_repo_path
+        return '/'
       end
 
       nil
@@ -164,6 +165,10 @@ module ChefFS
       # TODO support absolute file paths and not just patterns?  Too much?
       # Could be super useful in a world with multiple repo paths
       args.map do |arg|
+        if !base_path && !PathUtils.is_absolute?(arg)
+          ui.error("Attempt to use relative path '#{arg}' when current directory is outside the repository path")
+          exit(1)
+        end
         ChefFS::FilePattern::relative_to(base_path, arg)
       end
     end

data/lib/chef_fs/path_utils.rb

@@ -29,7 +29,7 @@ module ChefFS
       source_parts = ChefFS::PathUtils.split(source)
       dest_parts = ChefFS::PathUtils.split(dest)
       i = 0
-      until i >= source_parts.length || i >= dest_parts.length || source_parts[i] != source_parts[i]
+      until i >= source_parts.length || i >= dest_parts.length || source_parts[i] != dest_parts[i]
         i+=1
       end
       # dot-dot up from 'source' to the common ancestor, then
@@ -58,5 +58,29 @@ module ChefFS
       ChefFS::windows? ? '[/\\]' : '/'
     end
 
+    # Given a path which may only be partly real (i.e. /x/y/z when only /x exists,
+    # or /x/y/*/blah when /x/y/z/blah exists), call File.realpath on the biggest
+    # part that actually exists.
+    #
+    # If /x is a symlink to /blarghle, and has no subdirectories, then:
+    # PathUtils.realest_path('/x/y/z') == '/blarghle/y/z'
+    # PathUtils.realest_path('/x/*/z') == '/blarghle/*/z'
+    # PathUtils.realest_path('/*/y/z') == '/*/y/z'
+    def self.realest_path(path)
+      begin
+        File.realpath(path)
+      rescue Errno::ENOENT
+        dirname = File.dirname(path)
+        if dirname
+          PathUtils.join(realest_path(dirname), File.basename(path))
+        else
+          path
+        end
+      end
+    end
+
+    def self.is_absolute?(path)
+      path =~ /^#{regexp_path_separator}/
+    end
   end
 end

data/lib/chef_fs/version.rb

@@ -1,4 +1,4 @@
 module ChefFS
-  VERSION = "0.8.2"
+  VERSION = "0.8.3"
 end
 

data/spec/integration/chef_repository_file_system_spec.rb

@@ -597,7 +597,7 @@ EOM
         file 'cookbooks1/chefignore', "metadata.rb\n"
         file 'cookbooks2/chefignore', "x.json\n"
         it "chefignores apply only to the directories they are in" do
-          knife('list --local -R /').should_succeed <<EOM
+          knife('list --local -R /').should_succeed(<<EOM, :stderr => "WARN: Child with name 'chefignore' found in multiple directories: #{Chef::Config.chef_repo_path}/cookbooks2/chefignore and #{Chef::Config.chef_repo_path}/cookbooks1/chefignore\n")
 /:
 cookbooks
 
@@ -621,7 +621,7 @@ EOM
           file 'cookbooks2/yourcookbook/onlyincookbooks2.rb', ''
 
           it "chefignores apply only to the winning cookbook" do
-            knife('list --local -R /').should_succeed <<EOM
+            knife('list --local -R /').should_succeed(<<EOM, :stderr => "WARN: Child with name 'chefignore' found in multiple directories: #{Chef::Config.chef_repo_path}/cookbooks2/chefignore and #{Chef::Config.chef_repo_path}/cookbooks1/chefignore\nWARN: Child with name 'yourcookbook' found in multiple directories: #{Chef::Config.chef_repo_path}/cookbooks2/yourcookbook and #{Chef::Config.chef_repo_path}/cookbooks1/yourcookbook\n")
 /:
 cookbooks
 
@@ -644,7 +644,237 @@ EOM
   end
 
   # TODO alternate repo_path / *_path
-  # TODO multiple *_path
+  context 'alternate *_path' do
+    when_the_repository 'has clients and clients2, cookbooks and cookbooks2, etc.' do
+      file 'clients/client1.json', {}
+      file 'cookbooks/cookbook1/metadata.rb', ''
+      file 'data_bags/bag/item.json', {}
+      file 'environments/env1.json', {}
+      file 'nodes/node1.json', {}
+      file 'roles/role1.json', {}
+      file 'users/user1.json', {}
+
+      file 'clients2/client1.json', {}
+      file 'cookbooks2/cookbook2/metadata.rb', ''
+      file 'data_bags2/bag2/item2.json', {}
+      file 'environments2/env2.json', {}
+      file 'nodes2/node2.json', {}
+      file 'roles2/role2.json', {}
+      file 'users2/user2.json', {}
+
+      directory 'chef_repo2' do
+        file 'clients/client3.json', {}
+        file 'cookbooks/cookbook3/metadata.rb', ''
+        file 'data_bags/bag3/item3.json', {}
+        file 'environments/env3.json', {}
+        file 'nodes/node3.json', {}
+        file 'roles/role3.json', {}
+        file 'users/user3.json', {}
+      end
+
+      context 'when all _paths are set to alternates' do
+        before :each do
+          %w(client cookbook data_bag environment node role user).each do |object_name|
+            Chef::Config["#{object_name}_path".to_sym] = File.join(Chef::Config.chef_repo_path, "#{object_name}s2")
+          end
+          Chef::Config.chef_repo_path = File.join(Chef::Config.chef_repo_path, 'chef_repo2')
+        end
+
+        context 'when cwd is at the top level' do
+          cwd '.'
+          it 'knife list --local -R fails' do
+            knife('list --local -R').should_fail("ERROR: Attempt to use relative path '' when current directory is outside the repository path\n")
+          end
+        end
+
+        context 'when cwd is inside the data_bags directory' do
+          cwd 'data_bags'
+          it 'knife list --local -R fails' do
+            knife('list --local -R').should_fail("ERROR: Attempt to use relative path '' when current directory is outside the repository path\n")
+          end
+        end
+
+        context 'when cwd is inside chef_repo2' do
+          cwd 'chef_repo2'
+          it 'knife list --local -R lists everything' do
+            knife('list --local -R').should_succeed <<EOM
+.:
+cookbooks
+data_bags
+environments
+roles
+
+cookbooks:
+cookbook2
+
+cookbooks/cookbook2:
+metadata.rb
+
+data_bags:
+bag2
+
+data_bags/bag2:
+item2.json
+
+environments:
+env2.json
+
+roles:
+role2.json
+EOM
+          end
+        end
+
+        context 'when cwd is inside data_bags2' do
+          cwd 'data_bags2'
+          it 'knife list --local -R lists data bags' do
+            knife('list --local -R').should_succeed <<EOM
+.:
+bag2
+
+bag2:
+item2.json
+EOM
+          end
+          it 'knife list --local -R ../roles lists roles' do
+            knife('list --local -R ../roles').should_succeed "/roles/role2.json\n"
+          end
+        end
+      end
+
+      context 'when all _paths except chef_repo_path are set to alternates' do
+        before :each do
+          %w(client cookbook data_bag environment node role user).each do |object_name|
+            Chef::Config["#{object_name}_path".to_sym] = File.join(Chef::Config.chef_repo_path, "#{object_name}s2")
+          end
+        end
+
+        context 'when cwd is at the top level' do
+          cwd '.'
+          it 'knife list --local -R lists everything' do
+            knife('list --local -R').should_succeed <<EOM
+.:
+cookbooks
+data_bags
+environments
+roles
+
+cookbooks:
+cookbook2
+
+cookbooks/cookbook2:
+metadata.rb
+
+data_bags:
+bag2
+
+data_bags/bag2:
+item2.json
+
+environments:
+env2.json
+
+roles:
+role2.json
+EOM
+          end
+        end
+
+        context 'when cwd is inside the data_bags directory' do
+          cwd 'data_bags'
+          it 'knife list --local -R fails' do
+            knife('list --local -R').should_fail("ERROR: Attempt to use relative path '' when current directory is outside the repository path\n")
+          end
+        end
+
+        context 'when cwd is inside chef_repo2' do
+          cwd 'chef_repo2'
+          it 'knife list -R fails' do
+            knife('list --local -R').should_fail("ERROR: Attempt to use relative path '' when current directory is outside the repository path\n")
+          end
+        end
+
+        context 'when cwd is inside data_bags2' do
+          cwd 'data_bags2'
+          it 'knife list --local -R lists data bags' do
+            knife('list --local -R').should_succeed <<EOM
+.:
+bag2
+
+bag2:
+item2.json
+EOM
+          end
+        end
+      end
+
+      context 'when only chef_repo_path is set to its alternate' do
+        before :each do
+          %w(client cookbook data_bag environment node role user).each do |object_name|
+            Chef::Config["#{object_name}_path".to_sym] = nil
+          end
+          Chef::Config.chef_repo_path = File.join(Chef::Config.chef_repo_path, 'chef_repo2')
+        end
+
+        context 'when cwd is at the top level' do
+          cwd '.'
+          it 'knife list --local -R fails' do
+            knife('list --local -R').should_fail("ERROR: Attempt to use relative path '' when current directory is outside the repository path\n")
+          end
+        end
+
+        context 'when cwd is inside the data_bags directory' do
+          cwd 'data_bags'
+          it 'knife list --local -R fails' do
+            knife('list --local -R').should_fail("ERROR: Attempt to use relative path '' when current directory is outside the repository path\n")
+          end
+        end
+
+        context 'when cwd is inside chef_repo2' do
+          cwd 'chef_repo2'
+          it 'knife list --local -R lists everything' do
+            knife('list --local -R').should_succeed <<EOM
+.:
+cookbooks
+data_bags
+environments
+roles
+
+cookbooks:
+cookbook3
+
+cookbooks/cookbook3:
+metadata.rb
+
+data_bags:
+bag3
+
+data_bags/bag3:
+item3.json
+
+environments:
+env3.json
+
+roles:
+role3.json
+EOM
+          end
+        end
+      end
+
+      context 'when paths are set to point to both versions of each' do
+        before :each do
+          %w(client cookbooks data_bag environment node role user).each do |object_name|
+            Chef::Config["#{object_name}_path".to_sym] = [
+              File.join(Chef::Config.chef_repo_path, "#{object_name}s"),
+              File.join(Chef::Config.chef_repo_path, "#{object_name}s2")
+            ]
+          end
+          Chef::Config.chef_repo_path = File.join(Chef::Config.chef_repo_path, 'chef_repo_top')
+        end
+      end
+    end
+  end
+
   # TODO nonexistent repo_path / *_path
-  # TODO empty *_path
 end

data/spec/integration/deps_spec.rb

@@ -5,6 +5,323 @@ describe 'knife deps' do
   extend IntegrationSupport
   include KnifeSupport
 
+  context 'local' do
+    when_the_repository 'has a role with no run_list' do
+      file 'roles/starring.json', {}
+      it 'knife deps reports no dependencies' do
+        knife('deps /roles/starring.json').should_succeed "/roles/starring.json\n"
+      end
+    end
+
+    when_the_repository 'has a role with a default run_list' do
+      file 'roles/starring.json', { 'run_list' => %w(role[minor] recipe[quiche] recipe[soup::chicken]) }
+      file 'roles/minor.json', {}
+      file 'cookbooks/quiche/metadata.rb', ''
+      file 'cookbooks/quiche/recipes/default.rb', ''
+      file 'cookbooks/soup/metadata.rb', ''
+      file 'cookbooks/soup/recipes/chicken.rb', ''
+      it 'knife deps reports all dependencies' do
+        knife('deps /roles/starring.json').should_succeed <<EOM
+/roles/minor.json
+/cookbooks/quiche
+/cookbooks/soup
+/roles/starring.json
+EOM
+      end
+    end
+
+    when_the_repository 'has a role with an env_run_list' do
+      file 'roles/starring.json', { 'env_run_lists' => { 'desert' => %w(role[minor] recipe[quiche] recipe[soup::chicken]) } }
+      file 'roles/minor.json', {}
+      file 'cookbooks/quiche/metadata.rb', ''
+      file 'cookbooks/quiche/recipes/default.rb', ''
+      file 'cookbooks/soup/metadata.rb', ''
+      file 'cookbooks/soup/recipes/chicken.rb', ''
+      it 'knife deps reports all dependencies' do
+        knife('deps /roles/starring.json').should_succeed <<EOM
+/roles/minor.json
+/cookbooks/quiche
+/cookbooks/soup
+/roles/starring.json
+EOM
+      end
+    end
+
+    when_the_repository 'has a node with no environment or run_list' do
+      file 'nodes/mort.json', {}
+      it 'knife deps reports just the node' do
+        knife('deps --repo-mode=everything /nodes/mort.json').should_succeed "/nodes/mort.json\n"
+      end
+    end
+    when_the_repository 'has a node with an environment' do
+      file 'environments/desert.json', {}
+      file 'nodes/mort.json', { 'chef_environment' => 'desert' }
+      it 'knife deps reports just the node' do
+        knife('deps --repo-mode=everything /nodes/mort.json').should_succeed "/environments/desert.json\n/nodes/mort.json\n"
+      end
+    end
+    when_the_repository 'has a node with roles and recipes in its run_list' do
+      file 'roles/minor.json', {}
+      file 'cookbooks/quiche/metadata.rb', ''
+      file 'cookbooks/quiche/recipes/default.rb', ''
+      file 'cookbooks/soup/metadata.rb', ''
+      file 'cookbooks/soup/recipes/chicken.rb', ''
+      file 'nodes/mort.json', { 'run_list' => %w(role[minor] recipe[quiche] recipe[soup::chicken]) }
+      it 'knife deps reports just the node' do
+        knife('deps --repo-mode=everything /nodes/mort.json').should_succeed <<EOM
+/roles/minor.json
+/cookbooks/quiche
+/cookbooks/soup
+/nodes/mort.json
+EOM
+      end
+    end
+    when_the_repository 'has a cookbook with no dependencies' do
+      file 'cookbooks/quiche/metadata.rb', ''
+      file 'cookbooks/quiche/recipes/default.rb', ''
+      it 'knife deps reports just the cookbook' do
+        knife('deps /cookbooks/quiche').should_succeed "/cookbooks/quiche\n"
+      end
+    end
+    when_the_repository 'has a cookbook with dependencies' do
+      file 'cookbooks/kettle/metadata.rb', ''
+      file 'cookbooks/quiche/metadata.rb', 'depends "kettle"'
+      file 'cookbooks/quiche/recipes/default.rb', ''
+      it 'knife deps reports just the cookbook' do
+        knife('deps /cookbooks/quiche').should_succeed "/cookbooks/kettle\n/cookbooks/quiche\n"
+      end
+    end
+    when_the_repository 'has a data bag' do
+      file 'data_bags/bag/item.json', {}
+      it 'knife deps reports just the data bag' do
+        knife('deps /data_bags/bag/item.json').should_succeed "/data_bags/bag/item.json\n"
+      end
+    end
+    when_the_repository 'has an environment' do
+      file 'environments/desert.json', {}
+      it 'knife deps reports just the environment' do
+        knife('deps /environments/desert.json').should_succeed "/environments/desert.json\n"
+      end
+    end
+    when_the_repository 'has a deep dependency tree' do
+      file 'roles/starring.json', { 'run_list' => %w(role[minor] recipe[quiche] recipe[soup::chicken]) }
+      file 'roles/minor.json', {}
+      file 'cookbooks/quiche/metadata.rb', ''
+      file 'cookbooks/quiche/recipes/default.rb', ''
+      file 'cookbooks/soup/metadata.rb', ''
+      file 'cookbooks/soup/recipes/chicken.rb', ''
+      file 'environments/desert.json', {}
+      file 'nodes/mort.json', { 'chef_environment' => 'desert', 'run_list' => [ 'role[starring]' ] }
+      file 'nodes/bart.json', { 'run_list' => [ 'role[minor]' ] }
+
+      it 'knife deps reports all dependencies' do
+        knife('deps --repo-mode=everything /nodes/mort.json').should_succeed <<EOM
+/environments/desert.json
+/roles/minor.json
+/cookbooks/quiche
+/cookbooks/soup
+/roles/starring.json
+/nodes/mort.json
+EOM
+      end
+      it 'knife deps * reports all dependencies of all things' do
+        knife('deps --repo-mode=everything /nodes/*').should_succeed <<EOM
+/roles/minor.json
+/nodes/bart.json
+/environments/desert.json
+/cookbooks/quiche
+/cookbooks/soup
+/roles/starring.json
+/nodes/mort.json
+EOM
+      end
+      it 'knife deps a b reports all dependencies of a and b' do
+        knife('deps --repo-mode=everything /nodes/bart.json /nodes/mort.json').should_succeed <<EOM
+/roles/minor.json
+/nodes/bart.json
+/environments/desert.json
+/cookbooks/quiche
+/cookbooks/soup
+/roles/starring.json
+/nodes/mort.json
+EOM
+      end
+      it 'knife deps --tree /* shows dependencies in a tree' do
+        knife('deps --tree --repo-mode=everything /nodes/*').should_succeed <<EOM
+/nodes/bart.json
+  /roles/minor.json
+/nodes/mort.json
+  /environments/desert.json
+  /roles/starring.json
+    /roles/minor.json
+    /cookbooks/quiche
+    /cookbooks/soup
+EOM
+      end
+      it 'knife deps --tree --no-recurse shows only the first level of dependencies' do
+        knife('deps --tree --no-recurse --repo-mode=everything /nodes/*').should_succeed <<EOM
+/nodes/bart.json
+  /roles/minor.json
+/nodes/mort.json
+  /environments/desert.json
+  /roles/starring.json
+EOM
+      end
+    end
+
+    context 'circular dependencies' do
+      when_the_repository 'has cookbooks with circular dependencies' do
+        file 'cookbooks/foo/metadata.rb', 'depends "bar"'
+        file 'cookbooks/bar/metadata.rb', 'depends "baz"'
+        file 'cookbooks/baz/metadata.rb', 'depends "foo"'
+        file 'cookbooks/self/metadata.rb', 'depends "self"'
+        it 'knife deps prints each once' do
+          knife('deps /cookbooks/foo /cookbooks/self').should_succeed <<EOM
+/cookbooks/baz
+/cookbooks/bar
+/cookbooks/foo
+/cookbooks/self
+EOM
+        end
+        it 'knife deps --tree prints each once' do
+          knife('deps --tree /cookbooks/foo /cookbooks/self').should_succeed <<EOM
+/cookbooks/foo
+  /cookbooks/bar
+    /cookbooks/baz
+      /cookbooks/foo
+/cookbooks/self
+  /cookbooks/self
+EOM
+        end
+      end
+      when_the_repository 'has roles with circular dependencies' do
+        file 'roles/foo.json', { 'run_list' => [ 'role[bar]' ] }
+        file 'roles/bar.json', { 'run_list' => [ 'role[baz]' ] }
+        file 'roles/baz.json', { 'run_list' => [ 'role[foo]' ] }
+        file 'roles/self.json', { 'run_list' => [ 'role[self]' ] }
+        it 'knife deps prints each once' do
+          knife('deps /roles/foo.json /roles/self.json').should_succeed <<EOM
+/roles/baz.json
+/roles/bar.json
+/roles/foo.json
+/roles/self.json
+EOM
+        end
+        it 'knife deps --tree prints each once' do
+          knife('deps --tree /roles/foo.json /roles/self.json') do
+            stdout.should == "/roles/foo.json\n  /roles/bar.json\n    /roles/baz.json\n      /roles/foo.json\n/roles/self.json\n  /roles/self.json\n"
+            stderr.should == "WARNING: No knife configuration file found\n"
+          end
+        end
+      end
+    end
+
+    context 'missing objects' do
+      when_the_repository 'is empty' do
+        it 'knife deps /blah reports an error' do
+          knife('deps /blah').should_fail(
+            :exit_code => 2,
+            :stdout => "/blah\n",
+            :stderr => "ERROR: /blah: No such file or directory\n"
+          )
+        end
+        it 'knife deps /roles/x.json reports an error' do
+          knife('deps /roles/x.json').should_fail(
+            :exit_code => 2,
+            :stdout => "/roles/x.json\n",
+            :stderr => "ERROR: /roles/x.json: No such file or directory\n"
+          )
+        end
+        it 'knife deps /nodes/x.json reports an error' do
+          knife('deps --repo-mode=everything /nodes/x.json').should_fail(
+            :exit_code => 2,
+            :stdout => "/nodes/x.json\n",
+            :stderr => "ERROR: /nodes/x.json: No such file or directory\n"
+          )
+        end
+        it 'knife deps /environments/x.json reports an error' do
+          knife('deps /environments/x.json').should_fail(
+            :exit_code => 2,
+            :stdout => "/environments/x.json\n",
+            :stderr => "ERROR: /environments/x.json: No such file or directory\n"
+          )
+        end
+        it 'knife deps /cookbooks/x reports an error' do
+          knife('deps /cookbooks/x').should_fail(
+            :exit_code => 2,
+            :stdout => "/cookbooks/x\n",
+            :stderr => "ERROR: /cookbooks/x: No such file or directory\n"
+          )
+        end
+        it 'knife deps /data_bags/bag/item reports an error' do
+          knife('deps /data_bags/bag/item').should_fail(
+            :exit_code => 2,
+            :stdout => "/data_bags/bag/item\n",
+            :stderr => "ERROR: /data_bags/bag/item: No such file or directory\n"
+          )
+        end
+      end
+      when_the_repository 'is missing a dependent cookbook' do
+        file 'roles/starring.json', { 'run_list' => [ 'recipe[quiche]'] }
+        it 'knife deps reports the cookbook, along with an error' do
+          knife('deps /roles/starring.json').should_fail(
+            :exit_code => 2,
+            :stdout => "/cookbooks/quiche\n/roles/starring.json\n",
+            :stderr => "ERROR: /cookbooks/quiche: No such file or directory\n"
+          )
+        end
+      end
+      when_the_repository 'is missing a dependent environment' do
+        file 'nodes/mort.json', { 'chef_environment' => 'desert' }
+        it 'knife deps reports the environment, along with an error' do
+          knife('deps --repo-mode=everything /nodes/mort.json').should_fail(
+            :exit_code => 2,
+            :stdout => "/environments/desert.json\n/nodes/mort.json\n",
+            :stderr => "ERROR: /environments/desert.json: No such file or directory\n"
+          )
+        end
+      end
+      when_the_repository 'is missing a dependent role' do
+        file 'roles/starring.json', { 'run_list' => [ 'role[minor]'] }
+        it 'knife deps reports the role, along with an error' do
+          knife('deps /roles/starring.json').should_fail(
+            :exit_code => 2,
+            :stdout => "/roles/minor.json\n/roles/starring.json\n",
+            :stderr => "ERROR: /roles/minor.json: No such file or directory\n"
+          )
+        end
+      end
+    end
+    context 'invalid objects' do
+      when_the_repository 'is empty' do
+        it 'knife deps / reports itself only' do
+          knife('deps /').should_succeed("/\n")
+        end
+        it 'knife deps /roles reports an error' do
+          knife('deps /roles').should_fail(
+            :exit_code => 2,
+            :stderr => "ERROR: /roles: No such file or directory\n",
+            :stdout => "/roles\n"
+          )
+        end
+      end
+      when_the_repository 'has a data bag' do
+        file 'data_bags/bag/item.json', ''
+        it 'knife deps /data_bags/bag shows no dependencies' do
+          knife('deps /data_bags/bag').should_succeed("/data_bags/bag\n")
+        end
+      end
+      when_the_repository 'has a cookbook' do
+        file 'cookbooks/blah/metadata.rb', ''
+        it 'knife deps on a cookbook file shows no dependencies' do
+          knife('deps /cookbooks/blah/metadata.rb').should_succeed(
+            "/cookbooks/blah/metadata.rb\n"
+          )
+        end
+      end
+    end
+  end
+
   context 'remote' do
     when_the_chef_server 'has a role with no run_list' do
       role 'starring', {}
@@ -306,9 +623,9 @@ EOM
         end
       end
     end
+  end
 
-    it 'knife deps --no-recurse reports an error' do
-      knife('deps --no-recurse /').should_fail("ERROR: --no-recurse requires --tree\n")
-    end
+  it 'knife deps --no-recurse reports an error' do
+    knife('deps --no-recurse /').should_fail("ERROR: --no-recurse requires --tree\n")
   end
 end

data/spec/integration/list_spec.rb

@@ -225,7 +225,195 @@ EOM
       end
     end
 
-    # TODO different cwd
+    context 'symlink tests' do
+      when_the_repository 'is empty' do
+        context 'when cwd is at the top of the repository' do
+          cwd '.'
+
+          it "knife list -Rp --flat returns everything" do
+            knife('list -Rp --flat').should_succeed <<EOM
+cookbooks/
+cookbooks/cookbook1/
+cookbooks/cookbook1/metadata.rb
+cookbooks/cookbook2/
+cookbooks/cookbook2/metadata.rb
+cookbooks/cookbook2/recipes/
+cookbooks/cookbook2/recipes/default.rb
+data_bags/
+data_bags/bag1/
+data_bags/bag1/item1.json
+data_bags/bag1/item2.json
+data_bags/bag2/
+data_bags/bag2/item1.json
+data_bags/bag2/item2.json
+environments/
+environments/_default.json
+environments/environment1.json
+environments/environment2.json
+roles/
+roles/role1.json
+roles/role2.json
+EOM
+          end
+        end
+      end
+
+      when_the_repository 'has a cookbooks directory' do
+        directory 'cookbooks'
+        context 'when cwd is in cookbooks/' do
+          cwd 'cookbooks'
+
+          it "knife list -Rp --flat / returns everything" do
+            knife('list -Rp --flat /').should_succeed <<EOM
+./
+cookbook1/
+cookbook1/metadata.rb
+cookbook2/
+cookbook2/metadata.rb
+cookbook2/recipes/
+cookbook2/recipes/default.rb
+/data_bags/
+/data_bags/bag1/
+/data_bags/bag1/item1.json
+/data_bags/bag1/item2.json
+/data_bags/bag2/
+/data_bags/bag2/item1.json
+/data_bags/bag2/item2.json
+/environments/
+/environments/_default.json
+/environments/environment1.json
+/environments/environment2.json
+/roles/
+/roles/role1.json
+/roles/role2.json
+EOM
+          end
+
+          it "knife list -Rp --flat .. returns everything" do
+            knife('list -Rp --flat ..').should_succeed <<EOM
+./
+cookbook1/
+cookbook1/metadata.rb
+cookbook2/
+cookbook2/metadata.rb
+cookbook2/recipes/
+cookbook2/recipes/default.rb
+/data_bags/
+/data_bags/bag1/
+/data_bags/bag1/item1.json
+/data_bags/bag1/item2.json
+/data_bags/bag2/
+/data_bags/bag2/item1.json
+/data_bags/bag2/item2.json
+/environments/
+/environments/_default.json
+/environments/environment1.json
+/environments/environment2.json
+/roles/
+/roles/role1.json
+/roles/role2.json
+EOM
+          end
+
+          it "knife list -Rp --flat returns cookbooks" do
+            knife('list -Rp --flat').should_succeed <<EOM
+cookbook1/
+cookbook1/metadata.rb
+cookbook2/
+cookbook2/metadata.rb
+cookbook2/recipes/
+cookbook2/recipes/default.rb
+EOM
+          end
+        end
+      end
+
+      when_the_repository 'has a cookbooks/cookbook2 directory' do
+        directory 'cookbooks/cookbook2'
+
+        context 'when cwd is in cookbooks/cookbook2' do
+          cwd 'cookbooks/cookbook2'
+
+          it "knife list -Rp --flat returns cookbooks" do
+            knife('list -Rp --flat').should_succeed <<EOM
+metadata.rb
+recipes/
+recipes/default.rb
+EOM
+          end
+        end
+      end
+
+      when_the_repository 'has a cookbooks directory and a symlinked cookbooks directory' do
+        directory 'cookbooks'
+        symlink 'symlinked', 'cookbooks'
+
+        context 'when cwd is in cookbooks/' do
+          cwd 'cookbooks'
+
+          it "knife list -Rp --flat returns cookbooks" do
+            knife('list -Rp --flat').should_succeed <<EOM
+cookbook1/
+cookbook1/metadata.rb
+cookbook2/
+cookbook2/metadata.rb
+cookbook2/recipes/
+cookbook2/recipes/default.rb
+EOM
+          end
+        end
+
+        context 'when cwd is in symlinked/' do
+          cwd 'symlinked'
+
+          it "knife list -Rp --flat returns cookbooks" do
+            knife('list -Rp --flat').should_succeed <<EOM
+cookbook1/
+cookbook1/metadata.rb
+cookbook2/
+cookbook2/metadata.rb
+cookbook2/recipes/
+cookbook2/recipes/default.rb
+EOM
+          end
+        end
+      end
+
+      when_the_repository 'has a real_cookbooks directory and a cookbooks symlink to it' do
+        directory 'real_cookbooks'
+        symlink 'cookbooks', 'real_cookbooks'
+
+        context 'when cwd is in real_cookbooks/' do
+          cwd 'real_cookbooks'
+
+          it "knife list -Rp --flat returns cookbooks" do
+            knife('list -Rp --flat').should_succeed <<EOM
+cookbook1/
+cookbook1/metadata.rb
+cookbook2/
+cookbook2/metadata.rb
+cookbook2/recipes/
+cookbook2/recipes/default.rb
+EOM
+          end
+        end
+
+        context 'when cwd is in cookbooks/' do
+          cwd 'cookbooks'
+
+          it "knife list -Rp --flat returns cookbooks" do
+            knife('list -Rp --flat').should_succeed <<EOM
+cookbook1/
+cookbook1/metadata.rb
+cookbook2/
+cookbook2/metadata.rb
+cookbook2/recipes/
+cookbook2/recipes/default.rb
+EOM
+          end
+        end
+      end
+    end
   end
 
   context "--local" do
@@ -310,6 +498,5 @@ EOM
         end
       end
     end
-    # TODO different cwd
   end
 end

data/spec/support/integration_helper.rb

@@ -73,10 +73,22 @@ module IntegrationSupport
         end
       end
 
+      def symlink(relative_path, relative_dest)
+        filename = path_to(relative_path)
+        dir = File.dirname(filename)
+        FileUtils.mkdir_p(dir) unless dir == '.'
+        dest_filename = path_to(relative_dest)
+        File.symlink(dest_filename, filename)
+      end
+
       def path_to(relative_path)
         File.expand_path(relative_path, (@parent_path || @repository_dir))
       end
 
+      def self.path_to(relative_path)
+        File.expand_path(relative_path, (@parent_path || @repository_dir))
+      end
+
       def self.directory(relative_path, &block)
         before :each do
           directory(relative_path, &block)
@@ -89,6 +101,22 @@ module IntegrationSupport
         end
       end
 
+      def self.symlink(relative_path, relative_dest)
+        before :each do
+          symlink(relative_path, relative_dest)
+        end
+      end
+
+      def self.cwd(relative_path)
+        before :each do
+          @old_cwd = Dir.pwd
+          Dir.chdir(path_to(relative_path))
+        end
+        after :each do
+          Dir.chdir(@old_cwd)
+        end
+      end
+
       instance_eval(&block)
     end
   end

data/spec/support/knife_support.rb

@@ -1,5 +1,7 @@
 require 'chef/knife'
 require 'chef/application/knife'
+require 'logger'
+require 'chef/log'
 
 module KnifeSupport
   def knife(*args, &block)
@@ -16,6 +18,8 @@ module KnifeSupport
     # load stuff ourselves, thank you very much
     stdout = StringIO.new
     stderr = StringIO.new
+    old_loggers = Chef::Log.loggers
+    old_log_level = Chef::Log.level
     begin
       subcommand_class = Chef::Knife.subcommand_class_from(args)
       subcommand_class.options = Chef::Application::Knife.options.merge(subcommand_class.options)
@@ -27,6 +31,11 @@ module KnifeSupport
       # Don't print stuff
       Chef::Config[:verbosity] = 0
       instance.configure_chef
+      logger = Logger.new(stderr)
+      logger.formatter = proc { |severity, datetime, progname, msg| "#{severity}: #{msg}\n" }
+      Chef::Log.use_log_devices([logger])
+      Chef::Log.level = :warn
+      Chef::Log::Formatter.show_time = false
       instance.run
 
       exit_code = 0
@@ -34,6 +43,9 @@ module KnifeSupport
     # This is how rspec catches exit()
     rescue SystemExit => e
       exit_code = e.status
+    ensure
+      Chef::Log.use_log_devices(old_loggers)
+      Chef::Log.level = old_log_level
     end
 
     KnifeResult.new(stdout.string, stderr.string, exit_code)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-essentials
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-04 00:00:00.000000000 Z
+date: 2013-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-zero