openstudio-analysis 1.0.0 → 1.0.5

data/lib/openstudio/analysis/version.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2018, 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:
@@ -35,6 +35,6 @@
 
 module OpenStudio
   module Analysis
-    VERSION = '1.0.0'.freeze
+    VERSION = '1.0.5'.freeze
   end
 end

data/lib/openstudio/analysis/workflow.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2018, 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:
@@ -53,8 +53,7 @@ module OpenStudio
         @items.clear
       end
 
-      # Add a measure to the workflow from a path. Inside the path it is expecting to have a measure.json file
-      # if not, the BCL gem is used to create the measure.json file.
+      # Add a measure to the workflow from a path. This will parse the measure.xml which must exist.
       #
       # @params instance_name [String] The name of the instance. This allows for multiple measures to be added to the workflow with uni que names
       # @params instance_display_name [String] The display name of the instance. This allows for multiple measures to be added to the workflow with unique names
@@ -69,19 +68,11 @@ module OpenStudio
         end
 
         if Dir.exist?(local_path_to_measure) && File.directory?(local_path_to_measure)
-          # Watch out for namespace conflicts (use ::BCL)
-          b = ::BCL::ComponentMethods.new
           measure_hash = nil
-          unless File.exist?(File.join(local_path_to_measure, 'measure.json'))
-            measure_hash = b.parse_measure_file(nil, File.join(local_path_to_measure, measure_filename))
-            File.open(File.join(local_path_to_measure, 'measure.json'), 'w') { |f| f << JSON.pretty_generate(measure_hash) }
-            warn("measure.json not found in #{local_path_to_measure}, will parse measure file using BCL gem")
-          end
-
-          if measure_hash.nil? && File.exist?(File.join(local_path_to_measure, 'measure.json'))
-            measure_hash = JSON.parse(File.read(File.join(local_path_to_measure, 'measure.json')), symbolize_names: true)
-          elsif measure_hash.nil?
-            raise 'measure.json was not found and was not automatically created'
+          if File.exist?(File.join(local_path_to_measure, 'measure.xml'))
+            measure_hash = parse_measure_xml(File.join(local_path_to_measure, 'measure.xml'))
+          else
+            raise "Could not find measure.xml"
           end
 
           add_measure(instance_name, instance_display_name, local_path_to_measure, measure_hash)
@@ -92,12 +83,12 @@ module OpenStudio
         @items.last
       end
 
-      # Add a measure from the custom hash format without reading the measure.rb or measure.json file
+      # Add a measure from the custom hash format without reading the measure.rb or measure.xml file
       #
       # @params instance_name [String] The name of the instance. This allows for multiple measures to be added to the workflow with unique names
       # @params instance_display_name [String] The display name of the instance. This allows for multiple measures to be added to the workflow with unique names
       # @param local_path_to_measure [String] This is the local path to the measure directory, relative or absolute. It is used when zipping up all the measures.
-      # @param measure_metadata [Hash] Format of the measure.json
+      # @param measure_metadata [Hash] Format of the measure.xml in JSON format
       # @return [Object] Returns the measure that was added as an OpenStudio::AnalysisWorkflowStep object
       def add_measure(instance_name, instance_display_name, local_path_to_measure, measure_metadata)
         @items << OpenStudio::Analysis::WorkflowStep.from_measure_hash(instance_name, instance_display_name, local_path_to_measure, measure_metadata)
@@ -110,7 +101,7 @@ module OpenStudio
       # @params instance_name [String] The name of the instance. This allows for multiple measures to be added to the workflow with unique names
       # @params instance_display_name [String] The display name of the instance. This allows for multiple measures to be added to the workflow with unique names
       # @param local_path_to_measure [String] This is the local path to the measure directory, relative or absolute. It is used when zipping up all the measures.
-      # @param measure_metadata [Hash] Format of the measure.json
+      # @param measure_metadata [Hash] Format of the measure.xml in JSON format
       # @return [Object] Returns the measure that was added as an OpenStudio::AnalysisWorkflowStep object
       def add_measure_from_analysis_hash(instance_name, instance_display_name, local_path_to_measure, measure_metadata)
         @items << OpenStudio::Analysis::WorkflowStep.from_analysis_hash(instance_name, instance_display_name, local_path_to_measure, measure_metadata)

