openstudio-extension 0.2.5 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75c383235ef747996dd9484f715ab090201aeae62521c44f7166e4664057c83b
-  data.tar.gz: dc5e71c966b27041394772057b6c2625a735d34e6f1864e39d46378483743f3e
+  metadata.gz: b3d8f8d5d29b245e183160f8df682f54f5b8517bed970dd89e030f9c596df165
+  data.tar.gz: 76979144d0c024f6e5a19619ef2586f0579fd7dbae0d3681b97d9b069f158d47
 SHA512:
-  metadata.gz: 0bca71f3d261ddd15966a690859f01c5c6344259e96069f844ebf0da0bd395c18d79d6d8e48a680faa74a627e30aae38833c00a4c3ae3f29dfd8f4f47a2499b8
-  data.tar.gz: b50492d24de160505451599128ee177289ceac185bfd9ea560cd2447683ecef7c569699f59094c6b531feaf61810c18e027c0aa8ab11b2c9f9b3748a3fae4ee4
+  metadata.gz: 5e7fe94e1472d9bdeb47ce805d527b261b7ad99a542205bb7ec810f1b56be189ccaee4a3cd71332d6d8b17c1121d4e699ca58daed5c6079a0fd1fb7fee5280ed
+  data.tar.gz: f52a12a09efc3b934317ec42862958b88b74f0ff5dda5e706887b5fbbb5a3cab60b4ce97bf86bf972e085a58b6fb0e87f9c5817e75d3e37aaecdb981c8541b2a

data/.gitignore

@@ -1,6 +1,7 @@
 /.bundle/
 /.yardoc
 /.ruby-version
+/.python-version
 /Gemfile.lock
 /gems
 /_yardoc/
@@ -9,6 +10,7 @@
 /pkg/
 /spec/reports/
 /spec/test/
+/spec/openstudio/core/output/*
 /tmp/
 /test/
 /lib/measures/test_results
@@ -29,3 +31,6 @@ lib/measures/test_results/*
 
 # runner conf
 runner.conf
+
+# Sizing run made as part of spec that tests typical_building_from_model method
+SR1

data/CHANGELOG.md

@@ -1,5 +1,33 @@
 # OpenStudio Extension Gem
 
+## Version 0.4.0
+
+* Fix merging of options on initialization. Options hash will overwrite the default config AND the runner.conf files.
+* Includes patch of 0.2.6 (failed.job and finished.job)
+* Support Ruby 2.7.0, Bundler > 2.2
+* Update copyrights
+
+## Version 0.3.2
+
+* Update Extension Gem Template
+* Add gemfile path instead of just dirname to the initialization
+* Update to latest workflow gem to support URBANopt Workflow
+
+## Version 0.3.1
+
+* This change first zeroes-out latent (for good measure) and radiant fractions before setting lost fraction to 1.0 to avoid this error.
+
+## Version 0.3.0
+
+* remove the os_lib_reporting.rb helpers. This file is only used for OS reporting measure and should not be shared with other users.
+* Upgrade dependency to openstudio-workflow gem to `~> 2.1.0`
+* This version works only with EnergyPlus 9.4 since it depends on OpenStudio workflow `~> 2.1.0`
+
+## Version 0.2.6
+
+- Check that `failed.job` doesn't exist and `finished.job` does exist.
+- Fixed [#98](https://github.com/NREL/openstudio-extension-gem/issues/98)
+
 ## Version 0.2.5
 
 * Support runner options for bundle_install_path and gemfile_path

data/Gemfile

@@ -1,4 +1,6 @@
 source 'http://rubygems.org'
 
 # Specify your gem's dependencies in openstudio-extension.gemspec
+
 gemspec
+

data/Jenkinsfile

@@ -1,6 +1,6 @@
 //Jenkins pipelines are stored in shared libaries. Please see: https://github.com/NREL/cbci_jenkins_libs
  
-@Library('cbci_shared_libs') _
+@Library('cbci_shared_libs@ruby_270') _
 
 // Build for PR to develop branch only. 
 if ((env.CHANGE_ID) && (env.CHANGE_TARGET) ) { // check if set

data/LICENSE.md

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

data/Rakefile

@@ -1,5 +1,5 @@
 ########################################################################################################################
-#  openstudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved.
+#  openstudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved.
 #
 #  Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
 #  following conditions are met:

data/doc_templates/LICENSE.md

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

data/doc_templates/copyright_erb.txt

@@ -1,6 +1,6 @@
 <%
   # *******************************************************************************
-  # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+  # OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
   # All rights reserved.
   # Redistribution and use in source and binary forms, with or without
   # modification, are permitted provided that the following conditions are met:

data/doc_templates/copyright_js.txt

@@ -1,4 +1,4 @@
 /* @preserve
- * OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved.
+ * OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be found at openstudio.net/license.
 */

data/doc_templates/copyright_ruby.txt

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

data/init_templates/gemspec.txt

@@ -22,11 +22,13 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.14'
-  spec.add_development_dependency 'rake', '12.3.1'
-  spec.add_development_dependency 'rspec', '3.7.0'
+  spec.required_ruby_version = '~> 2.5.0'
+
+  spec.add_development_dependency 'bundler', '~> 2.1'
+  spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'rspec', '~> 3.9'
   spec.add_development_dependency 'rubocop', '~> 0.54.0'
 
