openstudio-geb 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45ce7a6b389311aa0a2910b98859e3e23d283c1b7cb16a4e932e2c52457b3b05
-  data.tar.gz: edf5e2693b3924602b03bb73477c99c88003cc391cf4f8b25d22f109befc3a5a
+  metadata.gz: b4fdc606895d1c09377ee2006ac33a6ee08e8b5d1b2b39a7b7cdf30dd4f1a670
+  data.tar.gz: e79afcd13e858096851fd8d53234fa23cb2f3c6d85c65635b3209a007416aad1
 SHA512:
-  metadata.gz: a1e6bce96aa3833cd9b5dd6e9920cef45211c2daf0a1be06d751a3795f53f235f104281848b534361333fc7a8d914e498369811d40b16e10ac608efd7a925bef
-  data.tar.gz: ae19c84f57043ed7b82ad19c8c5102907ce2fbf5b47308dc0ebdff84a1320340324bec466768b77cc7c0557fbeeca40845737165d026390a4a915326cbfa6b1d
+  metadata.gz: 5af05c44e546a83fdbabd60c633c5cb07ea3ff8ea80929df22b98a4c5edf2604ff312bcece947ee04d0d15dc86421a3e35d3f571b93f11ae31a12c0ea492b847
+  data.tar.gz: 1da5382c95a52c84d562947b3637efa61f259793b4034febf99bb2d48b441183165a4b185a74e089faaf77b4650056dca08c8088f945118a188ce20abf7cb4f9

data/.gitignore

@@ -31,3 +31,6 @@ lib/measures/*/tests/baseline
 
 # runner conf
 runner.conf
+
+# built gem file
+*.gem

data/lib/openstudio/geb/utilities.rb

@@ -1,4 +1,4 @@
-require 'nokogiri'
+# require 'oga'
 require 'json'
 
 # load openstudio model
@@ -25,25 +25,53 @@ def list_all_geb_measures
   measure_list = {}
 
   # get the absolute path of measures folder
-  measures_path = File.expand_path("../../../measures/", __FILE__ )
+  measures_dir = File.expand_path("../../../measures/", __FILE__ )
+
+  # use partial codes from function list_measures in OS Extension Runner to get the list of measures
+  # this is a temporary solution for the geb gem to be adopted by URBANopt workflow due to gem complexity
+  # (previously use nokogiri/oga as dependency and it didn't work in the integration process)
+  if measures_dir.nil? || measures_dir.empty?
+    puts 'Measures dir is nil or empty'
+    return true
+  end
+
+  # this is to accommodate a single measures dir (like most gems)
+  # or a repo with multiple directories fo measures (like OpenStudio-measures)
+  measures = Dir.glob(File.join(measures_dir, '**/measure.rb'))
+  if measures.empty?
+    # also try nested 2-deep to support openstudio-measures
+    measures = Dir.glob(File.join(measures_dir, '**/**/measure.rb'))
+  end
+  puts "#{measures.length} MEASURES FOUND"
+  puts measures.inspect
+  measures.each do |measure|
+    measure_name = measure.split('/')[-2]
+    measure_list[measure_name] = {}
+    measure_list[measure_name]['measure_dir_name'] = File.dirname(measure)
+  end
+
+=begin
   measure_folders_name = Dir.entries(measures_path).select {|entry| File.directory? File.join(measures_path,entry) and !(entry =='.' || entry == '..') }
   measure_folders_name.each do |measure_folder|
     # read the measure.xml file, get measure's metadata
     measure_xml = File.join(measures_path,measure_folder,'measure.xml')
-    data = File.open(measure_xml) { |f| Nokogiri::XML(f) }
+    handle = File.open(measure_xml)
+    data = Oga.parse_xml(handle)
+
     # get measure's display name
-    measure_name = data.xpath("//display_name").first.content
+    measure_name = data.xpath("//display_name").first.text
     # get measure's ruby class name
-    class_name = data.xpath("//class_name").first.content
+    class_name = data.xpath("//class_name").first.text
     # get parameter name list
     para_names = []
-    data.xpath("measure//arguments//argument//name").each{|ele| para_names << ele.content}
+    data.xpath("measure//arguments//argument//name").each{|ele| para_names << ele.text}
     measure_list[measure_name] = {}
     measure_list[measure_name]['measure_dir_name'] = File.join(measures_path, measure_folder)
     measure_list[measure_name]['class_name'] = class_name
     measure_list[measure_name]['para_names'] = para_names
     # puts JSON.pretty_generate(measure_list)
   end
+=end
 
   return measure_list
 end

data/lib/openstudio/geb/version.rb

@@ -35,6 +35,6 @@
 
 module OpenStudio
   module Geb
-    VERSION = '0.0.1'.freeze
+    VERSION = '0.0.2'.freeze
   end
 end

data/openstudio-geb.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '3.7.0'
   spec.add_development_dependency 'rubocop', '~> 1.15.0'
