openstudio-extension 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7799f7b07c49bb32488b59d3c14e278cf129172966c96d331b69337581a48475
-  data.tar.gz: e0fbb5d1fc28ae39ebf76c009370c5e12cd734a86475e9599ee75bf826d3c921
+  metadata.gz: e81b50d9c1c29c4a7392098dcae7fcb6fe59a7d6c3dd28d780b71a28d1eb474a
+  data.tar.gz: 82ac54e3325692eb0ed125826b39b451f786998554d9bf6e9cf853090bca3072
 SHA512:
-  metadata.gz: bb80543411b40e8d5a2c322b54c2ae7fc8532eb90fa37c0b2c11373c2ecd5a5f0d72f0ea32feba37647b78ad26e80c06eab5c987d5286f3662927a9143c728fe
-  data.tar.gz: 47dd8aa0c31826c597de490133f2cb4f3dac33b2da874128fda8cd1c203786cc5b3e9627a83bb38179df55ab65d6b37e945e934f3abeec370406a2875baa7461
+  metadata.gz: 07fada7583c8ccd1b07c34594ed868d1b6f1ac3cce820e750a9b22a8d8e4fad238c518715db42a69544cc64cb123206828bdb02ad3bd88e490c8c0f0e084228c
+  data.tar.gz: c6a0c2038641f6cfb43feeacf976f76d3a31a52c3698f3b72f984bc581a940e4aa17639de6ed6b9617f1e8c99960942b432cf68b0da09157ec846381b0ed872d

data/.gitignore

@@ -32,6 +32,7 @@ lib/measures/test_results/*
 
 # runner conf
 runner.conf
+runner.conf.bak
 
 # Sizing run made as part of spec that tests typical_building_from_model method
 SR1

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # OpenStudio(R) Extension Gem
 
+## Version 0.8.0
+
+* [#184]( https://github.com/NREL/openstudio-extension-gem/pull/184 ), Removing model methods and model method spec tests. Most model methods moved to openstudio-standards-gem, others moved to OpenStudio C++.
+
+* Update dependencies to support Ruby 3.2.2 / OpenStudio 3.8.0
+
+## Version 0.7.1
+
+* Fixed [#169]( https://github.com/NREL/openstudio-extension-gem/pull/169 ), Replace --verbose flag to --loglevel inorder to run CI.
+* Fixed [#171]( https://github.com/NREL/openstudio-extension-gem/pull/171 ), Remove bundle flag
+* Fixed [#172]( https://github.com/NREL/openstudio-extension-gem/pull/172 ), useless commit, to trigger the CI
+* Fixed [#173]( https://github.com/NREL/openstudio-extension-gem/pull/173 ), Remove bundle flag to run in ci with new commit.
+* Fixed [#174]( https://github.com/NREL/openstudio-extension-gem/pull/174 ), Bump os-standards to 0.5.0
+
 ## Version 0.7.0
 
 * Fixed [#156]( https://github.com/NREL/openstudio-extension-gem/pull/156 ), Adding test for lab building type

data/LICENSE.md

@@ -1,4 +1,4 @@
-OpenStudio(R), Copyright (c) 2008, 2023 Alliance for Sustainable Energy, LLC.
+OpenStudio(R), Copyright (c) 2008, 2024 Alliance for Sustainable Energy, LLC.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 

data/README.md

@@ -85,6 +85,8 @@ export RUBYLIB=/Applications/OpenStudio-3.1.0/Ruby
 
 |OpenStudio Extension Gem|OpenStudio|Ruby|
 |:--------------:|:----------:|:--------:|
+| 0.8.0          | 3.8      | 3.2    |
+| 0.7.1          | 3.7      | 2.7    |
 | 0.7.0          | 3.7      | 2.7    |
 | 0.6.0          | 3.5      | 2.7    |
 | 0.6.0          | 3.5      | 2.7    |

data/lib/openstudio/extension/runner.rb

@@ -41,13 +41,14 @@ module OpenStudio
 
         # if the dirname contains a runner.conf file, then use the config file to specify the parameters
 
-        @options = OpenStudio::Extension::RunnerConfig.default_config
+        @options = OpenStudio::Extension::RunnerConfig.default_config(dirname)
         # ORDER of PRECEDENCE: default config < runner.conf file < options passed in directly
         if File.exist?(File.join(dirname, OpenStudio::Extension::RunnerConfig::FILENAME))
           puts 'Using runner options from runner.conf file'
           runner_config = OpenStudio::Extension::RunnerConfig.new(dirname)
-          # use the default values overriden with runner.conf values
-          @options = @options.merge(runner_config.options)
+          # use the default values overriden with runner.conf values where not
+          # nil nor empty strings
+          @options = @options.merge(runner_config.options.reject{|k, v| v.nil? || (v.kind_of?(String) && v === '')})
         end
 
         if !options.empty?
@@ -99,12 +100,12 @@ module OpenStudio
 
             # check existing config
             needs_config = true
-            if File.exist?('./.bundle/config') # checking wrt gemfile_dir
-              puts 'config exists'
+            if conf_bpath = Bundler.configured_bundle_path.explicit_path
+              puts 'bundler config exists'
               needs_config = false
-              config = YAML.load_file('./.bundle/config')
 
-              if config['BUNDLE_PATH'] != @bundle_install_path
+              if conf_bpath != @bundle_install_path
+                raise "Detected mistmatch between bundle's configured path #{conf_bpath} and runner configuration #{@bundle_install_path}"
                 needs_config = true
               end
 
@@ -540,12 +541,15 @@ module OpenStudio
           { glob: "#{root_dir}/**/*.html.erb", license: erb_header_text, regex: erb_regex },
           { glob: "#{root_dir}/**/*.js.erb", license: js_header_text, regex: js_regex }
         ]
+        # This is the bundle deployment folder
+        excluded_subfolders = ['vendor'].map{|d| "#{root_dir}/vendor/bundle"}
+
 
         puts "Encoding.default_external = #{Encoding.default_external}"
         puts "Encoding.default_internal = #{Encoding.default_internal}"
 
         paths.each do |path|
-          Dir[path[:glob]].each do |dir_file|
+          Dir[path[:glob]].reject{|f| excluded_subfolders.any?{|d| f[d]} }.each do |dir_file|
             puts "Updating license in file #{dir_file}"
             f = File.read(dir_file)
             if f.match?(path[:regex])

data/lib/openstudio/extension/runner_config.rb

@@ -3,13 +3,18 @@
 # See also https://openstudio.net/license
 # *******************************************************************************
 
+require 'bundler'
+require 'fileutils'
 require 'json'
+require 'parallel'
 
 module OpenStudio
   module Extension
     class RunnerConfig
       FILENAME = 'runner.conf'.freeze
 
+      DEFAULT_NPROC = Parallel.processor_count - 1
+
       ##
       # Class to store configuration of the runner options.
       ##
@@ -40,17 +45,31 @@ module OpenStudio
         @data[name.to_sym] = value
       end
 
+      def self.get_local_bundle_config_path(dirname)
+        # Bundler.settings reads from pwd, and I can't test with this...
+        bundler_settings = Bundler::Settings.new(File.join(dirname, '.bundle'))
+
+        if (bundle_install_path = bundler_settings.path.explicit_path)
+          puts "Defaulting bundle_install_path to bundle's local config value: '#{bundle_install_path}'"
+        else
+          puts "Defaulting to .bundle/install (and ignoring system wide: Bundler.configured_bundle_path.base_path=#{bundler_settings.path.base_path})"
+          bundle_install_path = File.join(dirname, '.bundle/install/')
+        end
+
+        return bundle_install_path
+      end
+
       ##
       # Return the default runner configuration
-      def self.default_config
+      def self.default_config(dirname)
         return {
           file_version: '0.1.0',
           max_datapoints: 1E9.to_i,
-          num_parallel: 2,
+          num_parallel: DEFAULT_NPROC,
           run_simulations: true,
           verbose: false,
           gemfile_path: '',
-          bundle_install_path: ''
+          bundle_install_path: get_local_bundle_config_path(dirname),
         }
       end
 
@@ -60,11 +79,19 @@ module OpenStudio
       #
       #  @param [String] dirname Directory where runner.conf file is stored, typically the root of the extension.
       def self.init(dirname)
-        File.open(File.join(dirname, FILENAME), 'w') do |f|
-          f << JSON.pretty_generate(default_config)
+        runner_conf_file = File.join(dirname, FILENAME)
+        if File.exist?(runner_conf_file)
+          puts "runner.conf already exists, saving a runner.conf.bak, previous config:"
+          puts File.read(runner_conf_file)
+          FileUtils.cp(runner_conf_file, "#{FILENAME}.bak")
+        end
+
+        config = default_config(dirname)
+        File.open(runner_conf_file, 'w') do |f|
+          f << JSON.pretty_generate(config)
         end
 
-        return default_config
+        return config
       end
 
       ##

data/lib/openstudio/extension/version.rb

@@ -5,6 +5,6 @@
 
 module OpenStudio
   module Extension
-    VERSION = '0.7.1'.freeze
+    VERSION = '0.8.0'.freeze
   end
 end

data/openstudio-extension.gemspec

@@ -26,16 +26,16 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '~> 2.7.0'
+  spec.required_ruby_version = '~> 3.2.2'
 
