openstudio-analysis 1.3.7 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e02ddfed034d22644f57f829611644aa06fb15122511288f2fa5657912c74b7
-  data.tar.gz: dd20b2f87b2c3e09dbc02691958456b953f6a9076ac273ba392c5b7e4f6ef2ad
+  metadata.gz: b3a924d83d69de21676bcf3231cfb4dd1490bac543775d19ff2681b95c7c6629
+  data.tar.gz: b026ed470a103fd7211ecab29412b89fcbfef76dee7af2d21f5ccf66c431dbce
 SHA512:
-  metadata.gz: 4db14ed5e381e1c4a0b3f22b8f866e219d263c0a3d7bde13a2eb8a080807baae23eb06383509fb8721fabbb1bb598a112f614ccd43465610684527b696024d50
-  data.tar.gz: 6f72189583fa3b4c2057c383011e702273de5711df310fef3f7068952037f23bd4f092e049470899f90f35eef2af224aab034c7e824775b802fea542ab55c111
+  metadata.gz: 86df02da3bf13f5c2a7eabadae7f3b6fd6535895e1248701821a70ad33dbfd785421997bab1068771b9b813bdaa58adc083ad6a4d8a14c1bd60f92c75293fb1f
+  data.tar.gz: e21fd89b4861d5de4e96b1bef9be796a8555ba174d2bbfd6ac48d900ee37f489a5b75f69873ce31fa07210400c64f0429f03d1f93e1c6e36779df7c91bf724ae

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

@@ -13,7 +13,7 @@ jobs:
       shell: bash
       run: "sudo apt install -y ruby && ruby -v" # ruby anye tests here when ready 
   ubuntu-2004: # ruby 2.7 workflow
-    if: github.event.pull_request.base.ref != '1.1.X-LTS'  # check target branch of pr
+    if: github.event.pull_request.base.ref == '1.3.X-LTS'  # check target branch of pr
     runs-on: ubuntu-20.04
     steps:
     -
@@ -38,3 +38,28 @@ jobs:
                    -v $(pwd):/var/simdata/openstudio  \
                    nrel/openstudio:3.7.0 \
                    /bin/bash -c "bundle install && bundle exec rake"
+  ubuntu-2204: # ruby 3.2 workflow in 22.04
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v4
+      - name: Install Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.2'
+      - name: Display system info
+        run: |
+          ruby --version
+          docker --version
+          docker-compose --version
+      - name: Start OpenStudio for testing Server API
+        run: |
+          echo "Not yet implemented"
+      - name: Run tests in Docker
+        env:
+          COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
+        run: |
+          docker run -e COVERALLS_REPO_TOKEN=${COVERALLS_REPO_TOKEN} \
+                     -v $(pwd):/var/simdata/openstudio \
+                     nrel/openstudio:develop \
+                     /bin/bash -c "bundle install && bundle exec rake"

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 OpenStudio(R) Analysis Gem Change Log
 ==================================
 
+Version 1.4.0
+-------------
+* Ruby 3.2 and OpenStudio 3.8.0 
+
 Version 1.3.7
 -------------
 * Add move_measure_after()

data/lib/openstudio/analysis/formulation.rb

@@ -605,7 +605,7 @@ module OpenStudio
           # check if weather file exists.  use abs path.  remove leading ./ from @weather_file path if there.
           # check if path is already absolute
           if @weather_file[:file]
-            if File.exists?(@weather_file[:file])
+            if File.exist?(@weather_file[:file])
               puts "  Adding #{@weather_file[:file]}"
               #zf.add("weather/#{File.basename(@weather_file[:file])}", @weather_file[:file])
               base_name = File.basename(@weather_file[:file], ".*")
@@ -622,7 +622,7 @@ module OpenStudio
                zf.add("weather/#{File.basename(file_path)}", file_path)
             end
             # make absolute path and check for file  
-            elsif File.exists?(File.join(osw_full_path,@weather_file[:file].sub(/^\.\//, '')))
+            elsif File.exist?(File.join(osw_full_path,@weather_file[:file].sub(/^\.\//, '')))
               puts "  Adding: #{File.join(osw_full_path,@weather_file[:file].sub(/^\.\//, ''))}"
               #zf.add("weather/#{File.basename(@weather_file[:file])}", File.join(osw_full_path,@weather_file[:file].sub(/^\.\//, '')))
               base_name = File.basename(@weather_file[:file].sub(/^\.\//, ''), ".*")
@@ -647,7 +647,7 @@ module OpenStudio
           #check if seed file exists.  use abs path.  remove leading ./ from @seed_model path if there.
           #check if path is already absolute
           if @seed_model[:file]
-            if File.exists?(@seed_model[:file])
+            if File.exist?(@seed_model[:file])
               puts "  Adding #{@seed_model[:file]}"
               zf.add("seeds/#{File.basename(@seed_model[:file])}", @seed_model[:file])
               if all_seed_files
@@ -661,7 +661,7 @@ module OpenStudio
                 end              
               end
             #make absolute path and check for file  
-            elsif File.exists?(File.join(osw_full_path,@seed_model[:file].sub(/^\.\//, '')))
+            elsif File.exist?(File.join(osw_full_path,@seed_model[:file].sub(/^\.\//, '')))
               puts "  Adding #{File.join(osw_full_path,@seed_model[:file].sub(/^\.\//, ''))}"
               zf.add("seeds/#{File.basename(@seed_model[:file])}", File.join(osw_full_path,@seed_model[:file].sub(/^\.\//, '')))
               if all_seed_files

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.7'.freeze
+    VERSION = '1.4.0'.freeze
   end
 end

data/openstudio-analysis.gemspec

@@ -21,18 +21,18 @@ Gem::Specification.new do |s|
   s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.required_ruby_version = '~> 2.7.0'
+  s.required_ruby_version = '~> 3.2.2'
 
-  s.add_dependency 'bcl', '~> 0.7.1'
+  s.add_dependency 'bcl', '~> 0.8.0'
   s.add_dependency 'dencity', '~> 0.1.0'
   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 'json-schema', '~> 2.8.0'
+  s.add_development_dependency 'json-schema', '~> 2.8.1'
   s.add_development_dependency 'rake', '~> 13.0'
-  s.add_development_dependency 'rspec', '~> 3.9'
-  s.add_development_dependency 'rubocop', '~> 1.15.0'
-  s.add_development_dependency 'rubocop-checkstyle_formatter', '~> 0.4.0'
+  s.add_development_dependency 'rspec', '~> 3.10'
+  s.add_development_dependency 'rubocop', '1.50'
+  s.add_development_dependency 'rubocop-checkstyle_formatter', '0.6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openstudio-analysis
 version: !ruby/object:Gem::Version
-  version: 1.3.7
+  version: 1.4.0
 platform: ruby
 authors:
 - Nicholas Long
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-05-08 00:00:00.000000000 Z
+date: 2024-05-09 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.1
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: dencity
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.8.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.8.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -128,42 +128,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: '1.50'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: '1.50'
 - !ruby/object:Gem::Dependency
   name: rubocop-checkstyle_formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.6.0
 description: Basic classes for generating the files needed for OpenStudio-Server
 email:
 - Nicholas.Long@nrel.gov
@@ -210,14 +210,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Create JSON, ZIP to communicate with OpenStudio Distributed Analysis in the