openstudio-ee 0.12.5 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13096a1e077583f93a542a2349540b59759f2b25832273b71492212b8c49024f
-  data.tar.gz: 5f5449e9f7ff3b27c3e10d32d430313e044be059e2459d77b373c9eaa68a77ae
+  metadata.gz: d956e2182ed1efed95cf8c325a10d3e6c9ad9a770f9d6e1f7193f283a19ea7f7
+  data.tar.gz: f0b1a8a155d152dbb5aed1f4764c749475758e809b7226c2aaf8ca09a2ea2280
 SHA512:
-  metadata.gz: f45237063a6f307373a0f0a230041936b9a3f6e27d7616695ee1ce4ea3315c0111700008b8bbba6a8fc129918c8f68548853517375d361bdd700e2cc8d3c5444
-  data.tar.gz: 9822cb7821f6193121c6ce9072cd28e54974e050bbad71dd4c6726adeea0b778ece493fd02593c7198764f570e75a63d7b1e4e1102f09e3fd847aa9c785d7d4f
+  metadata.gz: e3e3b0cde5c02ec2b96bcd9bd0704f1a9f9d632d3b6553871354d327408fbd48a6ec2adfff9448a12c8b6c5572b1f317443dc9e20dca6043437e9f9728c10057
+  data.tar.gz: 7d70f591a9403143f11df127876b180de508130dea1b880241001d24c287decbaa4bf80b5b1e7990e96f2d610645ee0b119893cb31044224de49f352e19a8e60

data/.github/workflows/test-with-openstudio.yml

@@ -11,133 +11,101 @@ jobs:
       DEPLOY_PATH: ${{ github.repository }}/${{ github.ref_name }}/${{ github.run_number }} # Path for S3 deployment
       S3_BUCKET: ext-gem-dashboard
 
-    steps:
-      - name: Login to Docker Hub
-        # Authenticate with Docker Hub using repository secrets to access nrel/openstudio:develop
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }} # Ensure this secret exists in your repository or organization settings
-          password: ${{ secrets.DOCKERHUB_TOKEN }}    # Ensure this secret exists in your repository or organization settings
+    container: # Define the Docker container for the job. All subsequent steps run inside it.
+      image: nrel/openstudio:dev-3.11.0-rc3
+      options: -u root -e "LANG=en_US.UTF-8" # These options are passed to the 'docker run' command internally
 
+    steps:
       - name: Checkout Repository
-        # Checkout the repository to the runner's workspace
-        uses: actions/checkout@v4
+        # The repository will be checked out inside the 'nrel/openstudio:3.11.0' container
+        uses: actions/checkout@v4 # Use v4 for better security and features
         with:
-          submodules: true
+          submodules: true # Set to true if your repository uses Git submodules
 
-      - name: Cache Bundle Dependencies
-        # Cache gem dependencies to speed up builds and improve reliability
-        uses: actions/cache@v4
-        with:
-          path: vendor/bundle
-          key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-gems-
+      - name: Install Node.js and AWS CLI
+        # Install required dependencies for AWS actions to work in the OpenStudio container
+        shell: bash
+        run: |
+          echo "Installing Node.js and AWS CLI..."
+
+          # Update package list
+          apt-get update
+
+          # Install curl and other dependencies
+          apt-get install -y curl unzip
 
-      - name: Run Tests in OpenStudio Container
-        # Run all tests inside the OpenStudio develop container with proper authentication
+          # Install Node.js (using NodeSource repository for latest LTS)
+          curl -fsSL https://deb.nodesource.com/setup_lts.x | bash -
+          apt-get install -y nodejs
+
+          # Install AWS CLI v2
+          curl --retry 5 --retry-connrefused "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
+          unzip awscliv2.zip
+          ./aws/install
+
+          # Verify installations
+          echo "Node.js version: $(node --version)"
+          echo "npm version: $(npm --version)"
+          echo "AWS CLI version: $(aws --version)"
+
+          # Clean up
+          rm -rf awscliv2.zip aws/
+
+      - name: Verify Environment and Run Measures
+        # All 'run' commands in this job now execute inside the specified Docker container.
+        shell: bash # Specify the shell if needed, though bash is default for Ubuntu runners
         run: |
