spec/lib/git_spec.rb in tetra-0.49.0 vs spec/lib/git_spec.rb in tetra-0.50.0

@@ -39,56 +39,95 @@
   end
 
   describe "#commit_whole_directory" do
     it "commits all contents of a directory to git for later use" do
       Dir.chdir(@git_path) do
-        File.open("file1", "w") do |file|
-          file.write "test"
-        end
+        FileUtils.touch("file1")
+        Dir.mkdir("subdir")
+        FileUtils.touch(File.join("subdir", "file2"))
 
-        @git.commit_whole_directory("test")
+        @git.commit_whole_directory("subdir", "test")
 
         files = `git ls-tree --name-only -r HEAD`.split("\n")
 
-        expect(files).to include("file1")
+        expect(files).not_to include("file1")
+        expect(files).to include("subdir/file2")
       end
     end
   end
 
-  describe "#changed_files_between"  do
-    it "lists files changed between tetra tags" do
+  describe "#changed_files" do
+    it "checks if a directory is clean from changes" do
       Dir.chdir(@git_path) do
-        File.open("file1", "w") do |file|
-          file.write "test"
-        end
+        @git.commit_file(".", "initial commit")
+        Dir.mkdir("directory")
+        FileUtils.touch(File.join("directory", "file"))
+        expect(@git.changed_files("directory", "HEAD")).to include("directory/file")
 
-        @git.commit_whole_directory("test\ntetra: test_start")
+        `git add directory/file`
+        expect(@git.changed_files("directory", "HEAD")).to include("directory/file")
 
-        File.open("file2", "w") do |file|
-          file.write "test"
-        end
-        Dir.mkdir("subdir")
-        File.open(File.join("subdir", "file3"), "w") do |file|
-          file.write "test"
-        end
+        @git.commit_file(File.join("directory", "file"), "test")
+        expect(@git.changed_files("directory", "HEAD")).to be_empty
 
-        @git.commit_whole_directory("test\ntetra: test_end")
+        expect(@git.changed_files("directory", "HEAD~")).to include("directory/file")
+      end
+    end
+  end
 
-        File.open("file4", "w") do |file|
-          file.write "test"
-        end
+  describe "#archive" do
+    it "archives a version of a directory" do
+      Dir.chdir(@git_path) do
+        @git.commit_file(".", "initial commit")
 
-        @git.commit_whole_directory("test\ntetra: test_after")
+        FileUtils.touch(File.join("outside_not_archived"))
+        Dir.mkdir("directory")
+        FileUtils.touch(File.join("directory", "file"))
+        @git.commit_file("directory", "test")
 
-        start_id = @git.latest_id("tetra: test_start")
-        end_id = @git.latest_id("tetra: test_end")
+        FileUtils.touch(File.join("directory", "later_not_archived"))
 
-        files = @git.changed_files_between(start_id, end_id, "subdir")
+        @git.commit_file("directory", "later")
 
-        expect(files).not_to include("file1")
-        expect(files).not_to include("file2")
-        expect(files).to include("subdir/file3")
-        expect(files).not_to include("file4")
+        destination_path = @git.archive("directory", @git.latest_id("test"), "archive.tar.xz")
+        expect(destination_path).to match(/archive.tar.xz$/)
+
+        file_list = `tar --list -f archive.tar.xz`.split
+        expect(file_list).not_to include("outside_not_archived")
+        expect(file_list).to include("directory/file")
+        expect(file_list).not_to include("directory/later_not_archived")
+      end
+    end
+  end
+
+  describe "#format_patch" do
+    it "creates patch files from commits" do
+      Dir.chdir(@git_path) do
+        outside_dir_file = File.join("outside_dir")
+        inside_dir_not_patched_file = File.join("directory", "inside_dir_not_patched")
+        inside_dir_patched_file = File.join("directory", "inside_dir_patched")
+
+        Dir.mkdir("directory")
+        FileUtils.touch(outside_dir_file)
+        FileUtils.touch(inside_dir_not_patched_file)
+        FileUtils.touch(inside_dir_patched_file)
+        @git.commit_file(".", "initial")
+
+        File.open(outside_dir_file, "w") { |f| f.write("A") }
+        File.open(inside_dir_patched_file, "w") { |f| f.write("A") }
+        @git.commit_file(".", "patch")
+
+        Dir.mkdir("patches")
+        patch_names = @git.format_patch("directory", "HEAD~", "patches")
+
+        expect(patch_names).to include("patches/0001-patch.patch")
+
+        patch_contents = File.readlines(File.join("patches", "0001-patch.patch"))
+        expect(patch_contents).to include("--- a/#{inside_dir_patched_file}\n")
+        expect(patch_contents).not_to include("--- a/#{outside_dir_file}\n")
+        expect(patch_contents).not_to include("--- a/#{inside_dir_not_patched_file}\n")
+        expect(patch_contents).to include("@@ -0,0 +1 @@\n")
+        expect(patch_contents).to include("+A\n")
       end
     end
   end
 end