From 9bb8713415bd35a497b7472127e5461456592c0e Mon Sep 17 00:00:00 2001 From: brgix Date: Tue, 3 Feb 2026 08:57:22 -0500 Subject: [PATCH 1/3] Tests OSut v082 (spaceWidth fix) --- .github/workflows/pull_request.yml | 18 +++++++++--------- Gemfile | 2 ++ lib/measures/tbd/measure.xml | 8 ++++---- lib/measures/tbd/resources/ua.rb | 2 +- lib/measures/tbd/resources/utils.rb | 4 ++-- lib/tbd/ua.rb | 2 +- lib/tbd/version.rb | 2 +- tbd.gemspec | 3 ++- 8 files changed, 22 insertions(+), 19 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index b0339fb..d0b957a 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -70,7 +70,7 @@ jobs: docker exec -t test bundle update docker exec -t test bundle exec rake docker kill test - test_380x: + test_390x: runs-on: ubuntu-22.04 steps: - name: Check out repository @@ -79,14 +79,14 @@ jobs: run: | echo $(pwd) echo $(ls) - docker pull nrel/openstudio:3.8.0 - docker run --name test --rm -d -t -v $(pwd):/work -w /work nrel/openstudio:3.8.0 + docker pull nrel/openstudio:3.9.0 + docker run --name test --rm -d -t -v $(pwd):/work -w /work nrel/openstudio:3.9.0 docker exec -t test pwd docker exec -t test ls docker exec -t test bundle update docker exec -t test bundle exec rake docker kill test - test_390x: + test_310x: runs-on: ubuntu-22.04 steps: - name: Check out repository @@ -95,14 +95,14 @@ jobs: run: | echo $(pwd) echo $(ls) - docker pull nrel/openstudio:3.9.0 - docker run --name test --rm -d -t -v $(pwd):/work -w /work nrel/openstudio:3.9.0 + docker pull nrel/openstudio:3.10.0 + docker run --name test --rm -d -t -v $(pwd):/work -w /work nrel/openstudio:3.10.0 docker exec -t test pwd docker exec -t test ls docker exec -t test bundle update docker exec -t test bundle exec rake docker kill test - test_3100x: + test_311x: runs-on: ubuntu-22.04 steps: - name: Check out repository @@ -111,8 +111,8 @@ jobs: run: | echo $(pwd) echo $(ls) - docker pull nrel/openstudio:3.10.0 - docker run --name test --rm -d -t -v $(pwd):/work -w /work nrel/openstudio:3.10.0 + docker pull nrel/openstudio:3.11.0 + docker run --name test --rm -d -t -v $(pwd):/work -w /work nrel/openstudio:3.11.0 docker exec -t test pwd docker exec -t test ls docker exec -t test bundle update diff --git a/Gemfile b/Gemfile index b4e2a20..6aed2f7 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,5 @@ source "https://rubygems.org" +gem "osut", git: "https://github.com/rd2/osut", branch: "width" + gemspec diff --git a/lib/measures/tbd/measure.xml b/lib/measures/tbd/measure.xml index 032a0f9..c24d529 100644 --- a/lib/measures/tbd/measure.xml +++ b/lib/measures/tbd/measure.xml @@ -3,8 +3,8 @@ 3.1 tbd_measure 8890787b-8c25-4dc8-8641-b6be1b6c2357 - 8649cb7e-2e58-4a6d-ba67-911b6e0a41a6 - 2026-01-04T12:08:45Z + 833dbf17-e51f-43c7-9c8b-a79ef0e6bd3b + 2026-02-03T13:53:54Z 99772807 TBDMeasure Thermal Bridging and Derating - TBD @@ -541,13 +541,13 @@ ua.rb rb resource - 69C2A886 + D3A2A391 utils.rb rb resource - BDF50D67 + 118F3A32 version.rb diff --git a/lib/measures/tbd/resources/ua.rb b/lib/measures/tbd/resources/ua.rb index 6390968..c4caad3 100644 --- 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.5.1" + report << "* TBD : v3.5.2" report << "* date : #{ua[:date]}" if lang == :en diff --git a/lib/measures/tbd/resources/utils.rb b/lib/measures/tbd/resources/utils.rb index 09bb951..2e96f59 100644 --- a/lib/measures/tbd/resources/utils.rb +++ b/lib/measures/tbd/resources/utils.rb @@ -4825,7 +4825,7 @@ def spaceWidth(space = nil) end end - res = realignedFace(polyg.to_a.reverse) + res = realignedFace(polyg.to_a.reverse, true) return 0 if res[:box].nil? # A bounded box's 'height', at its narrowest, is its 'width'. @@ -4904,7 +4904,7 @@ def genAnchors(s = nil, set = [], tag = :box) # to 'genAnchors'), it inherits key :out - a Hash holding (among others) a # 'realigned' set of points (by default a 'realigned' :box). The latter is # typically generated from an outdoor-facing roof (e.g. when called from - # 'lights'). Subsequent calls to 'genAnchors' may send (as first + # 'addSkylights'). Subsequent calls to 'genAnchors' may send (as first # argument) a corresponding ceiling tile below (also from 'addSkylights'). # Roof vs ceiling may neither share alignment transformation nor space # site transformation identities. All subsequent calls to 'genAnchors' diff --git a/lib/tbd/ua.rb b/lib/tbd/ua.rb index 6390968..c4caad3 100644 --- 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.5.1" + report << "* TBD : v3.5.2" report << "* date : #{ua[:date]}" if lang == :en diff --git a/lib/tbd/version.rb b/lib/tbd/version.rb index 9e36e35..cd125f1 100644 --- a/lib/tbd/version.rb +++ b/lib/tbd/version.rb @@ -21,5 +21,5 @@ # SOFTWARE. module TBD - VERSION = "3.5.1".freeze + VERSION = "3.5.2".freeze end diff --git a/tbd.gemspec b/tbd.gemspec index 65cd3b1..ee4ef9a 100644 --- a/tbd.gemspec +++ b/tbd.gemspec @@ -29,9 +29,10 @@ Gem::Specification.new do |s| s.metadata = {} s.add_dependency "topolys", "~> 0" - s.add_dependency "osut", "~> 0.8.1" + # s.add_dependency "osut", "~> 0" s.add_dependency "json-schema", "~> 4" + s.add_development_dependency "osut", "~> 0.8.2" s.add_development_dependency "bundler", "~> 2.1" s.add_development_dependency "rake", "~> 13.0" s.add_development_dependency "rspec", "~> 3.11" From 3ede62420d3a2660950b5181ecd907401ab3441f Mon Sep 17 00:00:00 2001 From: brgix Date: Tue, 3 Feb 2026 11:17:42 -0500 Subject: [PATCH 2/3] Pulls OSut v0.8.2 --- Gemfile | 2 +- tbd.gemspec | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 6aed2f7..1fdce1e 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source "https://rubygems.org" -gem "osut", git: "https://github.com/rd2/osut", branch: "width" +# gem "osut", git: "https://github.com/rd2/osut", branch: "width" gemspec diff --git a/tbd.gemspec b/tbd.gemspec index ee4ef9a..d126563 100644 --- a/tbd.gemspec +++ b/tbd.gemspec @@ -29,10 +29,10 @@ Gem::Specification.new do |s| s.metadata = {} s.add_dependency "topolys", "~> 0" - # s.add_dependency "osut", "~> 0" + s.add_dependency "osut", "~> 0" s.add_dependency "json-schema", "~> 4" - s.add_development_dependency "osut", "~> 0.8.2" + # s.add_development_dependency "osut", "~> 0.8.2" s.add_development_dependency "bundler", "~> 2.1" s.add_development_dependency "rake", "~> 13.0" s.add_development_dependency "rspec", "~> 3.11" From bed2d1e5c665fdd92a8a57dae95ce77fe0759d59 Mon Sep 17 00:00:00 2001 From: brgix Date: Tue, 3 Feb 2026 11:46:02 -0500 Subject: [PATCH 3/3] Pre-merge cleanup --- Gemfile | 2 -- tbd.gemspec | 1 - 2 files changed, 3 deletions(-) diff --git a/Gemfile b/Gemfile index 1fdce1e..b4e2a20 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,3 @@ source "https://rubygems.org" -# gem "osut", git: "https://github.com/rd2/osut", branch: "width" - gemspec diff --git a/tbd.gemspec b/tbd.gemspec index d126563..14956fb 100644 --- a/tbd.gemspec +++ b/tbd.gemspec @@ -32,7 +32,6 @@ Gem::Specification.new do |s| s.add_dependency "osut", "~> 0" s.add_dependency "json-schema", "~> 4" - # s.add_development_dependency "osut", "~> 0.8.2" s.add_development_dependency "bundler", "~> 2.1" s.add_development_dependency "rake", "~> 13.0" s.add_development_dependency "rspec", "~> 3.11"