Refactoring towards RevisionDir, cleanup

Author: beatmadsen

lib/files_in_my_diff/tmp_dir.rb

@@ -1,63 +1,11 @@
 # frozen_string_literal: true
 
+require_relative 'tmp_dir/revision_dir'
+require_relative 'tmp_dir/file_strategy'
+
 module FilesInMyDiff
   module TmpDir
     class DirectoryError < FilesInMyDiff::Error; end
     class FileError < FilesInMyDiff::Error; end
-
-    module FileStrategy
-      def self.dir_exists?(folder)
-        Dir.exist?(folder)
-      end
-
-      def self.tmpdir
-        Dir.tmpdir
-      rescue StandardError => e
-        raise DirectoryError, "Failed to locate tmpdir: #{e.message}"
-      end
-
-      def self.mkdir_p(path)
-        FileUtils.mkdir_p(path)
-      rescue SystemCallError => e
-        raise DirectoryError, "Failed to create tmp dir for #{path}: #{e.message}"
-      end
-
-      def self.revision_dir(sha)
-        RevisionDir.new(sha:)
-      end
-    end
-
-    class RevisionDir
-      attr_reader :dir
-
-      def initialize(sha:, file_strategy: FileStrategy)
-        @sha = sha
-        @file_strategy = file_strategy
-      end
-
-      def create!
-        tmpdir = @file_strategy.tmpdir
-        @dir = File.join(tmpdir, 'files_in_my_diff', @sha)
-        @file_strategy.mkdir_p(@dir)
-      end
-
-      def decorate(changes)
-        raise DirectoryError, "Directory for #{@sha} not yet created" if @dir.nil?
-
-        d_changes = changes.map do |change|
-          change => { path:, type: }
-          { full_path: full_path(path), relative_path: path, type: }
-        end
-        { dir: @dir, sha: @sha, changes: d_changes }
-      end
-
-      private
-
-      def full_path(relative_path)
-        File.join(@dir, relative_path)
-      rescue StandardError => e
-        raise FileError, "Failed to create full path for #{relative_path}: #{e.message}"
-      end
-    end
   end
 end

lib/files_in_my_diff/tmp_dir/file_strategy.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module FilesInMyDiff
+  module TmpDir
+    module FileStrategy
+      def self.dir_exists?(folder)
+        Dir.exist?(folder)
+      end
+
+      def self.tmpdir
+        Dir.tmpdir
+      rescue StandardError => e
+        raise DirectoryError, "Failed to locate tmpdir: #{e.message}"
+      end
+
+      def self.mkdir_p(path)
+        FileUtils.mkdir_p(path)
+      rescue SystemCallError => e
+        raise DirectoryError, "Failed to create tmp dir for #{path}: #{e.message}"
+      end
+
+      def self.revision_dir(sha)
+        RevisionDir.new(sha:)
+      end
+    end
+  end
+end

lib/files_in_my_diff/tmp_dir/revision_dir.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module FilesInMyDiff
+  module TmpDir
+    class RevisionDir
+      attr_reader :dir
+
+      def initialize(sha:, file_strategy: FileStrategy)
+        @sha = sha
+        @file_strategy = file_strategy
+      end
+
+      def create!
+        tmpdir = @file_strategy.tmpdir
+        @dir = File.join(tmpdir, 'files_in_my_diff', @sha)
+        @file_strategy.mkdir_p(@dir)
+      end
+
+      def decorate(changes)
+        raise DirectoryError, "Directory for #{@sha} not yet created" if @dir.nil?
+
+        d_changes = changes.map do |change|
+          change => { path:, type: }
+          { full_path: full_path(path), relative_path: path, type: }
+        end
+        { dir: @dir, sha: @sha, changes: d_changes }
+      end
+
+      private
+
+      def full_path(relative_path)
+        File.join(@dir, relative_path)
+      rescue StandardError => e
+        raise FileError, "Failed to create full path for #{relative_path}: #{e.message}"
+      end
+    end
+  end
+end