Rakefile in tbd-3.0.0 vs Rakefile in tbd-3.0.1

@@ -11,50 +11,42 @@
 task :libraries do
   puts "Updating Library Files"
 
   require "fileutils"
 
-  libs = ["topolys", "osut", "oslg", "tbd"]
-  lib_files = {}
+  libs  = ["topolys", "osut", "oslg", "tbd"]
+  files = {}
 
-  $LOAD_PATH.each do |load_path|
+  $:.each do |path|
     libs.each do |l|
-      if load_path.include?(l)
-        lib_files[l] = Dir.glob(File.join(load_path, "#{l}/*.rb"))
-
-        unless l == "topolys"
-          lib_files[l].delete_if { |f| f.include?("version.rb") }
-        end
-
-        puts "#{l} lib files:"
-        lib_files[l].each { |lf| puts "... #{lf}" }
-        puts
-      end
+      next unless path.include?(l)
+      files[l] = Dir.glob(File.join(path, "#{l}/*.rb"))
+      files[l].delete_if { |f| f.include?("version.rb") }  unless l == "topolys"
+      puts "#{l} lib files:"
+      files[l].each { |lf| puts "... #{lf}" }
+      puts
     end
   end
 
   dirs = Dir.glob(File.join(__dir__, "lib/measures/*"))
 
   dirs.each do |dir|
-    lib_files.each do |l, files|
-      files.each { |file| FileUtils.cp(file, "#{dir}/resources/.") }
+    files.values.each do |items|
+      items.each { |file| FileUtils.cp(file, "#{dir}/resources/.") }
     end
   end
 end
 
 desc "Update Measure"
-task :measure do
+task measure: [:libraries] do
   puts "Updating Measure"
 
   require "openstudio"
   require "open3"
 
-  cli = OpenStudio.getOpenStudioCLI
-  command = "#{cli} measure -t './lib/measures'"
-  puts command
-  out, err, ps = Open3.capture3({"BUNDLE_GEMFILE"=>nil}, command)
-  raise "Failed to update measures\n\n#{out}\n\n#{err}" unless ps.success?
+  cli          = OpenStudio.getOpenStudioCLI
+  command      = "#{cli} measure -t './lib/measures'"
+  out, err, ps = Open3.capture3({ "BUNDLE_GEMFILE" => nil }, command)
+  raise "Failed to update measures\n\n#{out}\n\n#{err}"       unless ps.success?
 end
-task :measure => [:libraries]
 
-# default spec test depends on updating measure and library files
-task :spec => [:measure]
+task spec: [:measure] # default spec test depends on updating measure, lib files