data/lib/openstudio/analysis/workflow_step.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2018, 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:
@@ -60,7 +60,7 @@ module OpenStudio
         @name = ''
         @display_name = ''
 
-        # The type of item being added (RubyMeasure, EnergyPlusMeasure, ...)
+        # The type of item being added (ModelMeasure, EnergyPlusMeasure, ...)
         @type = nil
 
         @measure_definition_class_name = nil
@@ -267,15 +267,12 @@ module OpenStudio
       #
       # @param instance_name [String] Machine name of the instance
       # @param instance_display_name [String] Display name of the instance
-      # @param path_to_measure [String] This is the local path to the measure directroy, relative or absolute. It is used when zipping up all the measures.
-      # @param hash [Hash] Measure hash in the format of the measure.json (from the Analysis Spreadsheet project)
+      # @param path_to_measure [String] This is the local path to the measure directory, relative or absolute. It is used when zipping up all the measures.
+      # @param hash [Hash] Measure hash in the format of a converted measure.xml hash (from the Analysis Spreadsheet project)
       # @param options [Hash] Optional arguments
       # @option options [Boolean] :ignore_not_found Do not raise an exception if the measure could not be found on the machine
       # @return [Object] Returns the OpenStudio::Analysis::WorkflowStep
       def self.from_measure_hash(instance_name, instance_display_name, path_to_measure, hash, options = {})
-        # TODO: Validate the hash
-        # TODO: validate that the measure exists?
-
         if File.directory? path_to_measure
           path_to_measure = File.join(path_to_measure, 'measure.rb')
         end
@@ -312,40 +309,36 @@ module OpenStudio
         # do not allow the choice variable_type
 
         s.type = hash[:measure_type] # this is actually the measure type
-        if hash[:arguments]
-          hash[:arguments].each do |arg|
-            # warn the user to we need to deprecate variable_type and use value_type (which is what os server uses)
-            var_type = arg[:variable_type] ? arg[:variable_type].downcase : arg[:value_type]
-
-            if var_type == 'choice'
-              # WARN the user that the measure had a "choice data type"
-              var_type = 'string'
-            end
+        hash[:arguments]&.each do |arg|
+          # warn the user to we need to deprecate variable_type and use value_type (which is what os server uses)
+          var_type = arg[:variable_type] ? arg[:variable_type].downcase : arg[:value_type]
 
-            s.arguments << {
-              display_name: arg[:display_name],
-              display_name_short: arg[:display_name_short],
-              name: arg[:name],
-              value_type: var_type,
-              default_value: arg[:default_value],
-              value: arg[:default_value]
-            }
+          if var_type == 'choice'
+            # WARN the user that the measure had a "choice data type"
+            var_type = 'string'
           end
+
+          s.arguments << {
+            display_name: arg[:display_name],
+            display_name_short: arg[:display_name_short],
+            name: arg[:name],
+            value_type: var_type,
+            default_value: arg[:default_value],
+            value: arg[:default_value]
+          }
         end
 
         # Load the arguments of variables, but do not make them variables. This format is more about arugments, than variables
-        if hash[:variables]
-          hash[:variables].each do |variable|
-            # add the arguments first
-            s.arguments << {
-              display_name: variable[:argument][:display_name],
-              display_name_short: variable[:argument][:display_name_short],
-              name: variable[:argument][:name],
-              value_type: variable[:argument][:value_type],
-              default_value: variable[:argument][:default_value],
-              value: variable[:argument][:default_value]
-            }
-          end
+        hash[:variables]&.each do |variable|
+          # add the arguments first
+          s.arguments << {
+            display_name: variable[:argument][:display_name],
+            display_name_short: variable[:argument][:display_name_short],
+            name: variable[:argument][:name],
+            value_type: variable[:argument][:value_type],
+            default_value: variable[:argument][:default_value],
+            value: variable[:argument][:default_value]
+          }
         end
 
         s
@@ -356,7 +349,7 @@ module OpenStudio
       # @param instance_name [String] Machine name of the instance
       # @param instance_display_name [String] Display name of the instance
       # @param path_to_measure [String] This is the local path to the measure directroy, relative or absolute. It is used when zipping up all the measures.
