openstudio-workflow 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d9ae4b703c92eef60ef68cb61114502b4b0e2c3
-  data.tar.gz: 1387f3ab160a42eb9403d8c62958622fe374baef
+  metadata.gz: 6c2fb37683cd9406a57cc473d90812987900bda9
+  data.tar.gz: 5c452453f70acf650da05e3632322e743dc9b858
 SHA512:
-  metadata.gz: f0a94a722672ef570e6819f89702605922fa3a585e2058ad976444571818fc1962ef14f42d0ff0949978a8965f1e305472ada3d2ec0566184794db5a20d699c6
-  data.tar.gz: 470ba2ed0e0a832256f5cc564a3bbf2fd4bbfe7449037de128230411360b9a09c58a3795188c4e24d5f19899cfe934fad58c32245ed6c87b31671d1b0de93204
+  metadata.gz: b9b318fef0c727d9c53174e6604eb93fd36b01a1162339b2d807bd1b32bbde519c285f01a0f32b7cc0e0bcd34e8d1e90610aa4279f4de2ddc91e0436238a163b
+  data.tar.gz: d78e837fca16cf879ecd1034a36b831095d11a34f68aadb443c6bfbf86d8427f5a2fe5ce5e0be38c81feb2efc4a54eefb5bdeb6c1acadcfef917a8a240fd195a

data/lib/openstudio/workflow/util/measure.rb

@@ -337,53 +337,70 @@ module OpenStudio
               # Set argument values if they exist
               logger.debug "Iterating over arguments for workflow item '#{measure_dir_name}'"
               if step.arguments 
-                step.arguments.each do |argument_name, argument_value|
-                  if argument_name.to_s == '__SKIP__'
-                    if registry[:openstudio_2]
-                      variant_type = argument_value.variantType
-                      if variant_type == "String".to_VariantType
-                        argument_value = argument_value.valueAsString
-                      elsif variant_type == "Double".to_VariantType
-                        argument_value = argument_value.valueAsDouble
-                      elsif variant_type == "Integer".to_VariantType
-                        argument_value = argument_value.valueAsInteger
-                      elsif variant_type == "Boolean".to_VariantType
-                        argument_value = argument_value.valueAsBoolean
-                      end
+                
+                # handle skip first
+                argument_value = step.arguments['__SKIP__']
+                if !argument_value.nil?
+                  
+                  if registry[:openstudio_2]
+                    variant_type = argument_value.variantType
+                    if variant_type == "String".to_VariantType
+                      argument_value = argument_value.valueAsString
+                    elsif variant_type == "Double".to_VariantType
+                      argument_value = argument_value.valueAsDouble
+                    elsif variant_type == "Integer".to_VariantType
+                      argument_value = argument_value.valueAsInteger
+                    elsif variant_type == "Boolean".to_VariantType
+                      argument_value = argument_value.valueAsBoolean
                     end
-                    
-                    if argument_value.class == String
-                      argument_value = argument_value.downcase
-                      if argument_value == "false"
-                        skip_measure = false
-                      else
-                        skip_measure = true
-                      end
-                    elsif argument_value.class == Fixnum
-                      skip_measure = (argument_value != 0)
-                    elsif argument_value.class == Float
-                      skip_measure = (argument_value != 0.0)
-                    elsif argument_value.class == FalseClass
+                  end
+                  
+                  if argument_value.class == String
+                    argument_value = argument_value.downcase
+                    if argument_value == "false"
                       skip_measure = false
-                    elsif argument_value.class == TrueClass
+                    else
                       skip_measure = true
-                    elsif argument_value.class == NilClass
-                      skip_measure = false
                     end
+                  elsif argument_value.class == Fixnum
+                    skip_measure = (argument_value != 0)
+                  elsif argument_value.class == Float
+                    skip_measure = (argument_value != 0.0)
+                  elsif argument_value.class == FalseClass
+                    skip_measure = false
+                  elsif argument_value.class == TrueClass
+                    skip_measure = true
+                  elsif argument_value.class == NilClass
+                    skip_measure = false
+                  end
+                end
+                                
+                # process other arguments
+                step.arguments.each do |argument_name, argument_value|
+                
+                  # don't validate choices if measure is being skipped
+                  next if skip_measure
+                  
+                  # already handled skip
+                  next if argument_name.to_s == '__SKIP__'
+                  
+                  # regular argument
+                  if registry[:openstudio_2]
+                    success = apply_arguments_2(argument_map, argument_name, argument_value, logger)
                   else
-                    # regular argument
-                    if registry[:openstudio_2]
-                      success = apply_arguments_2(argument_map, argument_name, argument_value, logger)
-                    else
-                      success = apply_arguments(argument_map, argument_name, argument_value, logger)
-                    end
-                    fail 'Could not set arguments' unless success
+                    success = apply_arguments(argument_map, argument_name, argument_value, logger)
                   end
+                  fail 'Could not set arguments' unless success
                 end
+              
               end
 
               # map any choice display names to choice values, in either set values or defaults
               argument_map.each_key do |argument_name|
+                
+                # don't validate choices if measure is being skipped
+                next if skip_measure
+                
                 v = argument_map[argument_name]
                 choice_values = v.choiceValues
                 if !choice_values.empty?

data/lib/openstudio/workflow/version.rb

@@ -19,6 +19,6 @@
 
 module OpenStudio
   module Workflow
-    VERSION = '1.3.1'.freeze # Suffixes must have periods (not dashes)
+    VERSION = '1.3.2'.freeze # Suffixes must have periods (not dashes)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openstudio-workflow
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Nicholas Long
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-27 00:00:00.000000000 Z
+date: 2018-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler