tbd 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98d362f684c1cac670390347814a0fe5ed620cc86600b3207358de313a2d77b7
-  data.tar.gz: 11e5e5c8e290e5e41b58d758c7e1eaad18b07bae293799085be4708098140775
+  metadata.gz: 5ebdeeffd85c3a9e1f4adff58aa3d35a2a02877b8903ecb7c79fb599f7fd1e1b
+  data.tar.gz: ed97dce90e40b3314b1c8569719bc6ae48f4cbe2766c5119d45b8095968f54db
 SHA512:
-  metadata.gz: 8d7232262c4a483107cd3d8b44e9588fe1dedd867e93496ad589ced425ea48cc770b6b14870346a1d04fce47f97f7d933c804694851fca2eda0ee862011c974a
-  data.tar.gz: 922835ea4c1d3860b9d7a97df935f0a9a4d25e9561317c34564ca0dbfabbd612b8ca57b2acff99983b0c116381fcfe9a4369af3494ab00696afa838338d9c3b8
+  metadata.gz: 2d2e63401158cb2e7c89998e03aed05417a59a8854046e4eb8c816142156cd44d39885487e2160b772126d1278ba3dc183d417cae801119d0b1244daddc9be40
+  data.tar.gz: 4769131e58078354b451d8020b42e0f4c6e3ef3241258d6badde2d521db49cd3140ee57c5bdce176b1963e4b64ca6571736ca95bfd163808a88e7728a0d0f969

data/.gitignore

@@ -9,9 +9,8 @@ _yardoc/
 doc/
 rdoc
 
-/spec/files/osms/out/*
-/spec/files/measures/*
-/spec/files/ua/*
+/spec/files/osms/out/*.osm
+/spec/files/ua/*.md
 /json/*out.json
 
 /lib/measures/test_results/*

data/README.md

@@ -148,7 +148,6 @@ docker kill test
 
 ## Support
 
-_Merci !_ to the following organizations
+Merci aux gouvernements du [Québec](https://transitionenergetique.gouv.qc.ca) et du Canada ([CNRC](https://nrc.canada.ca/en/research-development/research-collaboration/research-centres/construction-research-centre), [CanmetÉNERGIE](https://www.nrcan.gc.ca/energy/offices-labs/canmet/ottawa-research-centre/the-built-environment/23341)).
 
-[![](https://github.com/rd2/tbd/blob/master/sponsors/quebec.png)](https://transitionenergetique.gouv.qc.ca)
-[![](https://github.com/rd2/tbd/blob/master/sponsors/canada.png)](https://nrc.canada.ca/en/research-development/research-collaboration/research-centres/construction-research-centre)
+![Thanks to the Quebec and Canadian governments](./sponsors/qc_can.png "Thanks to the Quebec and Canadian governments")

data/Rakefile

@@ -13,48 +13,40 @@ task :libraries do
 
   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

data/lib/measures/tbd/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>tbd_measure</name>
   <uid>8890787b-8c25-4dc8-8641-b6be1b6c2357</uid>
-  <version_id>88c42d96-b8a3-4848-99eb-0bf5dd11aec3</version_id>
-  <version_modified>20220824T114035Z</version_modified>
+  <version_id>ea7c945a-d074-4893-bc2c-7f48dd7ad740</version_id>
+  <version_modified>20220907T200625Z</version_modified>
   <xml_checksum>99772807</xml_checksum>
   <class_name>TBDMeasure</class_name>
   <display_name>Thermal Bridging and Derating - TBD</display_name>
@@ -445,16 +445,16 @@
       <checksum>6ED9AF88</checksum>
     </file>
     <file>
-      <filename>ua.rb</filename>
+      <filename>psi.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>AC451A5B</checksum>
+      <checksum>655E8232</checksum>
     </file>
     <file>
-      <filename>psi.rb</filename>
+      <filename>ua.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>655E8232</checksum>
+      <checksum>2BE6E743</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/tbd/resources/ua.rb

@@ -948,7 +948,7 @@ module TBD
       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.0.0"
+      report << "* TBD : v3.0.1"
       report << "* date : #{ua[:date]}"
 
       if lang == :en

data/lib/tbd/ua.rb

@@ -948,7 +948,7 @@ module TBD
       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.0.0"
+      report << "* TBD : v3.0.1"
       report << "* date : #{ua[:date]}"
 
       if lang == :en

data/lib/tbd/version.rb

@@ -21,5 +21,5 @@
 # SOFTWARE.
 
 module TBD
-  VERSION = "3.0.0".freeze
+  VERSION = "3.0.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tbd
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Denis Bourgeois & Dan Macumber
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-25 00:00:00.000000000 Z
+date: 2022-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: topolys
@@ -154,8 +154,7 @@ files:
 - lib/tbd/psi.rb
 - lib/tbd/ua.rb
 - lib/tbd/version.rb
-- sponsors/canada.png
-- sponsors/quebec.png
+- sponsors/qc_can.png
 - tbd.gemspec
 - tbd.schema.json
 - v291_MacOS.md
@@ -164,7 +163,7 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://github.com/rd2/tbd
-  source_code_uri: https://github.com/rd2/tbd/tree/v3.0.0
+  source_code_uri: https://github.com/rd2/tbd/tree/v3.0.1
   bug_tracker_uri: https://github.com/rd2/tbd/issues
 post_install_message:
 rdoc_options: []