knife-essentials 0.1

data/lib/chef_fs/file_system/file_system_root_dir.rb

@@ -0,0 +1,11 @@
+require 'chef_fs/file_system/file_system_entry'
+
+module ChefFS
+  module FileSystem
+    class FileSystemRootDir < FileSystemEntry
+      def initialize(file_path)
+        super("", nil, file_path)
+      end
+    end
+  end
+end

data/lib/chef_fs/file_system/nonexistent_fs_object.rb

@@ -0,0 +1,23 @@
+require 'chef_fs/file_system/base_fs_object'
+
+module ChefFS
+  module FileSystem
+    class NonexistentFSObject < BaseFSObject
+      def initialize(name, parent)
+        super
+      end
+
+      def exists?
+        false
+      end
+
+      def child(name)
+        NonexistentFSObject.new(name, self)
+      end
+
+      def read
+        raise ChefFS::FileSystem::NotFoundException, "Nonexistent object"
+      end
+    end
+  end
+end

data/lib/chef_fs/file_system/not_found_exception.rb

@@ -0,0 +1,12 @@
+module ChefFS
+  module FileSystem
+    class NotFoundException < Exception
+      def initialize(other_exception)
+        super(other_exception.respond_to?(:message) ? other_exception.message : message)
+        @exception = other_exception
+      end
+
+      attr_reader :exception
+    end
+  end
+end

data/lib/chef_fs/file_system/rest_list_dir.rb

@@ -0,0 +1,42 @@
+require 'chef_fs/file_system/base_fs_dir'
+require 'chef_fs/file_system/rest_list_entry'
+
+# TODO: take environment into account
+
+module ChefFS
+  module FileSystem
+    class RestListDir < BaseFSDir
+      def initialize(name, parent, api_path = nil)
+        super(name, parent)
+        @api_path = api_path || (parent.api_path == "" ? name : "#{parent.api_path}/#{name}")
+      end
+
+      attr_reader :api_path
+
+      def child(name)
+        result = @children.select { |child| child.name == name }.first if @children
+        result || RestListEntry.new(name, self)
+      end
+
+      def children
+        begin
+          @children ||= rest.get_rest(api_path).keys.map { |key| RestListEntry.new("#{key}.json", self, true) }
+        rescue Net::HTTPServerException
+          if $!.response.code == "404"
+            raise ChefFS::FileSystem::NotFoundException, $!
+          else
+            raise
+          end
+        end
+      end
+
+      def environment
+        parent.environment
+      end
+
+      def rest
+        parent.rest
+      end
+    end
+  end
+end

data/lib/chef_fs/file_system/rest_list_entry.rb

@@ -0,0 +1,72 @@
+require 'chef_fs/file_system/base_fs_object'
+require 'chef_fs/file_system/not_found_exception'
+# 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
+      def initialize(name, parent, exists = nil)
+        super(name, parent)
+        @exists = exists
+      end
+
+      def api_path
+        if name.length < 5 && name[-5,5] != ".json"
+          raise "Invalid name #{name}: must include .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}"
+      end
+
+      def environment
+        parent.environment
+      end
+
+      def exists?
+        if @exists.nil?
+          @exists = parent.children.any? { |child| child.name == name }
+        end
+        @exists
+      end
+
+      def delete
+        begin
+          rest.delete_rest(api_path)
+        rescue Net::HTTPServerException
+          if $!.response.code == "404"
+            raise ChefFS::FileSystem::NotFoundException, $!
+          else
+            raise
+          end
+        end
+      end
+
+      def read
+        begin
+          Chef::JSONCompat.to_json_pretty(rest.get_rest(api_path).to_hash)
+        rescue Net::HTTPServerException
+          if $!.response.code == "404"
+            raise ChefFS::FileSystem::NotFoundException, $!
+          else
+            raise
+          end
+        end
+      end
+
+      def rest
+        parent.rest
+      end
+
+      def content_type
+        :json
+      end
+
+      def write(contents)
+        rest.put_rest(api_path, contents)
+      end
+    end
+  end
+end

data/lib/chef_fs/knife.rb

@@ -0,0 +1,47 @@
+require 'chef_fs/file_system/chef_server_root_dir'
+require 'chef_fs/file_system/file_system_root_dir'
+require 'chef_fs/file_pattern'
+require 'chef_fs/path_utils'
+require 'chef/config'
+
+module ChefFS
+  class Knife < Chef::Knife
+    def base_path
+      @base_path ||= "/" + ChefFS::PathUtils::relative_to(File.absolute_path(Dir.pwd), chef_repo)
+    end
+
+    def chef_fs
+      @chef_fs ||= ChefFS::FileSystem::ChefServerRootDir.new("remote", Chef::Config)
+    end
+
+    def chef_repo
+      @chef_repo ||= File.absolute_path(File.join(Chef::Config.cookbook_path, ".."))
+    end
+
+    def format_path(path)
+      if path[0,base_path.length] == base_path
+        if path == base_path
+          return "."
+        elsif path[base_path.length] == "/"
+          return path[base_path.length + 1, path.length - base_path.length - 1]
+        elsif base_path == "/" && path[0] == "/"
+          return path[1, path.length - 1]
+        end
+      end
+      path
+    end
+
+    def local_fs
+      @local_fs ||= ChefFS::FileSystem::FileSystemRootDir.new(chef_repo)
+    end
+
+    def pattern_args
+      @pattern_args ||= pattern_args_from(name_args)
+    end
+
+    def pattern_args_from(args)
+      args.map { |arg| ChefFS::FilePattern::relative_to(base_path, arg) }.to_a
+    end
+
+  end
+end

data/lib/chef_fs/path_utils.rb

@@ -0,0 +1,43 @@
+require 'chef_fs'
+
+module ChefFS
+  class PathUtils
+
+    # If you are in 'source', this is what you would have to type to reach 'dest'
+    # relative_to('/a/b/c/d/e', '/a/b/x/y') == '../../c/d/e'
+    # relative_to('/a/b', '/a/b') == ''
+    def self.relative_to(dest, source)
+      # Skip past the common parts
+      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]
+        i+=1
+      end
+      # dot-dot up from 'source' to the common ancestor, then
+      # descend to 'dest' from the common ancestor
+      ChefFS::PathUtils.join(*(['..']*(source_parts.length-i) + dest_parts[i,dest.length-i]))
+    end
+
+    def self.join(*parts)
+      return "" if parts.length == 0
+      # Determine if it started with a slash
+      absolute = parts[0].length == 0 || parts[0].length > 0 && parts[0][0] =~ /^#{regexp_path_separator}/
+      # Remove leading and trailing slashes from each part so that the join will work (and the slash at the end will go away)
+      parts = parts.map { |part| part.gsub(/^\/|\/$/, "") }
+      # Don't join empty bits
+      result = parts.select { |part| part != "" }.join("/")
+      # Put the / back on
+      absolute ? "/#{result}" : result
+    end
+
+    def self.split(path)
+      path.split(Regexp.new(regexp_path_separator))
+    end
+
+    def self.regexp_path_separator
+      ChefFS::windows? ? '[/\\]' : '/'
+    end
+
+  end
+end

data/lib/chef_fs/version.rb

@@ -0,0 +1,4 @@
+module ChefFS
+  VERSION = "0.1"
+end
+

data/spec/chef_fs/diff_spec.rb