-      # @param hash [Hash] Measure hash in the format of the measure.json (from the Analysis Spreadsheet project)
+      # @param hash [Hash] Measure hash in the format of the measure.xml converted to JSON (from the Analysis Spreadsheet project)
       # @param options [Hash] Optional arguments
       # @option options [Boolean] :ignore_not_found Do not raise an exception if the measure could not be found on the machine
       # @return [Object] Returns the OpenStudio::Analysis::WorkflowStep
@@ -398,51 +391,47 @@ module OpenStudio
         s.measure_definition_version_uuid = hash[:measure_definition_version_uuid]
 
         s.type = hash[:measure_type] # this is actually the measure type
-        if hash[:arguments]
-          hash[:arguments].each do |arg|
-            # warn the user to we need to deprecate variable_type and use value_type (which is what os server uses)
-            var_type = arg[:value_type]
-
-            if var_type == 'choice'
-              # WARN the user that the measure had a "choice data type"
-              var_type = 'string'
-            end
+        hash[:arguments]&.each do |arg|
+          # warn the user to we need to deprecate variable_type and use value_type (which is what os server uses)
+          var_type = arg[:value_type]
 
-            s.arguments << {
-              display_name: arg[:display_name],
-              display_name_short: arg[:display_name_short],
-              name: arg[:name],
-              value_type: var_type,
-              default_value: arg[:default_value],
-              value: arg[:value]
-            }
+          if var_type == 'choice'
+            # WARN the user that the measure had a "choice data type"
+            var_type = 'string'
           end
+
+          s.arguments << {
+            display_name: arg[:display_name],
+            display_name_short: arg[:display_name_short],
+            name: arg[:name],
+            value_type: var_type,
+            default_value: arg[:default_value],
+            value: arg[:value]
+          }
         end
 
-        if hash[:variables]
-          hash[:variables].each do |variable|
-            # add the arguments first
-            s.arguments << {
-              display_name: variable[:argument][:display_name],
-              display_name_short: variable[:argument][:display_name_short],
-              name: variable[:argument][:name],
-              value_type: variable[:argument][:value_type],
-              default_value: variable[:argument][:default_value],
-              value: variable[:argument][:default_value]
-            }
-
-            var_options = {}
-            var_options[:variable_type] = variable[:variable_type]
-            var_options[:variable_display_name_short] = variable[:display_name_short]
-            var_options[:static_value] = variable[:static_value]
-            distribution = variable[:uncertainty_description]
-            distribution[:minimum] = variable[:minimum]
-            distribution[:mean] = distribution[:attributes].find { |a| a[:name] == 'modes' }[:value]
-            distribution[:maximum] = variable[:maximum]
-            distribution[:standard_deviation] = distribution[:attributes].find { |a| a[:name] == 'stddev' }[:value]
-            distribution[:step_size] = distribution[:attributes].find { |a| a[:name] == 'delta_x' }[:value]
-            s.make_variable(variable[:argument][:name], variable[:display_name], distribution, var_options)
-          end
+        hash[:variables]&.each do |variable|
+          # add the arguments first
+          s.arguments << {
+            display_name: variable[:argument][:display_name],
+            display_name_short: variable[:argument][:display_name_short],
+            name: variable[:argument][:name],
+            value_type: variable[:argument][:value_type],
+            default_value: variable[:argument][:default_value],
+            value: variable[:argument][:default_value]
+          }
+
+          var_options = {}
+          var_options[:variable_type] = variable[:variable_type]
+          var_options[:variable_display_name_short] = variable[:display_name_short]
+          var_options[:static_value] = variable[:static_value]
+          distribution = variable[:uncertainty_description]
+          distribution[:minimum] = variable[:minimum]
+          distribution[:mean] = distribution[:attributes].find { |a| a[:name] == 'modes' }[:value]
+          distribution[:maximum] = variable[:maximum]
+          distribution[:standard_deviation] = distribution[:attributes].find { |a| a[:name] == 'stddev' }[:value]
+          distribution[:step_size] = distribution[:attributes].find { |a| a[:name] == 'delta_x' }[:value]
+          s.make_variable(variable[:argument][:name], variable[:display_name], distribution, var_options)
         end
 
         s

data/lib/openstudio/helpers/hash.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2018, 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-2018, 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/{spec/openstudio/support_files_spec.rb → lib/openstudio/helpers/utils.rb}

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2018, 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:
@@ -33,57 +33,35 @@
 # EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 # *******************************************************************************
 
-require_relative './../spec_helper'
+require 'rexml/document'
 
-describe OpenStudio::Analysis::SupportFiles do
-  before :all do
-    @s = OpenStudio::Analysis::SupportFiles.new
-    expect(@s).to be_a OpenStudio::Analysis::SupportFiles
-  end
-
-  it 'should add files' do
-    f = 'spec/files/worker_init/first_file.rb'
-    @s.add(f)
+def parse_measure_xml(measure_xml_filename)
+  measure_hash = {}
+  xml_to_parse = File.open(measure_xml_filename)
+  xml_root = REXML::Document.new(xml_to_parse).root
 
-    expect(@s.size).to eq 1
-    expect(@s.files.first[:file]).to eq f
+  # pull out some information
+  measure_hash[:classname] = xml_root.elements['//measure/class_name'].text
+  measure_hash[:name] = xml_root.elements['//measure/name'].text
+  measure_hash[:display_name] = xml_root.elements['//measure/display_name'].text
+  measure_hash[:display_name_titleized] = measure_hash[:name].titleize
+  measure_hash[:measure_type] = xml_root.elements['//measure/attributes/attribute[name="Measure Type"]/value'].text
+  measure_hash[:description] = xml_root.elements['//measure/description'].text
+  measure_hash[:modeler_description] = xml_root.elements['//measure/modeler_description'].text
+  measure_hash[:uid] = xml_root.elements['//measure/uid'].text
+  measure_hash[:version_id] = xml_root.elements['//measure/version_id'].text
+  measure_hash[:arguments] = []
 
-    # add some other items
-    @s.add('spec/files/worker_init/second_file.sh')
+  REXML::XPath.each(xml_root, '//measure/arguments/argument' ) do |arg|
 
-    expect(@s.size).to eq 2
-    @s.each do |f|
-      expect(f).to_not be nil
-    end
+    measure_hash[:arguments] << {
+        name: arg.elements['name'].text,
+        display_name: arg.elements['display_name'].text,
+        variable_type: arg.elements['type'].text.downcase,
+        default_value: arg.elements['default_value'].text,
+        units: arg.elements['units'] ? arg.elements['units'].text : ''
+    }
   end
 
-  it 'should remove existing items' do
-    f = 'spec/files/worker_init/second_file.sh'
-    @s.add(f)
-
-    @s.clear
-    expect(@s.size).to eq 0
-  end
-
-  it 'should only add existing files' do
-    f = 'spec/files/worker_init/second_file.sh'
-    @s.add(f)
-    @s.add(f)
-
-    expect(@s.size).to eq 1
-
-    f = 'non-existent.rb'
-    expect { @s.add(f) }.to raise_error /Path or file does not exist and cannot be added.*/
-  end
-
-  it 'should add metadata data' do
-  end
-
-  it 'should add a directory' do
-    @s.clear
-    @s.add_files('spec/files/measures/**/*.rb', d: 'new')
-
-    expect(@s.size).to eq 10
-    expect(@s[0][:metadata][:d]).to eq 'new'
-  end
+  measure_hash
 end

data/lib/openstudio/weather/epw.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2018, 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:
@@ -154,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', __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,27 +8,30 @@ 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.license = 'BSD'
 
-  s.required_ruby_version = '>= 2.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.7'
+  s.required_ruby_version = '~> 2.5.0'
+
+  s.add_dependency 'bcl', '~> 0.6.1'
   s.add_dependency 'dencity', '~> 0.1.0'
-  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 'faraday', '~> 1.0.1'
+  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

@@ -6,7 +6,7 @@ js_regex = /^\/\* @preserve.*Copyright.*license.{2}\*\//m
 
 ruby_header_text = <<EOT
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2018, 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-2018, 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-2018, 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
@@ -96,7 +96,8 @@ paths = [
   { glob: 'spec/integration/**/*.rb', license: ruby_header_text, regex: ruby_regex },
 
   # single files
-  { glob: 'Rakefile', license: ruby_header_text, regex: ruby_regex }
+  { 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|