Merge pull request #117 from rd2/json

Upgrades to v3.4.2. Merging, despite a (likely) circular dependency issue with OpenStudio & key gems (extended[ testing](rd2/tbd_tests#30)). Will see how this pans out for future releases.
rd2 · May 23, 2024 · 483dbdc · 483dbdc
2 parents 4f6df08 + 32fed6f
commit 483dbdc
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/lib/measures/tbd/measure.xml b/lib/measures/tbd/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>tbd_measure</name>
   <uid>8890787b-8c25-4dc8-8641-b6be1b6c2357</uid>
-  <version_id>60c77f3f-a199-4574-b946-d7261ed5ac05</version_id>
-  <version_modified>2024-05-22T13:48:21Z</version_modified>
+  <version_id>3ebf3217-230b-4420-b679-4bdf8cc51519</version_id>
+  <version_modified>2024-05-22T14:33:33Z</version_modified>
   <xml_checksum>99772807</xml_checksum>
   <class_name>TBDMeasure</class_name>
   <display_name>Thermal Bridging and Derating - TBD</display_name>
@@ -523,7 +523,7 @@
       <filename>psi.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>5ABDEC60</checksum>
+      <checksum>5ABDA733</checksum>
     </file>
     <file>
       <filename>tbd.rb</filename>
@@ -541,7 +541,7 @@
       <filename>ua.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>928C5E7B</checksum>
+      <checksum>4133AC61</checksum>
     </file>
     <file>
       <filename>utils.rb</filename>

diff --git a/lib/measures/tbd/resources/psi.rb b/lib/measures/tbd/resources/psi.rb
@@ -3308,9 +3308,9 @@ def exit(runner = nil, argh = {})
     match2 = /files/.match(file_paths[1].to_s.strip)
     match  = match1 || match2
 
-    if file_paths.size >= 2 && File.exists?(file_paths[1].to_s.strip) && match
+    if file_paths.size >= 2 && File.exist?(file_paths[1].to_s.strip) && match
       out_dir = file_paths[1].to_s.strip
-    elsif !file_paths.empty? && File.exists?(file_paths.first.to_s.strip)
+    elsif !file_paths.empty? && File.exist?(file_paths.first.to_s.strip)
       out_dir = file_paths.first.to_s.strip
     end
 

diff --git a/lib/measures/tbd/resources/ua.rb b/lib/measures/tbd/resources/ua.rb
@@ -1000,7 +1000,7 @@ def ua_md(ua = {}, lang = :en)
       model  = "* modèle : #{ua[:file]}"    if ua.key?(:file)  && lang == :fr
       model += " (v#{ua[:version]})"        if ua.key?(:version)
       report << model                   unless model.empty?
-      report << "* TBD : v3.4.0"
+      report << "* TBD : v3.4.2"
       report << "* date : #{ua[:date]}"
 
       if lang == :en

diff --git a/lib/tbd/psi.rb b/lib/tbd/psi.rb
@@ -3308,9 +3308,9 @@ def exit(runner = nil, argh = {})
     match2 = /files/.match(file_paths[1].to_s.strip)
     match  = match1 || match2
 
-    if file_paths.size >= 2 && File.exists?(file_paths[1].to_s.strip) && match
+    if file_paths.size >= 2 && File.exist?(file_paths[1].to_s.strip) && match
       out_dir = file_paths[1].to_s.strip
-    elsif !file_paths.empty? && File.exists?(file_paths.first.to_s.strip)
+    elsif !file_paths.empty? && File.exist?(file_paths.first.to_s.strip)
       out_dir = file_paths.first.to_s.strip
     end
 

diff --git a/lib/tbd/ua.rb b/lib/tbd/ua.rb
@@ -1000,7 +1000,7 @@ def ua_md(ua = {}, lang = :en)
       model  = "* modèle : #{ua[:file]}"    if ua.key?(:file)  && lang == :fr
       model += " (v#{ua[:version]})"        if ua.key?(:version)
       report << model                   unless model.empty?
-      report << "* TBD : v3.4.0"
+      report << "* TBD : v3.4.2"
       report << "* date : #{ua[:date]}"
 
       if lang == :en

diff --git a/lib/tbd/version.rb b/lib/tbd/version.rb
@@ -21,5 +21,5 @@
 # SOFTWARE.
 
 module TBD
-  VERSION = "3.4.1".freeze # TBD release version
+  VERSION = "3.4.2".freeze # TBD release version
 end