openstudio-analysis 1.0.2 → 1.0.3

data/lib/openstudio/helpers/hash.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2019, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2020, 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/helpers/string.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2019, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2020, 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/weather/epw.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2019, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2020, 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/openstudio-analysis.gemspec

@@ -1,6 +1,5 @@
 lib = File.expand_path('lib', __dir__)
-$LOAD_PATH.unshift lib unless $LOAD_PATH.include?(lib)
-
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'openstudio/analysis/version'
 
 Gem::Specification.new do |s|
@@ -9,26 +8,31 @@ Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
   s.authors = ['Nicholas Long']
   s.email = ['Nicholas.Long@nrel.gov']
+
   s.homepage = 'http://openstudio.nrel.gov'
   s.summary = 'Create JSON, ZIP to communicate with OpenStudio Distributed Analysis in the Cloud'
   s.description = 'Basic classes for generating the files needed for OpenStudio-Server'
   s.license = 'BSD'
 
-  s.required_ruby_version = '~> 2.5.1'
-  s.required_rubygems_version = '>= 1.3.6'
-
-  s.files         = `git ls-files -z`.split("\x0")
-  s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  s.test_files    = s.files.grep(%r{^(test|spec|features)/})
+  s.files = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(test|spec|features)/})
+  end
+  s.bindir = 'exe'
+  s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.add_dependency 'bcl', '~> 0.5.8'
+  s.required_ruby_version = '~> 2.5.0'
+
+  s.add_dependency 'bcl', '= 0.5.8'
   s.add_dependency 'dencity', '~> 0.1.0'
   s.add_dependency 'faraday', '~> 0.14'
-  s.add_dependency 'nokogiri', '~> 1.8.2' 
-  s.add_dependency 'roo', '~> 2.7.1'
-  s.add_dependency 'rubyzip', '~> 1.2'
+  s.add_dependency 'nokogiri', '~> 1.8.2'
+  s.add_dependency 'roo', '~> 2.8.3'
+  s.add_dependency 'rubyzip', '~> 2.3.0'
   s.add_dependency 'semantic', '~> 1.4'
 
-  s.add_development_dependency 'rake', '~> 12.3.1'
+  s.add_development_dependency 'rake', '~> 13.0'
+  s.add_development_dependency 'rspec', '~> 3.9'
+  s.add_development_dependency 'rubocop', '~> 0.54.0'
+  s.add_development_dependency 'rubocop-checkstyle_formatter', '~> 0.4.0'
 end

data/update_license.rb

@@ -6,7 +6,7 @@ js_regex = /^\/\* @preserve.*Copyright.*license.{2}\*\//m
 
 ruby_header_text = <<EOT
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2019, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2020, 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:
@@ -45,7 +45,7 @@ ruby_header_text.strip!
 erb_header_text = <<EOT
 <%
   # *******************************************************************************
-  # OpenStudio(R), Copyright (c) 2008-2019, Alliance for Sustainable Energy, LLC.
+  # OpenStudio(R), Copyright (c) 2008-2020, 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:
@@ -84,7 +84,7 @@ erb_header_text.strip!
 
 js_header_text = <<EOT
 /* @preserve
- * OpenStudio(R), Copyright (c) 2008-2019, Alliance for Sustainable Energy, LLC. All rights reserved.
+ * OpenStudio(R), Copyright (c) 2008-2020, 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.
 */
 EOT

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: openstudio-analysis
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Nicholas Long
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2019-08-28 00:00:00.000000000 Z
+date: 2020-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.5.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.5.8
 - !ruby/object:Gem::Dependency
@@ -72,28 +72,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.1
+        version: 2.8.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.1
+        version: 2.8.3
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: semantic
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,56 @@ dependencies:
     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: '13.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.9'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.54.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.54.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-checkstyle_formatter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.1
+        version: 0.4.0
 description: Basic classes for generating the files needed for OpenStudio-Server
 email:
 - Nicholas.Long@nrel.gov
@@ -154,89 +196,6 @@ files:
 - lib/openstudio/helpers/string.rb
 - lib/openstudio/weather/epw.rb
 - openstudio-analysis.gemspec