-  spec.add_dependency 'nokogiri', '~>1.10'
+  # spec.add_development_dependency 'oga', '~>3.4'
 
   spec.add_dependency 'openstudio-extension', '~> 0.5.1'
   spec.add_dependency 'openstudio-standards', '~> 0.2.9'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openstudio-geb
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Kaiyu Sun
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-11 00:00:00.000000000 Z
+date: 2022-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,20 +67,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.15.0
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: openstudio-extension
   requirement: !ruby/object:Gem::Requirement
@@ -159,108 +145,6 @@ files:
 - lib/measures/Enable Demand Controlled Ventilation/tests/EnableDemandControlledVentilation_Test.rb
 - lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
   169-2013-5A_dcv.osm
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/files/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/files/USA_NY_Buffalo.Niagara.Intl.AP.725280_TMY3.epw
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/measures/Enable Demand Controlled Ventilation/LICENSE.md
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/measures/Enable Demand Controlled Ventilation/README.md
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/measures/Enable Demand Controlled Ventilation/README.md.erb
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/measures/Enable Demand Controlled Ventilation/measure.rb
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/measures/Enable Demand Controlled Ventilation/measure.xml
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/measures/Enable Demand Controlled Ventilation/tests/0320_ModelWithHVAC_01.osm
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/measures/Enable Demand Controlled Ventilation/tests/EnableDemandControlledVentilation_Test.rb
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/measures/Set Electric Equipment loads by EPD/LICENSE.md
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/measures/Set Electric Equipment loads by EPD/README.md
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/measures/Set Electric Equipment loads by EPD/README.md.erb
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/measures/Set Electric Equipment loads by EPD/measure.rb
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/measures/Set Electric Equipment loads by EPD/measure.xml
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/measures/Set Electric Equipment loads by EPD/tests/EnvelopeAndLoadTestModel_01.osm
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/measures/Set Electric Equipment loads by EPD/tests/EnvelopeAndLoadTestModel_01_Costed.osm
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/measures/Set Electric Equipment loads by EPD/tests/HasSpaceWithNoLightsOrElec.osm
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/measures/Set Electric Equipment loads by EPD/tests/ReplaceElectricEquipmentWithEPD_Test.rb
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/out.osw
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/reports/eplustbl.html
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/run/data_point.zip
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/run/data_point_out.json
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/run/eplusout.audit
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/run/eplusout.bnd
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/run/eplusout.eio
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/run/eplusout.end
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/run/eplusout.err
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/run/eplusout.eso
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/run/eplusout.mdd
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/run/eplusout.mtd
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/run/eplusout.rdd
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/run/eplusout.shd
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/run/eplusout.sql
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/run/eplusssz.csv
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/run/eplustbl.htm
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/run/epluszsz.csv
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/run/finished.job
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/run/in.idf
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/run/in.osm
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/run/measure_attributes.json
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/run/objectives.json
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/run/pre-preprocess.idf
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/run/results.json
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/run/run.log
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/run/sqlite.err
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/run/started.job
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/run/stdout-energyplus
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/run/stdout-expandobject
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/stderr
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/stdout
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/workflow.osw
 - lib/measures/GEB Metrics Report/LICENSE.md
 - lib/measures/GEB Metrics Report/README.md
 - lib/measures/GEB Metrics Report/README.md.erb
@@ -320,14 +204,14 @@ files:
 - lib/measures/add_interior_blinds_and_control/measure.xml
 - lib/measures/add_interior_blinds_and_control/tests/add_exterior_blinds_and_control_test.rb
 - lib/measures/add_interior_blinds_and_control/tests/example_model.osm
-- lib/measures/add_rooftop_pv/LICENSE.md
-- lib/measures/add_rooftop_pv/README.md
-- lib/measures/add_rooftop_pv/README.md.erb
-- lib/measures/add_rooftop_pv/measure.rb
-- lib/measures/add_rooftop_pv/measure.xml
-- lib/measures/add_rooftop_pv/tests/CZ06RV2.epw
-- lib/measures/add_rooftop_pv/tests/add_rooftop_pv_test.rb
-- lib/measures/add_rooftop_pv/tests/pv_test_input.osm
+- lib/measures/add_rooftop_pv_simple/LICENSE.md
+- lib/measures/add_rooftop_pv_simple/README.md
+- lib/measures/add_rooftop_pv_simple/README.md.erb
+- lib/measures/add_rooftop_pv_simple/measure.rb
+- lib/measures/add_rooftop_pv_simple/measure.xml
+- lib/measures/add_rooftop_pv_simple/tests/CZ06RV2.epw
+- lib/measures/add_rooftop_pv_simple/tests/add_rooftop_pv_test.rb
+- lib/measures/add_rooftop_pv_simple/tests/pv_test_input.osm
 - lib/measures/adjust_dhw_setpoint/LICENSE.md
 - lib/measures/adjust_dhw_setpoint/README.md
 - lib/measures/adjust_dhw_setpoint/README.md.erb