honeybee-openstudio 1.8.3 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42eb4b7d8af0ad24df9c8b48337a6e8c88ea6e13fafd14503851edca1e542b29
-  data.tar.gz: 15f912a5d52fc7ea445f3a75a3d014621f9f4ae23ad37f89b3a52ad7e1963aa5
+  metadata.gz: 316bc7465ea14eb23cdca97fe943459513d2a34d989d822fc821a6ff801e60e6
+  data.tar.gz: 497e27a4d694073541229191642f1f0caf6ccd6eff226ac8dee7e60b88c6fb4f
 SHA512:
-  metadata.gz: e3ba910e1d60c02223ab18051e887e62c6d51a07a5c158c117fd0de620800a625e8bd9284d29ed6d7a4795f50de42bf9ee1bc46f612282001801ef15e237427e
-  data.tar.gz: eb514e5bc20d345a65fa4784bddc1770019ef75546728eaa5d48a4aee5aab353a125c0f181cd3cf67f8c6db332f9e76487d3a79254841512fa247d57f9b5c764
+  metadata.gz: 331f16511e285305c2d0868be7f450067b1f3035d35d2cf905e9e66fdf553cec8812c7a81f9d322b98df33bbe8eff57105ef0bab29315c3bc8522f94a3499ec2
+  data.tar.gz: 48cafa3e21c745c03bbc56d15275a025c56f0a27f5647153a4126ec0c9b8cc449b71d63bc7ab19f3844e7bae6f92038059ec3277358895469f44b3105bd09e42

data/.travis.yml

@@ -1,19 +1,16 @@
+dist: bionic
 language: ruby
 
 rvm:
-  - 2.2
+  - 2.5
 
 before_install:
 # install openstudio
-- wget http://security.ubuntu.com/ubuntu/pool/universe/w/wxwidgets3.0/libwxbase3.0-0_3.0.0-2_amd64.deb
-- sudo apt install ./libwxbase3.0-0_3.0.0-2_amd64.deb
-- wget http://security.ubuntu.com/ubuntu/pool/universe/w/wxwidgets3.0/libwxgtk3.0-0_3.0.0-2_amd64.deb
-- sudo apt install ./libwxgtk3.0-0_3.0.0-2_amd64.deb
-- wget https://github.com/NREL/OpenStudio/releases/download/v2.9.1/OpenStudio-2.9.1.3472e8b799-Linux.deb
-- sudo dpkg -i ./OpenStudio-2.9.1.3472e8b799-Linux.deb
+- wget https://github.com/NREL/OpenStudio/releases/download/v3.0.0/OpenStudio-3.0.0+1c9617fa4e-Linux.deb
+- sudo dpkg -i ./OpenStudio-3.0.0+1c9617fa4e-Linux.deb
 # install the openstudio extension gem
-- export RUBYLIB=/usr/local/openstudio-2.9.1/Ruby
-- gem install openstudio-extension -v 0.1.6
+- export RUBYLIB=/usr/local/openstudio-3.0.0/Ruby
+- gem install openstudio-extension -v 0.2.3
 
 install:
   - bundle install

data/Gemfile

@@ -7,7 +7,7 @@ gemspec
 if File.exist?('../OpenStudio-extension-gem')  # local development copy
   gem 'openstudio-extension', path: '../OpenStudio-extension-gem'
 else  # get it from rubygems.org
-  gem 'openstudio-extension', '0.1.6'
+  gem 'openstudio-extension', '0.2.3'
 end
 
 # coveralls gem is used to generate coverage reports through CI

data/README.md

