Move BUILDKITE_BUILDER_PIPELINE_PATH override as part of command abst…

…ract (#110)

* Move BUILDKITE_BUILDER_PIPELINE_PATH override as part of command abstract

* Bump version

CHANGELOG.md

@@ -1,3 +1,9 @@
+### 4.8.0
+* Move `BUILDKITE_BUILDER_PIPELINE_PATH` override as part of command abstract.
+
+### 4.7.0
+* Remove warning of method redefined.
+
 ### 4.6.0
 * Remove `capture` concept on `Buildkite::Pipelines::Command#run` and replaced with `Buildkite::Pipelines::Command::Result` object to represent `Open3.capture3` result.
 

VERSION

@@ -1 +1 @@
-4.7.0
+4.8.0

lib/buildkite/builder/commands/abstract.rb

@@ -81,6 +81,7 @@ def log
 
         def pipeline_path
           @pipeline_path ||=
+            find_root_by_env_path ||
             find_root_by_main_pipeline ||
             find_root_by_multi_pipeline
         end
@@ -103,6 +104,13 @@ def find_root_by_multi_pipeline
             end
           end
         end
+
+        def find_root_by_env_path
+          if ENV['BUILDKITE_BUILDER_PIPELINE_PATH']
+            path = Pathname.new(ENV['BUILDKITE_BUILDER_PIPELINE_PATH'])
+            path.absolute? ? path : Builder.root.join(path)
+          end
+        end
       end
     end
   end

lib/buildkite/builder/commands/run.rb

@@ -23,19 +23,6 @@ def run
             Pipeline.new(pipeline_path, logger: log).upload
           end
         end
-
-        private
-
-        def pipeline_path
-          pipeline_path_override || super
-        end
-
-        def pipeline_path_override
-          if ENV['BUILDKITE_BUILDER_PIPELINE_PATH']
-            path = Pathname.new(ENV['BUILDKITE_BUILDER_PIPELINE_PATH'])
-            path.absolute? ? path : Builder.root.join(path)
-          end
-        end
       end
     end
   end