Merge pull request #321 from metricfu/fixes/invalid-yield

Fixes/invalid yield

.travis.yml

@@ -11,6 +11,7 @@ rvm:
   - 2.5
   - 2.6
   - 2.7
+  - 3.0
   - jruby
 matrix:
   allow_failures:

lib/metric_fu.rb

@@ -94,13 +94,9 @@ def loader
 
   def_delegators :loader, :lib_require, :load_tasks
 
-  def library_dirs
-    %w(metrics formatter reporting logging errors data_structures tasks)
-  end
+  LIBRARY_DIRS = %w(metrics formatter reporting logging errors data_structures tasks)
 
-  loader.create_dirs(self) do
-    library_dirs
-  end
+  loader.create_dirs(self)
 
   # @note artifact_dir is relative to where the task is being run,
   #   not to the metric_fu library
@@ -109,13 +105,9 @@ def artifact_dir
     MetricFu::Io::FileSystem.artifact_dir
   end
 
-  def artifact_subdirs
-    %w(scratch output _data)
-  end
+  ARTIFACT_SUBDIRS = %w(scratch output _data)
 
-  loader.create_artifact_subdirs(self) do
-    artifact_subdirs
-  end
+  loader.create_artifact_subdirs(self)
 
   loader.setup
 

lib/metric_fu/loader.rb

@@ -34,7 +34,7 @@ def lib_require(base = "", &_block)
     #     ::metrics_require which takes a block of files to require relative to the metrics_dir
     def create_dirs(klass)
       class << klass
-        Array(yield).each do |dir|
+        Array(LIBRARY_DIRS).each do |dir|
           define_method("#{dir}_dir") do
             File.join(lib_dir, dir)
           end
@@ -51,7 +51,7 @@ class << klass
     #     ::scratch_dir (which notably has the leading underscore removed)
     def create_artifact_subdirs(klass)
       class << klass
-        Array(yield).each do |dir|
+        Array(ARTIFACT_SUBDIRS).each do |dir|
           define_method("#{dir.gsub(/[^A-Za-z0-9]/, '')}_dir") do
             File.join(artifact_dir, dir)
           end