-          # Pull the develop image now that we're authenticated
-          docker pull nrel/openstudio:develop
+          # Fix git ownership issue in container
+          git config --global --add safe.directory /__w/openstudio-ee-gem/openstudio-ee-gem
           
-          # Run the container with all our test commands
-          docker run --rm \
-            -u root \
-            -e "LANG=en_US.UTF-8" \
-            -v "${{ github.workspace }}:/workspace" \
-            -w /workspace \
-            nrel/openstudio:develop \
-            bash -c '
-              set -e
-              
-              echo "Starting OpenStudio EE Gem tests..."
-              echo "Ruby: $(ruby -v)"
-              echo "OpenStudio: $(openstudio openstudio_version)"
-              
-              # Fix git ownership issue in container
-              git config --global --add safe.directory "*"
-              
-              # Install system dependencies
-              apt-get update -qq
-              apt-get install -y -qq curl unzip ca-certificates
-              
-              # Install Node.js and AWS CLI (required for some tests)
-              curl -fsSL https://deb.nodesource.com/setup_20.x | DEBIAN_FRONTEND=noninteractive bash -
-              DEBIAN_FRONTEND=noninteractive apt-get install -y -qq nodejs
-              
-              curl -fsSL "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o /tmp/awscliv2.zip
-              unzip -q /tmp/awscliv2.zip -d /tmp/
-              /tmp/aws/install
-              rm -rf /tmp/aws /tmp/awscliv2.zip
-              
-              # Install gem dependencies
-              echo "Installing gem dependencies..."
-              
-              # Clean up bundler environment
-              unset BUNDLE_GEMFILE BUNDLE_PATH BUNDLE_BIN_PATH
-              
-              # Install bundler and configure
-              gem install bundler -v 2.4.10 --no-document
-              bundle config set --local path vendor/bundle
-              bundle config set --local force_ruby_platform true
-              
-              # Install gems
-              bundle install --retry 3 --jobs 4
-              
-              # Run test suite
-              echo "Running tests..."
-              bundle exec rake
-              bundle exec rake openstudio:list_measures
-              bundle exec rake openstudio:update_measures
-              bundle exec rake openstudio:test_with_openstudio
-              
-              # Archive test results
-              if [ -d "test" ]; then
-                mv test test_with_cli_bundler
-              fi
-              
-              dir_name=$(find . -type d -name "test_results" | head -1)
-              if [ -n "$dir_name" ]; then
-                mv "$dir_name" test_results_dashboard_cli_bundler
-              fi
-              
-              echo "Tests completed successfully!"
-            '
+          echo "OpenStudio Version: $(openstudio --version)"
+          echo "Ruby Version: $(ruby -v)"
+          echo "Listing OpenStudio Gems: $(openstudio gem_list)"
+          
+          # Install dependencies before running tests
+          echo "Installing gem dependencies..."
+          bundle install
+          
+          echo "Running spec tests..."
+          rake spec
+          echo "Running measures with verbose output:"
+          # This command will execute within the container.
+          # Ensure that './lib/measures' is the correct path relative to the checkout.
+          openstudio --verbose measure -r ./lib/measures
+
+          # The output for 'test' should now be generated directly into the workspace
+          # within the container, which is mounted from the host.
+          # No 'docker cp' is needed as the workspace is shared.
+          ls -al ./test # Verify the output directory exists and contains files
 
       - name: Configure AWS Credentials