-- spec/files/0_1_09_no_variables.xlsx
-- spec/files/0_1_09_outputvars.xlsx
-- spec/files/0_1_09_setup_version_2.xlsx
-- spec/files/0_1_09_small_list.xlsx
-- spec/files/0_1_09_small_list_incomplete.xlsx
-- spec/files/0_1_09_small_list_repeat_vars.xlsx
-- spec/files/0_1_09_small_list_validation_errors.xlsx
-- spec/files/0_1_10_proxy.xlsx
-- spec/files/0_1_10_proxy_user.xlsx
-- spec/files/0_1_10_template_input.xlsx
-- spec/files/0_1_11_discrete_variables.xlsx
-- spec/files/0_1_12_discrete_dynamic_columns.xlsx
-- spec/files/0_2_0_template.xlsx
-- spec/files/0_2_0_template_simpletest.xlsx
-- spec/files/0_3_0_dynamic_uuids.xlsx
-- spec/files/0_3_0_measure_existence.xlsx
-- spec/files/0_3_0_outputs.xlsx
-- spec/files/0_3_3_short_names.xlsx
-- spec/files/0_3_5_multiple_measure_paths.xlsx
-- spec/files/0_3_7_unique_measure_names.xlsx
-- spec/files/0_3_7_worker_init_final.xlsx
-- spec/files/0_4_0_lhs_discrete_continuous.xlsx
-- spec/files/0_4_0_multiple_seeds.xlsx
-- spec/files/0_4_0_pivot_test.xlsx
-- spec/files/analysis/examples/discrete_lhs_example.json
-- spec/files/analysis/examples/medium_office_example.json
-- spec/files/analysis/examples/medium_office_workflow.json
-- spec/files/measures/ActualMeasureNoJson/measure.rb
-- spec/files/measures/ActualMeasureNoJson/measure.xml
-- spec/files/measures/ExampleMeasure/measure.json
-- spec/files/measures/ExampleMeasure/measure.rb
-- spec/files/measures/ExampleMeasure/measure.xml
-- spec/files/measures/IncreaseInsulationRValueForRoofs/measure.json
-- spec/files/measures/IncreaseInsulationRValueForRoofs/measure.rb
-- spec/files/measures/IncreaseInsulationRValueForRoofs/measure.xml
-- spec/files/measures/NoMeasureRbFile/.gitkeep
-- spec/files/measures/ReduceLightingLoadsByPercentage/measure.json
-- spec/files/measures/ReduceLightingLoadsByPercentage/measure.rb
-- spec/files/measures/ReduceLightingLoadsByPercentage/measure.xml
-- spec/files/measures/SetThermostatSchedules/measure.json
-- spec/files/measures/SetThermostatSchedules/measure.rb
-- spec/files/measures/SetThermostatSchedules/measure.xml
-- spec/files/measures/example_measure_auto_directory_name/measure.json
-- spec/files/measures/example_measure_auto_directory_name/measure.rb
-- spec/files/measures/example_measure_auto_directory_name/measure.xml
-- spec/files/measures/reduce_lighting_loads_by_percentage/measure.json
-- spec/files/measures/reduce_lighting_loads_by_percentage/measure.rb
-- spec/files/measures/reduce_lighting_loads_by_percentage/measure.xml
-- spec/files/measures/reduce_space_infiltration_by_percentage/measure.rb
-- spec/files/measures/reduce_space_infiltration_by_percentage/measure.xml
-- spec/files/measures/rotate_building/measure.rb
-- spec/files/measures/rotate_building/measure.xml
-- spec/files/measures/set_window_to_wall_ratio_by_facade/measure.rb
-- spec/files/measures/set_window_to_wall_ratio_by_facade/measure.xml
-- spec/files/measures_second_path/measure_in_another_dir/measure.json
-- spec/files/measures_second_path/measure_in_another_dir/measure.rb
-- spec/files/measures_second_path/measure_in_another_dir/measure.xml
-- spec/files/partial_weather.epw
-- spec/files/partial_weather_2.epw
-- spec/files/small_seed.osm
-- spec/files/worker_init/first_file.rb
-- spec/files/worker_init/second_file.sh
-- spec/files/workflow/analysis.osa
-- spec/files/workflow/datapoint_0.osd
-- spec/files/workflow/datapoint_1.osd
-- spec/files/workflow/datapoint_2.osd
-- spec/files/workflow/datapoint_wrong_osa_id.osd
-- spec/integration/server_api_spec.rb
-- spec/openstudio/excel_spec.rb
-- spec/openstudio/formulation_spec.rb
-- spec/openstudio/hash_spec.rb
-- spec/openstudio/osw_spec.rb
-- spec/openstudio/server_api_spec.rb
-- spec/openstudio/string_spec.rb
-- spec/openstudio/support_files_spec.rb
-- spec/openstudio/weather_spec.rb
-- spec/openstudio/workflow_spec.rb
-- spec/openstudio/workflow_step_spec.rb
-- spec/schema/osa.json
-- spec/schema/osa.png
-- spec/schema/osd.json
-- spec/schema/osd.png
-- spec/spec_helper.rb
 - update_license.rb
 homepage: http://openstudio.nrel.gov
 licenses:
@@ -250,100 +209,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: 2.5.1
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.6
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Create JSON, ZIP to communicate with OpenStudio Distributed Analysis in the
   Cloud
-test_files:
-- spec/files/0_1_09_no_variables.xlsx
-- spec/files/0_1_09_outputvars.xlsx
-- spec/files/0_1_09_setup_version_2.xlsx
-- spec/files/0_1_09_small_list.xlsx
-- spec/files/0_1_09_small_list_incomplete.xlsx
-- spec/files/0_1_09_small_list_repeat_vars.xlsx
-- spec/files/0_1_09_small_list_validation_errors.xlsx
-- spec/files/0_1_10_proxy.xlsx
-- spec/files/0_1_10_proxy_user.xlsx
-- spec/files/0_1_10_template_input.xlsx
-- spec/files/0_1_11_discrete_variables.xlsx
-- spec/files/0_1_12_discrete_dynamic_columns.xlsx
-- spec/files/0_2_0_template.xlsx
-- spec/files/0_2_0_template_simpletest.xlsx
-- spec/files/0_3_0_dynamic_uuids.xlsx
-- spec/files/0_3_0_measure_existence.xlsx
-- spec/files/0_3_0_outputs.xlsx
-- spec/files/0_3_3_short_names.xlsx
-- spec/files/0_3_5_multiple_measure_paths.xlsx
-- spec/files/0_3_7_unique_measure_names.xlsx
-- spec/files/0_3_7_worker_init_final.xlsx
-- spec/files/0_4_0_lhs_discrete_continuous.xlsx
-- spec/files/0_4_0_multiple_seeds.xlsx
-- spec/files/0_4_0_pivot_test.xlsx
-- spec/files/analysis/examples/discrete_lhs_example.json
-- spec/files/analysis/examples/medium_office_example.json
-- spec/files/analysis/examples/medium_office_workflow.json
-- spec/files/measures/ActualMeasureNoJson/measure.rb
-- spec/files/measures/ActualMeasureNoJson/measure.xml
-- spec/files/measures/ExampleMeasure/measure.json
-- spec/files/measures/ExampleMeasure/measure.rb
-- spec/files/measures/ExampleMeasure/measure.xml
-- spec/files/measures/IncreaseInsulationRValueForRoofs/measure.json
-- spec/files/measures/IncreaseInsulationRValueForRoofs/measure.rb
-- spec/files/measures/IncreaseInsulationRValueForRoofs/measure.xml
-- spec/files/measures/NoMeasureRbFile/.gitkeep
-- spec/files/measures/ReduceLightingLoadsByPercentage/measure.json
-- spec/files/measures/ReduceLightingLoadsByPercentage/measure.rb
-- spec/files/measures/ReduceLightingLoadsByPercentage/measure.xml
-- spec/files/measures/SetThermostatSchedules/measure.json
-- spec/files/measures/SetThermostatSchedules/measure.rb
-- spec/files/measures/SetThermostatSchedules/measure.xml
-- spec/files/measures/example_measure_auto_directory_name/measure.json
-- spec/files/measures/example_measure_auto_directory_name/measure.rb
-- spec/files/measures/example_measure_auto_directory_name/measure.xml
-- spec/files/measures/reduce_lighting_loads_by_percentage/measure.json
-- spec/files/measures/reduce_lighting_loads_by_percentage/measure.rb
-- spec/files/measures/reduce_lighting_loads_by_percentage/measure.xml
-- spec/files/measures/reduce_space_infiltration_by_percentage/measure.rb
-- spec/files/measures/reduce_space_infiltration_by_percentage/measure.xml
-- spec/files/measures/rotate_building/measure.rb
-- spec/files/measures/rotate_building/measure.xml
-- spec/files/measures/set_window_to_wall_ratio_by_facade/measure.rb
-- spec/files/measures/set_window_to_wall_ratio_by_facade/measure.xml
-- spec/files/measures_second_path/measure_in_another_dir/measure.json
-- spec/files/measures_second_path/measure_in_another_dir/measure.rb
-- spec/files/measures_second_path/measure_in_another_dir/measure.xml
-- spec/files/partial_weather.epw
-- spec/files/partial_weather_2.epw
-- spec/files/small_seed.osm
-- spec/files/worker_init/first_file.rb
-- spec/files/worker_init/second_file.sh
-- spec/files/workflow/analysis.osa
-- spec/files/workflow/datapoint_0.osd
-- spec/files/workflow/datapoint_1.osd
-- spec/files/workflow/datapoint_2.osd
-- spec/files/workflow/datapoint_wrong_osa_id.osd
-- spec/integration/server_api_spec.rb
-- spec/openstudio/excel_spec.rb
-- spec/openstudio/formulation_spec.rb
-- spec/openstudio/hash_spec.rb
-- spec/openstudio/osw_spec.rb
-- spec/openstudio/server_api_spec.rb
-- spec/openstudio/string_spec.rb
-- spec/openstudio/support_files_spec.rb
-- spec/openstudio/weather_spec.rb
-- spec/openstudio/workflow_spec.rb
-- spec/openstudio/workflow_step_spec.rb
-- spec/schema/osa.json
-- spec/schema/osa.png
-- spec/schema/osd.json
-- spec/schema/osd.png
-- spec/spec_helper.rb
+test_files: []