-  spec.add_dependency 'bcl', '~> 0.7.1'
-  spec.add_dependency 'bundler', '~> 2.1.0'
+  spec.add_dependency 'bcl', '~> 0.8.0'
+  # This only runs on the builders' machine
+  spec.add_dependency 'bundler', '2.4.10'
   spec.add_dependency 'octokit', '~> 4.18.0' # for change logs
-  spec.add_dependency 'openstudio_measure_tester', '~> 0.3.1'
-  spec.add_dependency 'openstudio-workflow', '~> 2.3.0'
+  spec.add_dependency 'openstudio_measure_tester', '~> 0.4.0'
+  spec.add_dependency 'openstudio-workflow', '~> 2.4.0'
   spec.add_dependency 'parallel', '~> 1.19.1'
 
-  spec.add_development_dependency 'openstudio-standards', '~> 0.5.0' # for os_lib unit tests
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openstudio-extension
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Katherine Fleming
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-13 00:00:00.000000000 Z
+date: 2024-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcl
@@ -19,28 +19,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.4.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.4.10
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
@@ -61,28 +61,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: openstudio-workflow
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
@@ -97,20 +97,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.19.1
-- !ruby/object:Gem::Dependency
-  name: openstudio-standards
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.5.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -186,43 +172,6 @@ files:
 - lib/measures/openstudio_extension_test_measure/resources/os_lib_helper_methods.rb
 - lib/openstudio-extension.rb
 - lib/openstudio/extension.rb
-- lib/openstudio/extension/core/CreateResults.rb
-- lib/openstudio/extension/core/check_air_sys_temps.rb
-- lib/openstudio/extension/core/check_calibration.rb
-- lib/openstudio/extension/core/check_cond_zns.rb
-- lib/openstudio/extension/core/check_domestic_hot_water.rb
-- lib/openstudio/extension/core/check_envelope_conductance.rb
-- lib/openstudio/extension/core/check_eui_by_end_use.rb
-- lib/openstudio/extension/core/check_eui_reasonableness.rb
-- lib/openstudio/extension/core/check_fan_pwr.rb
-- lib/openstudio/extension/core/check_internal_loads.rb
-- lib/openstudio/extension/core/check_mech_sys_capacity.rb
-- lib/openstudio/extension/core/check_mech_sys_efficiency.rb
-- lib/openstudio/extension/core/check_mech_sys_part_load_eff.rb
-- lib/openstudio/extension/core/check_mech_sys_type.rb
-- lib/openstudio/extension/core/check_part_loads.rb
-- lib/openstudio/extension/core/check_placeholder.rb
-- lib/openstudio/extension/core/check_plant_cap.rb
-- lib/openstudio/extension/core/check_plant_temps.rb
-- lib/openstudio/extension/core/check_plenum_loads.rb
-- lib/openstudio/extension/core/check_pump_pwr.rb
-- lib/openstudio/extension/core/check_sch_coord.rb
-- lib/openstudio/extension/core/check_schedules.rb
-- lib/openstudio/extension/core/check_simultaneous_heating_and_cooling.rb
-- lib/openstudio/extension/core/check_supply_air_and_thermostat_temp_difference.rb
-- lib/openstudio/extension/core/check_weather_files.rb
-- lib/openstudio/extension/core/deer_vintages.rb
-- lib/openstudio/extension/core/os_lib_aedg_measures.rb
-- lib/openstudio/extension/core/os_lib_constructions.rb
-- lib/openstudio/extension/core/os_lib_geometry.rb
-- lib/openstudio/extension/core/os_lib_helper_methods.rb
-- lib/openstudio/extension/core/os_lib_hvac.rb
-- lib/openstudio/extension/core/os_lib_lighting_and_equipment.rb
-- lib/openstudio/extension/core/os_lib_model_generation.rb
-- lib/openstudio/extension/core/os_lib_model_simplification.rb
-- lib/openstudio/extension/core/os_lib_outdoorair_and_infiltration.rb
-- lib/openstudio/extension/core/os_lib_reporting_qaqc.rb
-- lib/openstudio/extension/core/os_lib_schedules.rb
 - lib/openstudio/extension/rake_task.rb
 - lib/openstudio/extension/runner.rb
 - lib/openstudio/extension/runner_config.rb
@@ -233,7 +182,7 @@ licenses: []
 metadata:
   bug_tracker_uri: https://github.com/NREL/openstudio-extension-gem/issues
   changelog_uri: https://github.com/NREL/openstudio-extension-gem/blob/develop/CHANGELOG.md
-  source_code_uri: https://github.com/NREL/openstudio-extension-gem/tree/v0.7.1
+  source_code_uri: https://github.com/NREL/openstudio-extension-gem/tree/v0.8.0
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -242,14 +191,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: openstudio base gem for creating generic extensions with encapsulated data