-        # Configure AWS credentials for S3 deployment
-        uses: aws-actions/configure-aws-credentials@v4
+        if: success() || failure()
+        # This step is crucial for authenticating with AWS S3
+        uses: aws-actions/configure-aws-credentials@v4 # Use v4 for updated features
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          aws-region: ${{ secrets.AWS_DEFAULT_REGION }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} # Assuming this is your secret name
+          aws-region: ${{ secrets.AWS_DEFAULT_REGION }} # Replace with your AWS region, e.g., us-east-1
 
       - name: Sync files to S3 with branch and build in path
+        if: success() || failure()
         shell: bash
         run: |
           echo "Deploying to s3://${{ env.S3_BUCKET }}/${{ env.DEPLOY_PATH }}/"
-          # Use the renamed test_results directory
-          dir_name="test_results_dashboard_cli_bundler"
-          if [ -d "$dir_name" ]; then
-            echo "TEST_RESULTS_DIR=$dir_name" >> $GITHUB_ENV
-            if ! aws s3 sync $dir_name s3://${{ env.S3_BUCKET }}/${{ env.DEPLOY_PATH }}/ \
-              --delete \
-              --acl public-read \
-              --cache-control "max-age=0, no-cache, no-store, must-revalidate"; then
-              echo "::error::Failed to sync results to S3"
-              exit 1
-            fi
-            echo "✅ S3 sync complete."
-            echo "🌐 Dashboard URL: https://${{ env.S3_BUCKET }}.s3.amazonaws.com/${{ env.DEPLOY_PATH }}/dashboard/index.html"
-          else
-            echo "::error::Test results directory $dir_name not found"
-            echo "::error::Available directories:"
-            ls -la
-            exit 1
-          fi
+          # Ensure './test_results' is the correct source directory for the files to upload to S3.
+          dir_name=$(find -type d -name "test_results")
+          # It must match the output directory from the 'Run Measures' step.
+          aws s3 sync $dir_name s3://${{ env.S3_BUCKET }}/${{ env.DEPLOY_PATH }}/ \
+            --delete \
+            --acl public-read \
+            --cache-control "max-age=0, no-cache, no-store, must-revalidate"
+          echo "S3 sync complete."
+          echo "https://${{ env.S3_BUCKET }}.s3.amazonaws.com/${{ env.DEPLOY_PATH }}/dashboard/index.html"
+          echo dir_name=$dir_name >> $GITHUB_ENV # Save the directory name to an environment variable for later use
 
       - name: Archive static site as artifact
+        if: always()
         uses: actions/upload-artifact@v4
         with:
           name: static-html-artifact
-          path: test_results_dashboard_cli_bundler          
+          path: ${{ env.dir_name }} # Path should be relative to the GitHub workspace, which is shared with the container          

data/.rubocop.yml

@@ -1,20 +1,7 @@
-inherit_mode:
-  merge:
-    - Exclude
-
 AllCops:
-  NewCops: enable
   Exclude:
     - 'spec/test_measures/**/*'
-    - 'vendor/**/*'        # Standard exclusion for all vendor code
-    - '.bundle/**/*'       # Bundler cache directory
-    - 'tmp/**/*'          # Temporary files
-    - 'node_modules/**/*' # Node.js dependencies (if applicable)
-  # Standard RuboCop behavior - these settings are actually defaults
-  DisabledByDefault: false
 
-require:
-  - rubocop-performance
-  - rubocop-rake
+require: rubocop-performance
 inherit_from:
-    - http://s3.amazonaws.com/openstudio-resources/styles/rubocop_v6.yml
+    - http://s3.amazonaws.com/openstudio-resources/styles/rubocop_v4.yml

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # OpenStudio(R) EE Gem
 
+## Version 0.13.0
+- Updated dependency (openstudio-extension gem 0.9.3 to 0.9.7)
+- Updated dependency (openstudio-standards gem 0.8.2 to 0.8.5)
+
 ## Version 0.12.5
 * Removing error from measure.xml of window enhancement measure
 

data/README.md

@@ -22,6 +22,7 @@ Or install it yourself as:
 
 |OpenStudio EE Gem|OpenStudio|Ruby|
 |:--------------:|:----------:|:--------:|
