refactor: Config#within_root, allow skipping chdir for parallelism

zerodom30 · Nov 3, 2022 · 770ca43 · 770ca43
1 parent 2de3682
commit 770ca43
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/vite_ruby/lib/vite_ruby/builder.rb b/vite_ruby/lib/vite_ruby/builder.rb
@@ -52,7 +52,7 @@ def last_build_path(ssr:)
   # Internal: Returns a digest of all the watched files, allowing to detect
   # changes, and skip Vite builds if no files have changed.
   def watched_files_digest
-    Dir.chdir File.expand_path(config.root) do
+    config.within_root do
       files = Dir[*config.watched_paths].reject { |f| File.directory?(f) }
       file_ids = files.sort.map { |f| "#{ File.basename(f) }/#{ Digest::SHA1.file(f).hexdigest }" }
       Digest::SHA1.hexdigest(file_ids.join('/'))

diff --git a/vite_ruby/lib/vite_ruby/commands.rb b/vite_ruby/lib/vite_ruby/commands.rb
@@ -100,7 +100,7 @@ def verify_install
 
   # Internal: Prints information about ViteRuby's environment.
   def print_info
-    Dir.chdir(config.root) do
+    config.within_root do
       $stdout.puts "bin/vite present?: #{ File.exist? 'bin/vite' }"
 
       $stdout.puts "vite_ruby: #{ ViteRuby::VERSION }"

diff --git a/vite_ruby/lib/vite_ruby/config.rb b/vite_ruby/lib/vite_ruby/config.rb
@@ -75,6 +75,11 @@ def watched_paths
     ].freeze
   end
 
+  # Internal: Changes the current directory to the root dir.
+  def within_root(&block)
+    Dir.chdir(File.expand_path(root), &block)
+  end
+
 private
 
   # Internal: Coerces all the configuration values, in case they were passed

diff --git a/vite_ruby/lib/vite_ruby/runner.rb b/vite_ruby/lib/vite_ruby/runner.rb
@@ -8,7 +8,7 @@ def initialize(vite_ruby)
 
   # Public: Executes Vite with the specified arguments.
   def run(argv, exec: false)
-    Dir.chdir(config.root) {
+    config.within_root {
       cmd = command_for(argv)
       return Kernel.exec(*cmd) if exec