Merge pull request #48 from NREL/prep/v0.2.1

Prep/v0.2.1
NREL · Oct 28, 2020 · 045a8fc · 045a8fc
2 parents 507dd6b + 8874b50
commit 045a8fc
Show file tree

Hide file tree

Showing 134 changed files with 37,223 additions and 33,063 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,26 @@
 # OpenStudio Model Articulation Gems
 
+## Version 0.2.1
+* Add rubocop to Rakefile
+* Updates the following in lib/measures:
+    * BarAspectRationSlicedBySpaceType
+    * InjectOsmGeometryIntoAnExternalIdf
+    * SetWindowToWallRatioByFacade
+    * SpaceTypeAndConstructionSetWizard
+    * clone_building_from_external_model
+    * create_DOE_prototype_building
+    * create_baseline_building
+    * create_deer_prototype_building
+    * create_typical_building_from_model
+    * create_typical_deer_building_from_model
+    * create_typical_doe_building_from_model
+    * merge_floorspace_js_with_model
+    * merge_spaces_from_external_file
+    * radiance_measure
+* Adds the following to lib/measures:
+    * radiant_slab_with_doas
+
+
 ## Version 0.2.0
 
 * Support for OpenStudio 3.0

diff --git a/Rakefile b/Rakefile
@@ -38,13 +38,32 @@ require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
+require 'rubocop/rake_task'
+RuboCop::RakeTask.new
+
 # Load in the rake tasks from the base extension gem
 require 'openstudio/extension/rake_task'
 require 'openstudio/model_articulation'
 rake_task = OpenStudio::Extension::RakeTask.new
-rake_task.set_extension_class(OpenStudio::ModelArticulation::Extension)
+rake_task.set_extension_class(OpenStudio::ModelArticulation::Extension, 'nrel/openstudio-model-articulation-gem')
 
 require 'openstudio_measure_tester/rake_task'
 OpenStudioMeasureTester::RakeTask.new
 
 task default: :spec
+
+desc 'Delete measure test output'
+task :delete_measure_test_outputs do
+  require 'fileutils'
+
+  puts 'Deleting tests/output directory from measures.'
+
+  # get measures in repo
+  measures = Dir.glob('**/**/**/measure.rb')
+
+  # create unique list of parent directories for measures.
+  measures.each do |i|
+    FileUtils.rm_rf(i.gsub('measure.rb', 'tests/output'))
+  end
+  puts 'deleteting test outputs'
+end
diff --git a/lib/measures/AssignConstructionSetToBuilding/measure.rb b/lib/measures/AssignConstructionSetToBuilding/measure.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # *******************************************************************************
 # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
 # All rights reserved.

diff --git a/lib/measures/AssignConstructionSetToBuilding/tests/AssignConstructionSetToBuilding_Test.rb b/lib/measures/AssignConstructionSetToBuilding/tests/AssignConstructionSetToBuilding_Test.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # *******************************************************************************
 # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
 # All rights reserved.

diff --git a/lib/measures/AssignSpaceTypeBySpaceName/measure.rb b/lib/measures/AssignSpaceTypeBySpaceName/measure.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # *******************************************************************************
 # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
 # All rights reserved.

diff --git a/lib/measures/AssignSpaceTypeBySpaceName/tests/AssignSpaceTypeBySpaceName_Test.rb b/lib/measures/AssignSpaceTypeBySpaceName/tests/AssignSpaceTypeBySpaceName_Test.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # *******************************************************************************
 # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
 # All rights reserved.

diff --git a/lib/measures/AssignSpaceTypeToBuilding/measure.rb b/lib/measures/AssignSpaceTypeToBuilding/measure.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # *******************************************************************************
 # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
 # All rights reserved.

diff --git a/lib/measures/AssignSpaceTypeToBuilding/tests/AssignSpaceTypeToBuilding_Test.rb b/lib/measures/AssignSpaceTypeToBuilding/tests/AssignSpaceTypeToBuilding_Test.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # *******************************************************************************
 # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
 # All rights reserved.

diff --git a/lib/measures/AssignSpacesToStories/measure.rb b/lib/measures/AssignSpacesToStories/measure.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # *******************************************************************************
 # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
 # All rights reserved.

diff --git a/lib/measures/AssignSpacesToStories/tests/AssignSpacesToStories_Test.rb b/lib/measures/AssignSpacesToStories/tests/AssignSpacesToStories_Test.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # *******************************************************************************
 # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
 # All rights reserved.

diff --git a/lib/measures/BarAspectRatioSlicedBySpaceType/measure.rb b/lib/measures/BarAspectRatioSlicedBySpaceType/measure.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # *******************************************************************************
 # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
 # All rights reserved.

diff --git a/lib/measures/BarAspectRatioSlicedBySpaceType/measure.xml b/lib/measures/BarAspectRatioSlicedBySpaceType/measure.xml
@@ -85,12 +85,6 @@
       <usage_type>test</usage_type>
       <checksum>3FDFD18A</checksum>
     </file>
-    <file>
-      <filename>test.osm</filename>
-      <filetype>osm</filetype>
-      <usage_type>test</usage_type>
-      <checksum>60715087</checksum>
-    </file>
     <file>
       <filename>README.md</filename>
       <filetype>md</filetype>

diff --git a/lib/measures/BarAspectRatioSlicedBySpaceType/resources/os_lib_cofee.rb b/lib/measures/BarAspectRatioSlicedBySpaceType/resources/os_lib_cofee.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # *******************************************************************************
 # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
 # All rights reserved.

diff --git a/lib/measures/BarAspectRatioSlicedBySpaceType/tests/BarAspectRatioSlicedBySpaceType_Test.rb b/lib/measures/BarAspectRatioSlicedBySpaceType/tests/BarAspectRatioSlicedBySpaceType_Test.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # *******************************************************************************
 # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
 # All rights reserved.