@@ -1,7 +1,7 @@
 [![Build Status](https://travis-ci.org/ladybug-tools/honeybee-openstudio-gem.svg?branch=master)](https://travis-ci.org/ladybug-tools/honeybee-openstudio-gem)
 [![Coverage Status](https://coveralls.io/repos/github/ladybug-tools/honeybee-openstudio-gem/badge.svg?branch=master)](https://coveralls.io/github/ladybug-tools/honeybee-openstudio-gem)
 
-![Ruby 2.2](https://img.shields.io/badge/ruby-2.2-blue.svg)
+![Ruby 2.5](https://img.shields.io/badge/ruby-2.5-blue.svg)
 
 # honeybee-openstudio-gem
 

data/honeybee-openstudio.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'honeybee-openstudio'
-  spec.version       = '1.8.3'
+  spec.version       = '2.0.0'
   spec.authors       = ['Tanushree Charan', 'Dan Macumber', 'Chris Mackey', 'Mostapha Sadeghipour Roudsari']
   spec.email         = ['tanushree.charan@nrel.gov', 'chris@ladybug.tools']
 
@@ -21,14 +21,14 @@ 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.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 'json-schema'
   spec.add_dependency 'json_pure'
-  spec.add_dependency 'openstudio-extension', '0.1.6'
-  spec.add_dependency 'openstudio-standards', '~> 0.2.7'
+  spec.add_dependency 'openstudio-extension', '0.2.3'
+  spec.add_dependency 'openstudio-standards', '~> 0.2.11'
   spec.add_dependency 'public_suffix', '~> 3.1.1'
 end

data/lib/from_honeybee/schedule/ruleset.rb

@@ -78,8 +78,8 @@ module FromHoneybee
         unless holiday_schedule.empty?
           holiday_schedule_object = holiday_schedule.get
           begin
-            os_sch_ruleset.setHolidaySchedule(holiday_schedule_object)  
-          rescue NoMethodError 
+            os_sch_ruleset.setHolidaySchedule(holiday_schedule_object)
+          rescue NoMethodError  # REMOVE: Once the upgrade to OpenStudio 3.0 is official
           end
         end
       end

data/lib/from_honeybee/simulation/parameter.rb

@@ -147,20 +147,45 @@ module FromHoneybee
 
       # set defaults for the Model's ShadowCalculation object
       os_shadow_calc = @openstudio_model.getShadowCalculation
-      os_shadow_calc.setCalculationFrequency(shdw_defaults[:calculation_frequency][:default])
-      os_shadow_calc.setMaximumFiguresInShadowOverlapCalculations(shdw_defaults[:maximum_figures][:default])
-      os_shadow_calc.setCalculationMethod(shdw_defaults[:calculation_method][:default])
+      begin
+        os_shadow_calc.setShadingCalculationUpdateFrequency(
+          shdw_defaults[:calculation_frequency][:default])
+      rescue NoMethodError  # REMOVE: Once the upgrade to OpenStudio 3.0 is official
+        os_shadow_calc.setCalculationFrequency(
+          shdw_defaults[:calculation_frequency][:default])
+      end
+      os_shadow_calc.setMaximumFiguresInShadowOverlapCalculations(
+        shdw_defaults[:maximum_figures][:default])
+      begin
+        os_shadow_calc.setShadingCalculationMethod(
+          shdw_defaults[:calculation_method][:default])
+      rescue NoMethodError  # REMOVE: Once the upgrade to OpenStudio 3.0 is official
+        os_shadow_calc.setCalculationMethod(
+          shdw_defaults[:calculation_method][:default])
+      end
 
       # override any ShadowCalculation defaults with lodaded JSON
       if @hash[:shadow_calculation]
         if @hash[:shadow_calculation][:calculation_frequency]
-          os_shadow_calc.setCalculationFrequency(@hash[:shadow_calculation][:calculation_frequency])
+          begin
+            os_shadow_calc.setShadingCalculationUpdateFrequency(
+              @hash[:shadow_calculation][:calculation_frequency])
+          rescue NoMethodError  # REMOVE: Once the upgrade to OpenStudio 3.0 is official
+            os_shadow_calc.setCalculationFrequency(
+              @hash[:shadow_calculation][:calculation_frequency])
+          end
         end
         if @hash[:shadow_calculation][:maximum_figures]
           os_shadow_calc.setMaximumFiguresInShadowOverlapCalculations(@hash[:shadow_calculation][:maximum_figures])
         end
         if @hash[:shadow_calculation][:calculation_method]
-          os_shadow_calc.setCalculationMethod(@hash[:shadow_calculation][:calculation_method])
+          begin
+            os_shadow_calc.setShadingCalculationMethod(
+              @hash[:shadow_calculation][:calculation_method])
+          rescue NoMethodError  # REMOVE: Once the upgrade to OpenStudio 3.0 is official
+            os_shadow_calc.setCalculationMethod(
+              @hash[:shadow_calculation][:calculation_method])
+          end
         end
         if @hash[:shadow_calculation][:solar_distribution]
           os_sim_control.setSolarDistribution(@hash[:shadow_calculation][:solar_distribution])
@@ -203,13 +228,14 @@ module FromHoneybee
         end
         if @hash[:output][:summary_reports]
           begin
+            os_report = @openstudio_model.getOutputTableSummaryReports
+          rescue  # REMOVE: Once the upgrade to OpenStudio 3.0 is official
             os_report = OpenStudio::Model::OutputTableSummaryReports.new(@openstudio_model)
-          rescue NameError
           end
           @hash[:output][:summary_reports].each do |report|
             begin
               os_report.addSummaryReport(report)
-            rescue NoMethodError
+            rescue NoMethodError  # REMOVE: Once the upgrade to OpenStudio 3.0 is official
             end
           end
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: honeybee-openstudio
 version: !ruby/object:Gem::Version
-  version: 1.8.3
+  version: 2.0.0
 platform: ruby
 authors:
 - Tanushree Charan
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-27 00:00:00.000000000 Z
+date: 2020-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -19,42 +19,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 12.3.1
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 12.3.1
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -103,28 +103,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: openstudio-standards
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.7
+        version: 0.2.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.7
+        version: 0.2.11
 - !ruby/object:Gem::Dependency
   name: public_suffix
   requirement: !ruby/object:Gem::Requirement
@@ -234,8 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Gem for translating between Honeybee JSON and OpenStudio Model.