-  spec.add_dependency 'openstudio-extension', '~> 0.1.0'
-  spec.add_dependency 'openstudio-standards', '~> 0.2.7'
+  spec.add_dependency 'openstudio-extension', '~> 0.3.1'
+  spec.add_dependency 'openstudio-standards', '~> 0.2.12'
 end

data/init_templates/openstudio_module.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

data/init_templates/spec.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

data/init_templates/spec_helper.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

data/init_templates/template_gemfile.txt

@@ -16,7 +16,4 @@ elsif allow_local
   gem 'openstudio-extension', github: 'NREL/OpenStudio-extension-gem', branch: 'develop'
 end
 
-gem 'openstudio_measure_tester', '= 0.1.7' # This includes the dependencies for running unit tests, coverage, and rubocop
-
-# simplecov has an unnecessary dependency on native json gem, use fork that does not require this
-gem 'simplecov', github: 'NREL/simplecov'
+gem 'openstudio_measure_tester', '~> 0.2.3' # This includes the dependencies for running unit tests, coverage, and rubocop

data/init_templates/version.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

data/lib/change_log.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

data/lib/measures/openstudio_extension_test_measure/LICENSE.md

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

data/lib/measures/openstudio_extension_test_measure/measure.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

data/lib/measures/openstudio_extension_test_measure/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>openstudio_extension_test_measure</name>
   <uid>36b99a29-41e1-4d85-9272-85d43b966e5a</uid>
-  <version_id>edf7f103-9f51-4944-a5af-1d8fa2b0c9b7</version_id>
-  <version_modified>20200427T230714Z</version_modified>
+  <version_id>da192150-29b5-4c56-b5d5-9a2e1d2f154a</version_id>
+  <version_modified>20210215T205438Z</version_modified>
   <xml_checksum>49BEF039</xml_checksum>
   <class_name>OpenStudioExtensionTestMeasure</class_name>
   <display_name>OpenStudio Extension Test Measure</display_name>
@@ -45,17 +45,23 @@
       <usage_type>readmeerb</usage_type>
       <checksum>703C9964</checksum>
     </file>
+    <file>
+      <filename>README.md</filename>
+      <filetype>md</filetype>
+      <usage_type>readme</usage_type>
+      <checksum>7258830F</checksum>
+    </file>
     <file>
       <filename>LICENSE.md</filename>
       <filetype>md</filetype>
       <usage_type>license</usage_type>
-      <checksum>E0468DD6</checksum>
+      <checksum>A21A3ED2</checksum>
     </file>
     <file>
       <filename>OpenStudioExtensionTestMeasure_Test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>66A00EA8</checksum>
+      <checksum>5F2C8B43</checksum>
     </file>
     <file>
       <version>
@@ -66,19 +72,13 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>51BB85EF</checksum>
+      <checksum>D6EA3941</checksum>
     </file>
     <file>
       <filename>os_lib_helper_methods.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>07B01D67</checksum>
-    </file>
-    <file>
-      <filename>README.md</filename>
-      <filetype>md</filetype>
-      <usage_type>readme</usage_type>
-      <checksum>7258830F</checksum>
+      <checksum>B535B169</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/openstudio_extension_test_measure/resources/os_lib_helper_methods.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -265,7 +265,20 @@ module OsLib_HelperMethods
           result = measure_step.result.get
           result.stepValues.each do |arg|
             name = arg.name
-            value = arg.valueAsVariant.to_s
+            # check if value, double, int, or bool
+            value_type = arg.variantType.valueDescription
+            if value_type == "Double"
+              value = arg.valueAsDouble
+            elsif value_type == "Integer"
+              value = arg.valueAsInteger
+            elsif value_type == "Boolean"
+              value = arg.valueAsBoolean
+            elsif value_type == "String"
+              value = arg.valueAsString
+            else
+              # catchall for unexpected value types
+              value = arg.valueAsVariant.to_s
+            end
             if name == arg_name
               arg_name_value[:value] = value
               arg_name_value[:measure_name] = measure_name

data/lib/openstudio-extension.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

data/lib/openstudio/extension.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -91,6 +91,7 @@ module OpenStudio
 
         result << obj
       end
+
       return result.uniq
     end
 
@@ -105,7 +106,7 @@ module OpenStudio
         result << dir if dir
       rescue StandardError
       end
-      return result.uniq
+      return result.uniq.sort
     end
 
     ##
@@ -119,7 +120,7 @@ module OpenStudio
         result << dir if dir
       rescue StandardError
       end
-      return result.uniq
+      return result.uniq.sort
     end
 
     ##

data/lib/openstudio/extension/core/CreateResults.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

data/lib/openstudio/extension/core/check_air_sys_temps.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

data/lib/openstudio/extension/core/check_calibration.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

data/lib/openstudio/extension/core/check_cond_zns.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

data/lib/openstudio/extension/core/check_domestic_hot_water.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

data/lib/openstudio/extension/core/check_envelope_conductance.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

data/lib/openstudio/extension/core/check_eui_by_end_use.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

data/lib/openstudio/extension/core/check_eui_reasonableness.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

data/lib/openstudio/extension/core/check_fan_pwr.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

data/lib/openstudio/extension/core/check_internal_loads.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

data/lib/openstudio/extension/core/check_mech_sys_capacity.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

data/lib/openstudio/extension/core/check_mech_sys_efficiency.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met: