Locating files in Main

Author: beatmadsen

lib/files_in_my_diff/commit.rb

@@ -14,11 +14,10 @@ def call
         validate_folder!
         diff = @git_strategy.diff(@revision)
         diff.validate!
-        diff.changes
         dir = @file_strategy.create_tmp_dir(diff.sha)
         @git_strategy.checkout_worktree(dir, diff.sha)
-        # @file_strategy.locate_files(dir, changes)
-        { dir:, sha: diff.sha }
+        decorated = @file_strategy.locate_files(dir, diff.changes)
+        { dir:, sha: diff.sha, changes: decorated }
       end
 
       private

lib/files_in_my_diff/tmp_dir.rb

@@ -3,6 +3,7 @@
 module FilesInMyDiff
   module TmpDir
     class DirectoryError < FilesInMyDiff::Error; end
+    class FileError < FilesInMyDiff::Error; end
 
     module FileStrategy
       def self.dir_exists?(folder)
@@ -16,6 +17,11 @@ def self.create_tmp_dir(sha)
       rescue StandardError => e
         raise DirectoryError, "Failed to create tmp dir for #{sha}: #{e.message}"
       end
+
+      def self.locate_files(_dir, changes)
+        # TODO
+        changes
+      end
     end
   end
 end

test/commit/main_test.rb

@@ -44,24 +44,40 @@ def test_that_error_on_checkout_is_propagated
         end
       end
 
+      def test_that_error_on_locating_files_is_propagated
+        file_strategy = file_strategy_stub(locate_files_success: false)
+        assert_raises(TmpDir::FileError) do
+          subject(file_strategy:).call
+        end
+      end
+
+      def test_that_main_returns_dir_and_sha_and_changes
+        result = subject.call
+
+        refute_empty result[:dir]
+        refute_empty result[:sha]
+        refute_empty result[:changes]
+      end
+
       private
 
       def subject(folder: 'x', revision: 'HEAD', file_strategy: file_strategy_stub, git_strategy: git_strategy_stub)
         Main.new(folder:, revision:, file_strategy:, git_strategy:)
       end
 
-      def file_strategy_stub(dir_exists: true, create_success: true)
-        FileStrategyStub.new(dir_exists, create_success)
+      def file_strategy_stub(dir_exists: true, create_success: true, locate_files_success: true)
+        FileStrategyStub.new(dir_exists, create_success, locate_files_success)
       end
 
       def git_strategy_stub(revision_exists: true, diff_success: true, checkout_success: true)
         GitStrategyStub.new(revision_exists, diff_success, checkout_success)
       end
 
       class FileStrategyStub
-        def initialize(dir_exists, create_success)
+        def initialize(dir_exists, create_success, locate_files_success)
           @dir_exists = dir_exists
           @create_success = create_success
+          @locate_files_success = locate_files_success
         end
 
         def dir_exists?(_folder)
@@ -73,6 +89,12 @@ def create_tmp_dir(_sha)
 
           'some_tpm_dir'
         end
+
+        def locate_files(_dir, _changes)
+          raise TmpDir::FileError unless @locate_files_success
+
+          [{}, {}]
+        end
       end
 
       class GitStrategyStub