openstudio-analysis 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 466587d9aa1f5975444f2db97383dbbf947ba15d
-  data.tar.gz: b86d47a7c0535c75d10f90fa9579572d2d8c25c2
+  metadata.gz: d683426f53729c1e849371d14163a51de8bd3fed
+  data.tar.gz: 1f9d4dadb3d92791c38cd638c11e2c43964aa34d
 SHA512:
-  metadata.gz: 1fc01077b23f6312e4b8563ffe4901625fa5c939406e7028412bc4190b455b5562e8763183177351eb983b2b7fc3e9d00b3d601a1802ba6333a9046f805d3ba0
-  data.tar.gz: feaa588b52ffeef346b32fe480e6593191350e5e529605767894088b2415f360cd353081b7f15be7bee282adabd413c2f055564d7b5857a52275a7f0b318d45f
+  metadata.gz: d87903bcd2c30d112ecfb625d786603c2e3f9aabf23b4a6a5a1b2cf65093768cdab3da379cad0a9a886469d6688f546abb49a86841a0601f5dc23722da934f6a
+  data.tar.gz: 943e938546c5f148095103912d3e7ce95a68780c21442b158bf6989d6f2e82352aa40256a4e1893d428ba7bf17fe942570896f9bd1c610fd81ab7a3ad11fd723

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

@@ -167,6 +167,8 @@ module OpenStudio
           @template_json
         end
 
+        # save_analysis will iterate over each model that is defined in the spreadsheet and save the
+        # zip and json file.
         def save_analysis
           @template_json = create_analysis_hash
 
@@ -309,6 +311,15 @@ module OpenStudio
           binding
         end
 
+        def add_directory_to_zip(zipfile, local_directory, relative_zip_directory)
+          # pp "Add Directory #{local_directory}"
+          Dir[File.join("#{local_directory}", '**', '**')].each do |file|
+            # pp "Adding File #{file}"
+            zipfile.add(file.sub(local_directory, relative_zip_directory), file)
+          end
+          zipfile
+        end
+
         # Package up the seed, weather files, and measures
         def save_analysis_zip(model)
           zipfile_name = "#{@export_path}/#{model[:name]}.zip"
@@ -320,11 +331,49 @@ module OpenStudio
               zipfile.add("./weather/#{File.basename(filename)}", filename)
             end
 
-            Dir.glob("#{@measure_path}/**/*.rb").each do |measure|
-              next if measure.include?('spec') # don't include the spec folders nor files
-              measure_name = measure.split(File::SEPARATOR).last(2).first
-              # puts "  Adding ./measures/#{measure_name}/#{File.basename(measure)}"
-              zipfile.add("./measures/#{measure_name}/#{File.basename(measure)}", measure)
+            # Add only the measures that are defined in the spreadsheet
+            added_measures = []
+            measure_files = Dir.glob("#{@measure_path}/**/measure.rb")
+
+            # go through each of the Variables
+            @variables['data'].each do |v|
+              measure_to_save = nil
+              measure_files.each do |measure|
+                # pp v['measure_file_name_directory']
+                if measure.include? "/#{v['measure_file_name_directory']}/"
+                  measure_to_save = File.dirname(measure)
+                  # pp "Measure to save is #{measure}"
+                  break
+                end
+              end
+
+              if v['measure_file_name_directory'] =~ /baseline/i
+                puts '  Skipping baseline measure'
+                next
+              end
+
+              if measure_to_save && !added_measures.include?(measure_to_save)
+                # pp "Attempting to add measure #{measure_to_save}"
+                if File.exist?(measure_to_save)
+                  # pp "Adding measure directory to zip #{measure_to_save}"
+                  Dir[File.join(measure_to_save, '**')].each do |file|
+                    if File.directory?(file)
+                      if File.basename(file) == 'resources'
+                        add_directory_to_zip(zipfile, file, "./measures/#{v['measure_file_name_directory']}/#{File.basename(file)}")
+                      else
+                        # pp "Skipping Directory #{File.basename(file)}"
+                      end
+                    else
+                      # pp "Adding File #{file}"
+                      # added_measures << measure_dir unless added_measures.include? measure_dir
+                      zipfile.add(file.sub(measure_to_save, "./measures/#{v['measure_file_name_directory']}/"), file)
+                    end
+                  end
+                  added_measures << measure_to_save unless added_measures.include? measure_to_save
+                else
+                  fail "Could not find measure to add to zip for #{@measure_path}/#{v['measure_file_name_directory']}"
+                end
+              end
             end
 
             # puts "Adding #{model[:path]}"
@@ -516,7 +565,7 @@ module OpenStudio
                                                    notes: 'notes',
                                                    relation_to_eui: 'typical var to eui relationship',
                                                    clean: true)
-            elsif @version >= '0.1.12'  # add delta x
+            elsif @version >= '0.1.12' # add delta x
               rows = @xls.sheet('Variables').parse(enabled: '# variable',
                                                    measure_name_or_var_type: 'type',
                                                    measure_file_name_or_var_display_name: 'parameter display name.*',

data/lib/openstudio/analysis/version.rb

@@ -1,5 +1,5 @@
 module OpenStudio
   module Analysis
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
   end
 end

data/lib/openstudio-analysis.rb

@@ -6,6 +6,7 @@ require 'erb'
 require 'zip'
 require 'semantic'
 require 'logger'
+require 'pp'
 
 # core
 require 'openstudio/analysis/server_api'