openstudio-analysis 1.0.6 → 1.1.0.pre.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f09590a10cf6967fb9842c05d8c38ad2be1b3dd534b0f251a9a1e239634fedd
-  data.tar.gz: 679f353d4f85adcbd51dc9df8b2e61edd4250126a7ae49fab72058f1840e18e4
+  metadata.gz: d4dc6517c0ebfd5341ebb89a066ce4371f37aa7a2c20f01e8b36965b33b8b230
+  data.tar.gz: '08f4e8886d1dba3d984a77e03163938d7b957e798e9cdb0122378a8d5f2b2ebc'
 SHA512:
-  metadata.gz: 39da086f21c02da1bcf3f00c371bb76f703ece1a8c3d2d1895f4585c0ac1d3ba8801858dbdeb69d922a067a733fbfe200375163b3e87917a4651a4a4f1969e3e
-  data.tar.gz: e834f1873b13b933444d2dfaade3dfc62b7b177063fb9dbf69b06a2e133603123b2cbf8e28707d61748065fa12634cb72ab715b54004fdae482857a60b43a4b4
+  metadata.gz: 73d3b0a51379bc817574aee43db86d3aca220ebdc52b8e7be3a58107ac840c41b00ec084954ed33fdd36626650697b9ed26316756ebd09a33d2317273ec123c9
+  data.tar.gz: 4ec8ab47fbb526354addb1c492078bb0e3a791635e8f42ef7e95a82024db97d40c741558fa3b43f4391e00c6f2bfbf02662147157a48196b688bc4e3a9c66854

data/.rubocop.yml

@@ -3,6 +3,7 @@ AllCops:
     - 'spec/files/measures/**/*'
     - 'spec/files/measures_second_path/**/*'
     - 'spec/files/worker_init/*'
+    - 'update_license.rb'
 
 inherit_from:
   - http://s3.amazonaws.com/openstudio-resources/styles/rubocop_v3.yml

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 OpenStudio Analysis Gem Change Log
 ==================================
 
+Version 1.1.0 (Unreleased)
+--------------------------
+* Allow for blank :seed, :weather_file and :workflow sections of OSA
+
 Version 1.0.6
 -------------
 * Always include ../lib to the file paths to search

data/lib/openstudio/analysis/translator/workflow.rb

@@ -69,11 +69,11 @@ module OpenStudio
           @measure_paths = options[:measure_paths] ? options[:measure_paths] : []
 
           # Initialize static inputs from the OSA
-          @seed_file = File.basename(@osa[:seed][:path])
+          !@osa[:seed].nil? ? @seed_file = File.basename(@osa[:seed][:path]) : @seed_file = ''
           if @options[:seed]
             @seed_file = @options[:seed]
           end
-          @weather_file = File.basename(@osa[:weather_file][:path])
+          !@osa[:weather_file].nil? ? @weather_file = File.basename(@osa[:weather_file][:path]) : @weather_file = ''
           @osa_id = @osa[:_id]
           @steps = []
           @osa[:problem][:workflow].each_with_index do |step, i|

data/lib/openstudio/analysis/version.rb

@@ -35,6 +35,8 @@
 
 module OpenStudio
   module Analysis
-    VERSION = '1.0.6'.freeze
+    # format should be ^.*\-{1}[a-z]+[0-9]+
+    # for example: -rc1, -beta6, -customusecase0
+    VERSION = '1.1.0-rc1'.freeze
   end
 end

data/lib/openstudio/analysis/workflow.rb

@@ -262,29 +262,30 @@ module OpenStudio
 
         o = OpenStudio::Analysis::Workflow.new
 
-        h[:workflow].each do |wf|
-          puts "Adding measure #{wf[:name]}"
-
-          # Go though the defined measure paths and try and find the local measure
-          local_measure_dir = nil
-          if wf[:measure_definition_directory_local] && Dir.exist?(wf[:measure_definition_directory_local])
-            local_measure_dir = wf[:measure_definition_directory_local]
-          else
-            # search in the measure paths for the measure
-            OpenStudio::Analysis.measure_paths.each do |p|
-              test_dir = File.join(p, File.basename(wf[:measure_definition_directory]))
-              if Dir.exist?(test_dir)
-                local_measure_dir = test_dir
-                break
+        if h[:workflow]
+          h[:workflow].each do |wf|
+            puts "Adding measure #{wf[:name]}"
+
+            # Go though the defined measure paths and try and find the local measure
+            local_measure_dir = nil
+            if wf[:measure_definition_directory_local] && Dir.exist?(wf[:measure_definition_directory_local])
+              local_measure_dir = wf[:measure_definition_directory_local]
+            else
+              # search in the measure paths for the measure
+              OpenStudio::Analysis.measure_paths.each do |p|
+                test_dir = File.join(p, File.basename(wf[:measure_definition_directory]))
+                if Dir.exist?(test_dir)
+                  local_measure_dir = test_dir
+                  break
+                end
               end
             end
-          end
 
-          raise "Could not find local measure when loading workflow for #{wf[:measure_definition_class_name]} in #{File.basename(wf[:measure_definition_directory])}. You may have to add measure paths to OpenStudio::Analysis.measure_paths" unless local_measure_dir
+            raise "Could not find local measure when loading workflow for #{wf[:measure_definition_class_name]} in #{File.basename(wf[:measure_definition_directory])}. You may have to add measure paths to OpenStudio::Analysis.measure_paths" unless local_measure_dir
 
-          o.add_measure_from_analysis_hash(wf[:name], wf[:display_name], local_measure_dir, wf)
+            o.add_measure_from_analysis_hash(wf[:name], wf[:display_name], local_measure_dir, wf)
+          end
         end
-
         o
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openstudio-analysis
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.1.0.pre.rc1
 platform: ruby
 authors:
 - Nicholas Long
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-21 00:00:00.000000000 Z
+date: 2021-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcl
@@ -199,9 +199,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.6.2