openstudio-analysis 1.3.5 → 1.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2b3fab59aeec813435361079d2ce2453b30c3a21d4c3d13addfede64fc944bb
-  data.tar.gz: 20c2f50da2c0f0e34076ad11680e584fd35f79bb688d5224b4fa5783173df77e
+  metadata.gz: 8e02ddfed034d22644f57f829611644aa06fb15122511288f2fa5657912c74b7
+  data.tar.gz: dd20b2f87b2c3e09dbc02691958456b953f6a9076ac273ba392c5b7e4f6ef2ad
 SHA512:
-  metadata.gz: 3d34d8ea49de5a7f248643209d6c8d1942996dfedc91a57801faf2f664d0a04b06930d58f2bfbc3d2034a22f5bb637f06a759e0dd67524dd060c7c8d95fb93ba
-  data.tar.gz: 9a334296581594e233cca22f651da024be123696dab49d592d2a38bc29857585bed08ce1f8afa8c3bfc5f517632d5918bb0b9c5f02e70970473c5f525748bb5f
+  metadata.gz: 4db14ed5e381e1c4a0b3f22b8f866e219d263c0a3d7bde13a2eb8a080807baae23eb06383509fb8721fabbb1bb598a112f614ccd43465610684527b696024d50
+  data.tar.gz: 6f72189583fa3b4c2057c383011e702273de5711df310fef3f7068952037f23bd4f092e049470899f90f35eef2af224aab034c7e824775b802fea542ab55c111

data/.github/workflows/openstudio-analysis.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-18.04
     steps:
     - name: Check out repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
     - name: ruby-install
       shell: bash
       run: "sudo apt install -y ruby && ruby -v" # ruby anye tests here when ready 
@@ -18,7 +18,7 @@ jobs:
     steps:
     -
       name: Check out repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
     -
       name: Display system info
       run: |
@@ -36,5 +36,5 @@ jobs:
       run: |
         docker run -e COVERALLS_REPO_TOKEN=${COVERALLS_REPO_TOKEN} \
                    -v $(pwd):/var/simdata/openstudio  \
-                   nrel/openstudio:develop \
+                   nrel/openstudio:3.7.0 \
                    /bin/bash -c "bundle install && bundle exec rake"

data/CHANGELOG.md

@@ -1,6 +1,15 @@
 OpenStudio(R) Analysis Gem Change Log
 ==================================
 
+Version 1.3.7
+-------------
+* Add move_measure_after()
+* Add custom Gemfile to zip: osa.gem_files.add('spec/files/gem_files/Gemfile')
+  
+Version 1.3.6
+-------------
+* Bump BCL and Rubocop
+
 Version 1.3.5
 -------------
 * Increase Timeouts and write_timeouts to deal with latencies for network related issues

data/lib/openstudio/analysis/formulation.rb

@@ -38,6 +38,7 @@ module OpenStudio
       attr_accessor :initialize_worker_timeout
       attr_accessor :run_workflow_timeout
       attr_accessor :upload_results_timeout
+      
 
       # the attributes below are used for packaging data into the analysis zip file
       attr_reader :weather_files
@@ -46,6 +47,7 @@ module OpenStudio
       attr_reader :worker_finalizes
       attr_reader :libraries
       attr_reader :server_scripts
+      attr_reader :gem_files
 
       # Create an instance of the OpenStudio::Analysis::Formulation
       #
@@ -72,6 +74,7 @@ module OpenStudio
 
         # Analysis Zip attributes
         @weather_files = SupportFiles.new
+        @gem_files = SupportFiles.new
         @seed_models = SupportFiles.new
         @worker_inits = SupportFiles.new
         @worker_finalizes = SupportFiles.new
@@ -321,11 +324,18 @@ module OpenStudio
           h[:analysis][:download_reports] = @download_reports
           h[:analysis][:download_osw] = @download_osw
           h[:analysis][:download_osm] = @download_osm
-
+          
+          # If there are Gemfiles, then set the hash to use the :gemfile. The zip file method will
+          # add them to the root of the zip file.
+          if @gem_files.size.positive?
+            h[:analysis][:gemfile] = true
+          else
+            h[:analysis][:gemfile] = false
+          end
+          
           #-BLB I dont think this does anything. server_scripts are run if they are in 
           #the /scripts/analysis or /scripts/data_point directories
           #but nothing is ever checked in the OSA.
-          #
           h[:analysis][:server_scripts] = {}
 
           # This is a hack right now, but after the initial hash is created go back and add in the objective functions
@@ -335,6 +345,8 @@ module OpenStudio
             h[:analysis][:problem][:algorithm][:objective_functions] = ofs
           end
 
+          
+
           h
         else
           raise "Version #{version} not defined for #{self.class} and #{__method__}"
@@ -710,6 +722,12 @@ module OpenStudio
             end
           end
 
+          puts 'Adding Gemfiles'
+          @gem_files.each do |f| 
+            puts "  Adding #{f[:file]}"
+            zf.add(File.basename(f[:file]), f[:file])
+          end
+
           ## Measures
           puts 'Adding Measures'
           added_measures = []
@@ -826,6 +844,12 @@ module OpenStudio
               file.close
             end
           end
+
+          puts 'Adding Gemfiles'
+          @gem_files.each do |f| 
+            puts "  Adding #{f}"
+            zf.add(File.basename(f), f)
+          end
           
           ## Measures
           puts 'Adding Measures'

data/lib/openstudio/analysis/version.rb

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

data/lib/openstudio/analysis/workflow.rb

@@ -184,6 +184,29 @@ module OpenStudio
       end
       alias find_workflow_step find_measure
 
+      # Move a measure by its name to after another measure by its name, 
+      # error if there is no measure with the name. If no after measure
+      # name is passed, then it will be at the beginning
+      #
+      # @params measure_name [String] instance name of the measure
+      # @params after_measure_name [String] instance name of the measure to move after
+      def move_measure_after(measure_name, after_measure_name=nil)
+        measure = self.find_measure(measure_name)
+        raise "Could not find measure with name #{measure_name}" unless measure
+
+        if after_measure_name.nil?
+          # put the measure at the beginning
+          @items.insert(0, @items.delete(measure))
+        else
+          after_measure = self.find_measure(after_measure_name)
+          raise "Could not find measure with name #{after_measure_name}" unless after_measure
+
+          # the index will be the index of the after measure plus 1 or the len of the list
+          idx = [@items.index(after_measure)+1, @items.length-1].min
+          @items.insert(idx, @items.delete(measure))
+        end
+      end
+        
       # Return all the variables in the analysis as an array. The list that is returned is read only.
       #
       # @return [Array] All variables in the workflow

data/openstudio-analysis.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '~> 2.7.0'
 
-  s.add_dependency 'bcl', '~> 0.7.0'
+  s.add_dependency 'bcl', '~> 0.7.1'
   s.add_dependency 'dencity', '~> 0.1.0'
   s.add_dependency 'faraday', '~> 1.0.1'
   s.add_dependency 'roo', '~> 2.8.3'
@@ -33,6 +33,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'json-schema', '~> 2.8.0'
   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', '~> 1.15.0'
   s.add_development_dependency 'rubocop-checkstyle_formatter', '~> 0.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openstudio-analysis
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.3.7
 platform: ruby
 authors:
 - Nicholas Long
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-29 00:00:00.000000000 Z
+date: 2024-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcl
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: dencity
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.54.0
+        version: 1.15.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.54.0
+        version: 1.15.0
 - !ruby/object:Gem::Dependency
   name: rubocop-checkstyle_formatter
   requirement: !ruby/object:Gem::Requirement
@@ -202,7 +202,7 @@ homepage: http://openstudio.nrel.gov
 licenses:
 - BSD
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -218,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.4
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Create JSON, ZIP to communicate with OpenStudio Distributed Analysis in the
   Cloud