+| 0.13.0 | 3.11      | 3.2.2    |
 | 0.12.5 | 3.10      | 3.2.2    |
 | 0.12.4 | 3.10      | 3.2.2    |
 | 0.12.3 | 3.10     | 3.2.2    |

data/lib/measures/nze_hvac/measure.rb

@@ -341,7 +341,7 @@ class NzeHvac < OpenStudio::Measure::ModelMeasure
     # remove existing hvac system from model
     if remove_existing_hvac
       runner.registerInfo('Removing existing HVAC systems from the model')
-      std.remove_hvac(model)
+      OpenstudioStandards::HVAC.remove_hvac(model)
     end
 
     # exclude plenum zones, zones without thermostats, and zones with no floor area

data/lib/measures/nze_hvac/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>nze_hvac</name>
   <uid>f060dff2-b28d-4194-a6af-e66d88ddb33c</uid>
-  <version_id>9ef6d0b1-beec-4b75-a119-476f2fa9d4dc</version_id>
-  <version_modified>2025-09-25T16:10:25Z</version_modified>
+  <version_id>dc683602-6101-43a8-86b7-3da2063658a8</version_id>
+  <version_modified>2026-06-08T03:32:17Z</version_modified>
   <xml_checksum>0E5E4776</xml_checksum>
   <class_name>NzeHvac</class_name>
   <display_name>NZEHVAC</display_name>
@@ -253,12 +253,12 @@
       <version>
         <software_program>OpenStudio</software_program>
         <identifier>3.8.0</identifier>
-        <min_compatible>3.8.0</min_compatible>
+        <min_compatible>3.11.0</min_compatible>
       </version>
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>59C247DF</checksum>
+      <checksum>3A279C6D</checksum>
     </file>
     <file>
       <filename>NZEHVAC_Test.rb</filename>

data/lib/openstudio/ee_measures/version.rb

@@ -7,6 +7,6 @@
 
 module OpenStudio
   module EeMeasures
-    VERSION = '0.12.5'
+    VERSION = '0.13.0'
   end
 end

data/openstudio-ee.gemspec

@@ -29,9 +29,12 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '~> 3.2.2'
 
   spec.add_dependency 'bundler', '~> 2.4.10'
+  spec.add_dependency 'openstudio-extension', '~> 0.9.7'
+  spec.add_dependency 'openstudio-standards', '0.8.5'
+
+  # if we need the following dependencies pinned, 
+  # let's set them in extension-gem for next release
   spec.add_dependency 'multipart-post', '2.4.0'
-  spec.add_dependency 'openstudio-extension', '~> 0.9.3'
-  spec.add_dependency 'openstudio-standards', '0.8.2'
 
   spec.add_development_dependency 'octokit', '4.18.0' # for change logs
   spec.add_development_dependency 'rake', '~> 13.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openstudio-ee
 version: !ruby/object:Gem::Version
-  version: 0.12.5
+  version: 0.13.0
 platform: ruby
 authors:
 - David Goldwasser
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-10-01 00:00:00.000000000 Z
+date: 2026-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -26,47 +26,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.4.10
 - !ruby/object:Gem::Dependency
-  name: multipart-post
+  name: openstudio-extension
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 0.9.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 0.9.7
 - !ruby/object:Gem::Dependency
-  name: openstudio-extension
+  name: openstudio-standards
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.8.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.8.5
 - !ruby/object:Gem::Dependency
-  name: openstudio-standards
+  name: multipart-post
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
@@ -362,7 +362,7 @@ licenses: []
 metadata:
   bug_tracker_uri: https://github.com/NREL/openstudio-ee-gem/issues
   changelog_uri: https://github.com/NREL/openstudio-ee-gem/blob/develop/CHANGELOG.md
-  source_code_uri: https://github.com/NREL/openstudio-ee-gem/tree/v0.12.5
+  source_code_uri: https://github.com/NREL/openstudio-ee-gem/tree/v0.13.0
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []