openstudio-analysis 1.0.0.rc19 → 1.0.4

data/lib/openstudio/helpers/hash.rb

@@ -1,3 +1,38 @@
+# *******************************************************************************
+# 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:
+#
+# (1) Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+#
+# (2) Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# (3) Neither the name of the copyright holder nor the names of any contributors
+# may be used to endorse or promote products derived from this software without
+# specific prior written permission from the respective party.
+#
+# (4) Other than as required in clauses (1) and (2), distributions in any form
+# of modifications or other derivative works may not use the "OpenStudio"
+# trademark, "OS", "os", or any other confusingly similar designation without
+# specific prior written permission from Alliance for Sustainable Energy, LLC.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER, THE UNITED STATES
+# GOVERNMENT, OR ANY CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+# EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# *******************************************************************************
+
 class Hash
   def deep_find(key)
     key?(key) ? self[key] : values.reduce(nil) { |memo, v| memo ||= v.deep_find(key) if v.respond_to?(:deep_find) }

data/lib/openstudio/helpers/string.rb

@@ -1,3 +1,37 @@
+# *******************************************************************************
+# 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:
+#
+# (1) Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+#
+# (2) Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# (3) Neither the name of the copyright holder nor the names of any contributors
+# may be used to endorse or promote products derived from this software without
+# specific prior written permission from the respective party.
+#
+# (4) Other than as required in clauses (1) and (2), distributions in any form
+# of modifications or other derivative works may not use the "OpenStudio"
+# trademark, "OS", "os", or any other confusingly similar designation without
+# specific prior written permission from Alliance for Sustainable Energy, LLC.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER, THE UNITED STATES
+# GOVERNMENT, OR ANY CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+# EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# *******************************************************************************
 
 # Typecast Variable Values by a string.
 def typecast_value(variable_type, value, inspect_string = false)
@@ -15,9 +49,9 @@ def typecast_value(variable_type, value, inspect_string = false)
         if !!value == value
           out_value = value
         else
-          if value.downcase == 'true'
+          if value.casecmp('true').zero?
             out_value = true
-          elsif value.downcase == 'false'
+          elsif value.casecmp('false').zero?
             out_value = false
           else
             raise "Can't cast to a bool from a value of '#{value}' of class '#{value.class}'"

data/lib/openstudio/weather/epw.rb

@@ -1,23 +1,38 @@
-######################################################################
-#  Copyright (c) 2008-2013, Alliance for Sustainable Energy.
-#  All rights reserved.
+# *******************************************************************************
+# 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:
 #
-#  This library is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Lesser General Public
-#  License as published by the Free Software Foundation; either
-#  version 2.1 of the License, or (at your option) any later version.
+# (1) Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
 #
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Lesser General Public License for more details.
+# (2) Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
 #
-#  You should have received a copy of the GNU Lesser General Public
-#  License along with this library; if not, write to the Free Software
-#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-######################################################################
+# (3) Neither the name of the copyright holder nor the names of any contributors
+# may be used to endorse or promote products derived from this software without
+# specific prior written permission from the respective party.
+#
+# (4) Other than as required in clauses (1) and (2), distributions in any form
+# of modifications or other derivative works may not use the "OpenStudio"
+# trademark, "OS", "os", or any other confusingly similar designation without
+# specific prior written permission from Alliance for Sustainable Energy, LLC.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER, THE UNITED STATES
+# GOVERNMENT, OR ANY CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+# EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# *******************************************************************************
 
-# TODO: this should its own gem because this file may be useful in various workflows
 module OpenStudio
   module Weather
     class Epw
@@ -139,7 +154,7 @@ module OpenStudio
         header_section = true
         row_count = 0
 
-        CSV.foreach(@filename, 'r') do |row|
+        CSV.foreach(@filename) do |row|
           row_count += 1
 
           if header_section

data/openstudio-analysis.gemspec

@@ -1,6 +1,5 @@
-lib = File.expand_path('../lib/', __FILE__)
-$LOAD_PATH.unshift lib unless $LOAD_PATH.include?(lib)
-
+lib = File.expand_path('lib', __dir__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'openstudio/analysis/version'
 
 Gem::Specification.new do |s|
@@ -9,27 +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 = 'LGPL'
-
-  s.required_ruby_version = '>= 2.0'
-  s.required_rubygems_version = '>= 1.3.6'
+  s.license = 'BSD'
 
-  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 'faraday', '~> 0.8'
-  s.add_dependency 'nokogiri', '~> 1.6.8'
-  s.add_dependency 'roo', '~> 2.4'
-  s.add_dependency 'rubyzip', '~> 1.2'
-  s.add_dependency 'semantic', '~> 1.4'
-  s.add_dependency 'bcl', '~> 0.5.7'
+  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.10.8'
+  s.add_dependency 'roo', '~> 2.8.3'
+  s.add_dependency 'rubyzip', '~> 2.3.0'
+  s.add_dependency 'semantic', '~> 1.4'
 
-  s.add_development_dependency 'bundler', '~> 1.7'
-  s.add_development_dependency 'rake', '~> 11.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

@@ -0,0 +1,120 @@
+#!/usr/bin/env ruby
+
+ruby_regex = /^#.\*{79}.*#.\*{79}$/m
+erb_regex = /^<%.*#.\*{79}.*#.\*{79}.%>$/m
+js_regex = /^\/\* @preserve.*Copyright.*license.{2}\*\//m
+
+ruby_header_text = <<EOT
+# *******************************************************************************
+# 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:
+#
+# (1) Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+#
+# (2) Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# (3) Neither the name of the copyright holder nor the names of any contributors
+# may be used to endorse or promote products derived from this software without
+# specific prior written permission from the respective party.
+#
+# (4) Other than as required in clauses (1) and (2), distributions in any form
+# of modifications or other derivative works may not use the "OpenStudio"
+# trademark, "OS", "os", or any other confusingly similar designation without
+# specific prior written permission from Alliance for Sustainable Energy, LLC.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER, THE UNITED STATES
+# GOVERNMENT, OR ANY CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+# EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# *******************************************************************************
+EOT
+ruby_header_text.strip!
+
+erb_header_text = <<EOT
+<%
+  # *******************************************************************************
+  # 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:
+  #
+  # (1) Redistributions of source code must retain the above copyright notice,
+  # this list of conditions and the following disclaimer.
+  #
+  # (2) Redistributions in binary form must reproduce the above copyright notice,
+  # this list of conditions and the following disclaimer in the documentation
+  # and/or other materials provided with the distribution.
+  #
+  # (3) Neither the name of the copyright holder nor the names of any contributors
+  # may be used to endorse or promote products derived from this software without
+  # specific prior written permission from the respective party.
+  #
+  # (4) Other than as required in clauses (1) and (2), distributions in any form
+  # of modifications or other derivative works may not use the "OpenStudio"
+  # trademark, "OS", "os", or any other confusingly similar designation without
+  # specific prior written permission from Alliance for Sustainable Energy, LLC.
+  #
+  # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+  # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+  # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  # DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER, THE UNITED STATES
+  # GOVERNMENT, OR ANY CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+  # INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+  # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  # PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  # LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+  # EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  # *******************************************************************************
+%>
+EOT
+erb_header_text.strip!
+
+js_header_text = <<EOT
+/* @preserve
+ * 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
+js_header_text.strip!
+
+paths = [
+  { glob: 'lib/**/*.rb', license: ruby_header_text, regex: ruby_regex },
+  { glob: 'spec/openstudio/**/*.rb', license: ruby_header_text, regex: ruby_regex },
+  { glob: 'spec/integration/**/*.rb', license: ruby_header_text, regex: ruby_regex },
+
+  # single files
+  { glob: 'Rakefile', license: ruby_header_text, regex: ruby_regex },
+  { glob: 'spec/spec_helper.rb', license: ruby_header_text, regex: ruby_regex }
+]
+
+paths.each do |path|
+  Dir[path[:glob]].each do |file|
+    puts "Updating license in file #{file}"
+
+    f = File.read(file)
+    if f =~ path[:regex]
+      puts '  License found -- updating'
+      File.open(file, 'w') { |write| write << f.gsub(path[:regex], path[:license]) }
+    else
+      puts '  No license found -- adding'
+      if f =~ /#!/
+        puts '  CANNOT add license to file automatically, add it manually and it will update automatically in the future'
+        next
+      end
+      File.open(file, 'w') { |write| write << f.insert(0, path[:license] + "\n\n") }
+    end
+  end
+end

metadata

@@ -1,71 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: openstudio-analysis
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc19
+  version: 1.0.4
 platform: ruby
 authors:
 - Nicholas Long
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2017-05-16 00:00:00.000000000 Z
+date: 2020-06-26 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
+  name: dencity
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.8
+        version: 1.10.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.8
+        version: 1.10.8
 - !ruby/object:Gem::Dependency
   name: roo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: 2.8.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        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
@@ -81,61 +109,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
-  name: bcl
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.7
-  type: :runtime
+        version: '13.0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.7
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: dencity
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
-  type: :runtime
+        version: '3.9'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '3.9'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 0.54.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 0.54.0
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rubocop-checkstyle_formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: 0.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: 0.4.0
 description: Basic classes for generating the files needed for OpenStudio-Server
 email:
 - Nicholas.Long@nrel.gov
@@ -144,12 +172,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".gitlab-ci.yml"
 - ".rubocop.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
-- LGPL-2.1.txt
-- LICENSE.txt
+- LICENSE.md
 - README.md
 - Rakefile
 - lib/openstudio-analysis.rb
@@ -168,93 +196,10 @@ files:
 - lib/openstudio/helpers/string.rb
 - lib/openstudio/weather/epw.rb
 - openstudio-analysis.gemspec
-- rubocop-todo.yml
-- 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.rb
-- 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:
-- LGPL
+- BSD
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -262,102 +207,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.0'
+      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.6.10
+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.rb
-- 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: []