knife-essentials 0.3 → 0.3.1

data/lib/chef/knife/show.rb

@@ -16,7 +16,7 @@ class Chef
               begin
                 value = result.read
                 puts "#{format_path(result.path)}:"
-                output(format_for_display(result.read))
+                output(format_for_display(value))
               rescue ChefFS::FileSystem::NotFoundError
                 STDERR.puts "#{format_path(result.path)}: No such file or directory" if pattern.exact_path
               end

data/lib/chef_fs/file_system.rb

@@ -3,10 +3,6 @@ require 'chef_fs/diff'
 
 module ChefFS
   module FileSystem
-    def self.copy_to(pattern, src_root, dest_root)
-
-    end
-
     # Yields a list of all things under (and including) this entry that match the
     # given pattern.
     #
@@ -121,16 +117,18 @@ module ChefFS
         if purge
           # If we would not have uploaded it, we will not purge it.
           if src_entry.parent.can_have_child?(dest_entry.name, dest_entry.dir?)
-            Chef::Log.info("Deleting extra entry #{dest_entry.path_for_printing} (purge is on)")
             dest_entry.delete
+            puts "Delete extra entry #{dest_entry.path_for_printing} (purge is on)"
+          else
+            Chef::Log.info("Not deleting extra entry #{dest_entry.path_for_printing} (purge is off)")
           end
         end
 
       elsif !dest_entry.exists?
         if dest_entry.parent.can_have_child?(src_entry.name, src_entry.dir?)
           if src_entry.dir?
-            Chef::Log.info("Creating #{dest_entry.path_for_printing}/")
             new_dest_dir = dest_entry.parent.create_child(src_entry.name, nil)
+            puts "Created #{dest_entry.path_for_printing}/"
             # Directory creation is recursive.
             if recurse_depth != 0
               src_entry.children.each do |src_child|
@@ -139,8 +137,8 @@ module ChefFS
               end
             end
           else
-            Chef::Log.info("Creating #{dest_entry.path_for_printing}")
             dest_entry.parent.create_child(src_entry.name, src_entry.read)
+            puts "Created #{dest_entry.path_for_printing}"
           end
         end
 
@@ -163,9 +161,9 @@ module ChefFS
             # Both are files!  Copy them unless we're sure they are the same.
             different, src_value, dest_value = ChefFS::Diff.diff_files_quick(src_entry, dest_entry)
             if different || different == nil
-              Chef::Log.info("Copying #{src_entry.path_for_printing} to #{dest_entry.path_for_printing}")
               src_value = src_entry.read if src_value == :not_retrieved
               dest_entry.write(src_value)
+              puts "Updated #{dest_entry.path_for_printing}"
             end
           end
         end

data/lib/chef_fs/file_system/chef_server_root_dir.rb

@@ -1,7 +1,8 @@
 require 'chef_fs/file_system/base_fs_dir'
 require 'chef_fs/file_system/rest_list_dir'
-require 'chef_fs/file_system/data_bags_dir'
 require 'chef_fs/file_system/cookbooks_dir'
+require 'chef_fs/file_system/data_bags_dir'
+require 'chef_fs/file_system/nodes_dir'
 
 module ChefFS
   module FileSystem
@@ -42,7 +43,7 @@ module ChefFS
           CookbooksDir.new(self),
           DataBagsDir.new(self),
           RestListDir.new("environments", self),
-          RestListDir.new("nodes", self),
+          NodesDir.new(self),
           RestListDir.new("roles", self),
   #        RestListDir.new("sandboxes", self)
         ]

data/lib/chef_fs/file_system/data_bag_dir.rb

@@ -2,8 +2,6 @@ require 'chef_fs/file_system/base_fs_dir'
 require 'chef_fs/file_system/rest_list_entry'
 require 'chef_fs/file_system/not_found_error'
 
-# TODO: take environment into account
-
 module ChefFS
   module FileSystem
     class DataBagDir < RestListDir

data/lib/chef_fs/file_system/data_bags_dir.rb

@@ -1,8 +1,6 @@
 require 'chef_fs/file_system/rest_list_dir'
 require 'chef_fs/file_system/data_bag_dir'
 
-# TODO: take environment into account
-
 module ChefFS
   module FileSystem
     class DataBagsDir < RestListDir

data/lib/chef_fs/file_system/nodes_dir.rb

@@ -0,0 +1,27 @@
+require 'chef_fs/file_system/base_fs_dir'
+require 'chef_fs/file_system/rest_list_entry'
+require 'chef_fs/file_system/not_found_error'
+
+module ChefFS
+  module FileSystem
+    class NodesDir < RestListDir
+      def initialize(parent)
+        super("nodes", parent)
+      end
+
+      # Override children to respond to environment
+      def children
+        @children ||= begin
+          env_api_path = environment ? "environments/#{environment}/#{api_path}" : api_path
+          rest.get_rest(env_api_path).keys.map { |key| RestListEntry.new("#{key}.json", self, true) }
+        rescue Net::HTTPServerException
+          if $!.response.code == "404"
+            raise ChefFS::FileSystem::NotFoundError.new($!), "#{path_for_printing} not found"
+          else
+            raise
+          end
+        end
+    end
+    end
+  end
+end

data/lib/chef_fs/file_system/rest_list_dir.rb

@@ -2,8 +2,6 @@ require 'chef_fs/file_system/base_fs_dir'
 require 'chef_fs/file_system/rest_list_entry'
 require 'chef_fs/file_system/not_found_error'
 
-# TODO: take environment into account
-
 module ChefFS
   module FileSystem
     class RestListDir < BaseFSDir

data/lib/chef_fs/file_system/rest_list_entry.rb

@@ -1,10 +1,8 @@
 require 'chef_fs/file_system/base_fs_object'
 require 'chef_fs/file_system/not_found_error'
-# TODO: these are needed for rest.get_rest() to work.  This seems strange.
 require 'chef/role'
 require 'chef/node'
 
-# TODO: take environment into account
 module ChefFS
   module FileSystem
     class RestListEntry < BaseFSObject
@@ -18,7 +16,7 @@ module ChefFS
           raise "Invalid name #{path}: must end in .json"
         end
         api_child_name = name[0,name.length-5]
-        environment ? "#{parent.api_path}/#{api_child_name}/environments/#{environment}" : "#{parent.api_path}/#{api_child_name}"
+        "#{parent.api_path}/#{api_child_name}"
       end
 
       def environment

data/lib/chef_fs/version.rb

@@ -1,4 +1,4 @@
 module ChefFS
-  VERSION = "0.3"
+  VERSION = "0.3.1"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-essentials
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -42,6 +42,7 @@ files:
 - lib/chef_fs/file_system/data_bags_dir.rb
 - lib/chef_fs/file_system/file_system_entry.rb
 - lib/chef_fs/file_system/file_system_root_dir.rb
+- lib/chef_fs/file_system/nodes_dir.rb
 - lib/chef_fs/file_system/nonexistent_fs_object.rb
 - lib/chef_fs/file_system/not_found_error.rb
 - lib/chef_fs/file_system/rest_list_dir.rb