Use with_tempfile and datapath in spec/compiler

Author: straight-shoota

spec/compiler/compiler_spec.cr

@@ -1,32 +1,26 @@
 require "../spec_helper"
-require "tempfile"
+require "./spec_helper"
 
 describe "Compiler" do
   it "compiles a file" do
-    tempfile = Tempfile.new "compiler_spec_output"
-    tempfile.close
+    with_tempfile "compiler_spec_output" do |path|
+      Crystal::Command.run ["build", datapath("compiler_sample"), "-o", path]
 
-    Crystal::Command.run ["build", "#{__DIR__}/data/compiler_sample", "-o", tempfile.path]
+      File.exists?(path).should be_true
 
-    File.exists?(tempfile.path).should be_true
-
-    `#{tempfile.path}`.should eq("Hello!")
-  ensure
-    File.delete(tempfile.path) if tempfile
+      `#{path}`.should eq("Hello!")
+    end
   end
 
   it "runs subcommand in preference to a filename " do
-    Dir.cd "#{__DIR__}/data/" do
-      tempfile = Tempfile.new "compiler_spec_output"
-      tempfile.close
-
-      Crystal::Command.run ["build", "#{__DIR__}/data/compiler_sample", "-o", tempfile.path]
+    Dir.cd datapath do
+      with_tempfile "compiler_spec_output" do |path|
+        Crystal::Command.run ["build", "compiler_sample", "-o", path]
 
-      File.exists?(tempfile.path).should be_true
+        File.exists?(path).should be_true
 
-      `#{tempfile.path}`.should eq("Hello!")
-    ensure
-      File.delete(tempfile.path) if tempfile
+        `#{path}`.should eq("Hello!")
+      end
     end
   end
 end

spec/compiler/crystal/tools/init_spec.cr

@@ -5,8 +5,6 @@ require "ini"
 require "spec"
 require "yaml"
 
-PROJECT_ROOT_DIR = "#{__DIR__}/../../../.."
-
 private def exec_init(project_name, project_dir = nil, type = "lib", force = false, skip_existing = false)
   args = [type, project_name]
   args << project_dir if project_dir
@@ -21,14 +19,11 @@ end
 # Creates a temporary directory, cd to it and run the block inside it.
 # The directory and its content is deleted when the block return.
 private def within_temporary_directory
-  tmp_path = "#{PROJECT_ROOT_DIR}/tmp/init_spec_tmp_dir-#{Process.pid}"
-  Dir.mkdir_p(tmp_path)
-  begin
+  with_tempfile "init_spec_tmp" do |tmp_path|
+    Dir.mkdir_p(tmp_path)
     Dir.cd(tmp_path) do
       yield
     end
-  ensure
-    FileUtils.rm_rf(tmp_path)
   end
 end
 

spec/compiler/spec_helper.cr

@@ -0,0 +1,6 @@
+require "../spec_helper"
+require "../support/tempfile"
+
+def datapath(*components)
+  File.join("spec", "compiler", "data", *components)
+end