Switch expand_path on file to expand_path on dir

Remove a .. here Signed-off-by: Tim Smith <tsmith@chef.io>
chef · Aug 24, 2020 · 48d99b4 · 48d99b4
1 parent 3eae1cd
commit 48d99b4
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/bin/omnibus b/bin/omnibus
@@ -4,7 +4,7 @@
 # https://twitter.com/mitchellh/status/283014103189053442
 Signal.trap("INT") { exit 1 }
 
-$:.push File.expand_path("../../lib", __FILE__)
+$:.push File.expand_path("../lib", __dir__)
 $stdout.sync = true
 
 require "omnibus/cli"

diff --git a/lib/omnibus.rb b/lib/omnibus.rb
@@ -208,7 +208,7 @@ def project(name)
     # @return [Pathname]
     #
     def source_root
-      @source_root ||= Pathname.new(File.expand_path("../..", __FILE__))
+      @source_root ||= Pathname.new(File.expand_path("..", __dir__))
     end
 
     #

diff --git a/lib/omnibus/generator.rb b/lib/omnibus/generator.rb
@@ -73,7 +73,7 @@ class Generator < Thor::Group
     class << self
       # Set the source root for Thor
       def source_root
-        File.expand_path("../generator_files", __FILE__)
+        File.expand_path("generator_files", __dir__)
       end
     end
 

diff --git a/omnibus.gemspec b/omnibus.gemspec
@@ -1,4 +1,4 @@
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "omnibus/version"
 

diff --git a/spec/support/path_helpers.rb b/spec/support/path_helpers.rb
@@ -6,13 +6,13 @@ def fixture_path(*pieces)
       end
 
       def tmp_path
-        File.expand_path("../../tmp", __FILE__)
+        File.expand_path("../tmp", __dir__)
       end
 
       private
 
       def fixtures_path
-        File.expand_path("../../fixtures", __FILE__)
+        File.expand_path("../fixtures", __dir__)
       end
     end
   end