@@ -0,0 +1,263 @@
+require 'support/file_system_support'
+require 'chef_fs/diff'
+require 'chef_fs/file_pattern'
+require 'chef_fs/command_line'
+
+describe ChefFS::Diff do
+  include FileSystemSupport
+
+	context 'with two filesystems with all types of difference' do
+		let(:a) {
+			memory_fs('a', {
+				:both_dirs => {
+					:sub_both_dirs => { :subsub => nil },
+          :sub_both_files => nil,
+          :sub_both_files_different => "a\n",
+					:sub_both_dirs_empty => {},
+					:sub_a_only_dir => { :subsub => nil },
+					:sub_a_only_file => nil,
+					:sub_dir_in_a_file_in_b => {},
+					:sub_file_in_a_dir_in_b => nil
+				},
+				:both_files => nil,
+        :both_files_different => "a\n",
+				:both_dirs_empty => {},
+				:a_only_dir => { :subsub => nil },
+				:a_only_file => nil,
+				:dir_in_a_file_in_b => {},
+				:file_in_a_dir_in_b => nil
+			})
+		}
+		let(:b) {
+			memory_fs('b', {
+				:both_dirs => {
+					:sub_both_dirs => { :subsub => nil },
+					:sub_both_files => nil,
+          :sub_both_files_different => "b\n",
+					:sub_both_dirs_empty => {},
+					:sub_b_only_dir => { :subsub => nil },
+					:sub_b_only_file => nil,
+					:sub_dir_in_a_file_in_b => nil,
+					:sub_file_in_a_dir_in_b => {}
+				},
+				:both_files => nil,
+        :both_files_different => "b\n",
+				:both_dirs_empty => {},
+				:b_only_dir => { :subsub => nil },
+				:b_only_file => nil,
+				:dir_in_a_file_in_b => nil,
+				:file_in_a_dir_in_b => {}
+			})
+		}
+		it 'diffable_leaves' do
+			diffable_leaves_should_yield_paths(a, b, nil,
+        %w(
+          /both_dirs/sub_both_dirs/subsub
+          /both_dirs/sub_both_files
+          /both_dirs/sub_both_files_different
+          /both_dirs/sub_both_dirs_empty
+          /both_dirs/sub_a_only_dir
+          /both_dirs/sub_a_only_file
+          /both_dirs/sub_b_only_dir
+          /both_dirs/sub_b_only_file
+          /both_dirs/sub_dir_in_a_file_in_b
+          /both_dirs/sub_file_in_a_dir_in_b
+          /both_files
+          /both_files_different
+          /both_dirs_empty
+          /a_only_dir
+          /a_only_file
+          /b_only_dir
+          /b_only_file
+          /dir_in_a_file_in_b
+          /file_in_a_dir_in_b
+        ))
+		end
+    it 'diffable_leaves_from_pattern(/**file*)' do
+      diffable_leaves_from_pattern_should_yield_paths(pattern('/**file*'), a, b, nil,
+        %w(
+          /both_dirs/sub_both_files
+          /both_dirs/sub_both_files_different
+          /both_dirs/sub_a_only_file
+          /both_dirs/sub_b_only_file
+          /both_dirs/sub_dir_in_a_file_in_b
+          /both_dirs/sub_file_in_a_dir_in_b
+          /both_files
+          /both_files_different
+          /a_only_file
+          /b_only_file
+          /dir_in_a_file_in_b
+          /file_in_a_dir_in_b
+        ))
+    end
+    it 'diffable_leaves_from_pattern(/*dir*)' do
+      diffable_leaves_from_pattern_should_yield_paths(pattern('/*dir*'), a, b, nil,
+        %w(
+          /both_dirs/sub_both_dirs/subsub
+          /both_dirs/sub_both_files
+          /both_dirs/sub_both_files_different
+          /both_dirs/sub_both_dirs_empty
+          /both_dirs/sub_a_only_dir
+          /both_dirs/sub_a_only_file
+          /both_dirs/sub_b_only_dir
+          /both_dirs/sub_b_only_file
+          /both_dirs/sub_dir_in_a_file_in_b
+          /both_dirs/sub_file_in_a_dir_in_b
+          /both_dirs_empty
+          /a_only_dir
+          /b_only_dir
+          /dir_in_a_file_in_b
+          /file_in_a_dir_in_b
+        ))
+    end
+    it 'ChefFS::CommandLine.diff(/)' do
+      results = []
+      ChefFS::CommandLine.diff(pattern('/'), a, b, nil) do |diff|
+        results << diff.gsub(/\s+\d\d\d\d-\d\d-\d\d\s\d?\d:\d\d:\d\d\.\d{9} -\d\d\d\d/, ' DATE')
+      end
+      results.should =~ [
+        'diff --knife a/both_dirs/sub_both_files_different b/both_dirs/sub_both_files_different
+--- a/both_dirs/sub_both_files_different DATE
++++ b/both_dirs/sub_both_files_different DATE
+@@ -1 +1 @@
+-a
++b
+','Common subdirectories: /both_dirs/sub_both_dirs_empty
+','Only in a/both_dirs: sub_a_only_dir
+','diff --knife a/both_dirs/sub_a_only_file b/both_dirs/sub_a_only_file
+deleted file
+--- a/both_dirs/sub_a_only_file DATE
++++ /dev/null DATE
+@@ -1 +0,0 @@
+-sub_a_only_file
+','File b/both_dirs/sub_dir_in_a_file_in_b is a directory while file b/both_dirs/sub_dir_in_a_file_in_b is a regular file
+','File a/both_dirs/sub_file_in_a_dir_in_b is a regular file while file a/both_dirs/sub_file_in_a_dir_in_b is a directory
+','Only in b/both_dirs: sub_b_only_dir
+','diff --knife a/both_dirs/sub_b_only_file b/both_dirs/sub_b_only_file
+new file
+--- /dev/null DATE
++++ b/both_dirs/sub_b_only_file DATE
+@@ -0,0 +1 @@
++sub_b_only_file
+','diff --knife a/both_files_different b/both_files_different
+--- a/both_files_different DATE
++++ b/both_files_different DATE
+@@ -1 +1 @@
+-a
++b
+','Common subdirectories: /both_dirs_empty
+','Only in a: a_only_dir
+','diff --knife a/a_only_file b/a_only_file
+deleted file
+--- a/a_only_file DATE
++++ /dev/null DATE
+@@ -1 +0,0 @@
+-a_only_file
+','File b/dir_in_a_file_in_b is a directory while file b/dir_in_a_file_in_b is a regular file
+','File a/file_in_a_dir_in_b is a regular file while file a/file_in_a_dir_in_b is a directory
+','Only in b: b_only_dir
+','diff --knife a/b_only_file b/b_only_file
+new file
+--- /dev/null DATE
++++ b/b_only_file DATE
+@@ -0,0 +1 @@
++b_only_file
+' ]
+    end
+    it 'ChefFS::CommandLine.diff(/both_dirs)' do
+      results = []
+      ChefFS::CommandLine.diff(pattern('/both_dirs'), a, b, nil) do |diff|
+        results << diff.gsub(/\s+\d\d\d\d-\d\d-\d\d\s\d?\d:\d\d:\d\d\.\d{9} -\d\d\d\d/, ' DATE')
+      end
+      results.should =~ [
+        'diff --knife a/both_dirs/sub_both_files_different b/both_dirs/sub_both_files_different
+--- a/both_dirs/sub_both_files_different DATE
++++ b/both_dirs/sub_both_files_different DATE
+@@ -1 +1 @@
+-a
++b
+','Common subdirectories: /both_dirs/sub_both_dirs_empty
+','Only in a/both_dirs: sub_a_only_dir
+','diff --knife a/both_dirs/sub_a_only_file b/both_dirs/sub_a_only_file
+deleted file
+--- a/both_dirs/sub_a_only_file DATE
++++ /dev/null DATE
+@@ -1 +0,0 @@
+-sub_a_only_file
+','File b/both_dirs/sub_dir_in_a_file_in_b is a directory while file b/both_dirs/sub_dir_in_a_file_in_b is a regular file
+','File a/both_dirs/sub_file_in_a_dir_in_b is a regular file while file a/both_dirs/sub_file_in_a_dir_in_b is a directory
+','Only in b/both_dirs: sub_b_only_dir
+','diff --knife a/both_dirs/sub_b_only_file b/both_dirs/sub_b_only_file
+new file
+--- /dev/null DATE
++++ b/both_dirs/sub_b_only_file DATE
+@@ -0,0 +1 @@
++sub_b_only_file
+' ]
+    end
+    it 'ChefFS::CommandLine.diff(/) with depth 1' do
+      results = []
+      ChefFS::CommandLine.diff(pattern('/'), a, b, 1) do |diff|
+        results << diff.gsub(/\s+\d\d\d\d-\d\d-\d\d\s\d?\d:\d\d:\d\d\.\d{9} -\d\d\d\d/, ' DATE')
+      end
+      results.should =~ [
+'Common subdirectories: /both_dirs
+','diff --knife a/both_files_different b/both_files_different
+--- a/both_files_different DATE
++++ b/both_files_different DATE
+@@ -1 +1 @@
+-a
++b
+','Common subdirectories: /both_dirs_empty
+','Only in a: a_only_dir
+','diff --knife a/a_only_file b/a_only_file
+deleted file
+--- a/a_only_file DATE
++++ /dev/null DATE
+@@ -1 +0,0 @@
+-a_only_file
+','File b/dir_in_a_file_in_b is a directory while file b/dir_in_a_file_in_b is a regular file
+','File a/file_in_a_dir_in_b is a regular file while file a/file_in_a_dir_in_b is a directory
+','Only in b: b_only_dir
+','diff --knife a/b_only_file b/b_only_file
+new file
+--- /dev/null DATE
++++ b/b_only_file DATE
+@@ -0,0 +1 @@
++b_only_file
+' ]
+    end
+    it 'ChefFS::CommandLine.diff(/*_*) with depth 0' do
+      results = []
+      ChefFS::CommandLine.diff(pattern('/*_*'), a, b, 0) do |diff|
+        results << diff.gsub(/\s+\d\d\d\d-\d\d-\d\d\s\d?\d:\d\d:\d\d\.\d{9} -\d\d\d\d/, ' DATE')
+      end
+      results.should =~ [
+'Common subdirectories: /both_dirs
+','diff --knife a/both_files_different b/both_files_different
+--- a/both_files_different DATE
++++ b/both_files_different DATE
+@@ -1 +1 @@
+-a
++b
+','Common subdirectories: /both_dirs_empty
+','Only in a: a_only_dir
+','diff --knife a/a_only_file b/a_only_file
+deleted file
+--- a/a_only_file DATE
++++ /dev/null DATE
+@@ -1 +0,0 @@
+-a_only_file
+','File b/dir_in_a_file_in_b is a directory while file b/dir_in_a_file_in_b is a regular file
+','File a/file_in_a_dir_in_b is a regular file while file a/file_in_a_dir_in_b is a directory
+','Only in b: b_only_dir
+','diff --knife a/b_only_file b/b_only_file
+new file
+--- /dev/null DATE
++++ b/b_only_file DATE
+@@ -0,0 +1 @@
++b_only_file
+' ]
+    end
+  end
+end