Ensure we require Pathname in standalone mode too

Author: stevenharman

lib/git_tracker/commit_message.rb

@@ -1,3 +1,5 @@
+require "pathname"
+
 module GitTracker
   class CommitMessage
     def initialize(file)

lib/git_tracker/hook.rb

@@ -1,3 +1,4 @@
+require "pathname"
 require "git_tracker/repository"
 
 module GitTracker

lib/git_tracker/standalone.rb

@@ -1,8 +1,10 @@
+require "pathname"
+
 module GitTracker
   module Standalone
     extend self
 
-    GIT_TRACKER_ROOT = File.expand_path("../../..", __FILE__)
+    GIT_TRACKER_ROOT = Pathname(__dir__).join("../..")
     PREAMBLE = <<~DOC
       #
       # This file is generated code. DO NOT send patches for it.
@@ -17,7 +19,7 @@ def build(io)
       io.puts(PREAMBLE)
 
       each_source_file do |filename|
-        File.open(filename, "r") do |source|
+        Pathname(filename).open("r") do |source|
           inline_source(source, io)
         end
       end
@@ -26,9 +28,9 @@ def build(io)
       io
     end
 
-    def save(filename, path = ".")
-      dest = File.join(File.expand_path(path), filename)
-      File.open(dest, "w") do |f|
+    def save(filename, path: ".")
+      dest = Pathname(path).join(filename).expand_path
+      dest.open("w") do |f|
         build(f)
         f.chmod(0o755)
       end
@@ -37,10 +39,10 @@ def save(filename, path = ".")
     private
 
     def each_source_file
-      File.open(File.join(GIT_TRACKER_ROOT, "lib/git_tracker.rb"), "r") do |main|
+      GIT_TRACKER_ROOT.join("lib/git_tracker.rb").open("r") do |main|
         main.each_line do |req|
           if req =~ /^require\s+["'](.+)["']/
-            yield File.join(GIT_TRACKER_ROOT, "lib", "#{$1}.rb")
+            yield GIT_TRACKER_ROOT.join("lib/#{$1}.rb").to_path
           end
         end
       end

spec/git_tracker/standalone_spec.rb

@@ -2,22 +2,25 @@
 
 RSpec.describe GitTracker::Standalone do
   describe "#save" do
-    before do
-      File.delete "git-tracker" if File.exist? "git-tracker"
-    end
+    let(:binary) { Pathname(pkg_dir).join("git-tracker") }
+    let(:pkg_dir) { Pathname(@pkg_dir).to_path }
 
-    after do
-      File.delete "git-tracker" if File.exist? "git-tracker"
+    around do |example|
+      Dir.mktmpdir do |dir|
+        @pkg_dir = dir
+        example.call
+        remove_instance_variable(:@pkg_dir)
+      end
     end
 
     it "saves to the named file" do
-      described_class.save("git-tracker")
-      expect(File.size("./git-tracker")).to be > 100
+      described_class.save("git-tracker", path: pkg_dir)
+      expect(binary.size).to be > 100
     end
 
     it "marks the binary as executable" do
-      described_class.save("git-tracker")
-      expect(File).to be_executable("./git-tracker")
+      described_class.save("git-tracker", path: pkg_dir)
+      expect(binary).to be_executable
     end
   end
 
@@ -59,6 +62,10 @@
       expect(standalone_script).to include("GitTracker::Runner.call(*ARGV)")
     end
 
+    it "includes requiring code from stdlib" do
+      expect(standalone_script).to match(/^require\s+["']pathname/)
+    end
+
     it "excludes requiring git_tracker code" do
       expect(standalone_script).to_not match(/^require\s+["']git_tracker/)
     end