Merge pull request #8 from rd2/y2023

Copyright (2023) + OSv351

.github/workflows/pull_request.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   test_300x:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     steps:
     - name: Check out repository
       uses: actions/checkout@v2
@@ -23,7 +23,7 @@ jobs:
         docker exec -t test bundle exec rake
         docker kill test
   test_321x:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     steps:
     - name: Check out repository
       uses: actions/checkout@v2
@@ -39,7 +39,7 @@ jobs:
         docker exec -t test bundle exec rake
         docker kill test
   test_330x:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - name: Check out repository
       uses: actions/checkout@v2
@@ -55,7 +55,7 @@ jobs:
         docker exec -t test bundle exec rake
         docker kill test
   test_340x:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - name: Check out repository
       uses: actions/checkout@v2
@@ -70,3 +70,19 @@ jobs:
         docker exec -t test bundle update
         docker exec -t test bundle exec rake
         docker kill test
+  test_351x:
+    runs-on: ubuntu-22.04
+    steps:
+    - name: Check out repository
+      uses: actions/checkout@v2
+    - name: Run Tests
+      run: |
+        echo $(pwd)
+        echo $(ls)
+        docker pull nrel/openstudio:3.5.1
+        docker run --name test --rm -d -t -v $(pwd):/work -w /work nrel/openstudio:3.5.1
+        docker exec -t test pwd
+        docker exec -t test ls
+        docker exec -t test bundle update
+        docker exec -t test bundle exec rake
+        docker kill test

LICENSE

@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2022, Denis Bourgeois
+Copyright (c) 2022-2023, Denis Bourgeois
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

lib/oslg.rb

@@ -1,6 +1,6 @@
 # BSD 3-Clause License
 #
-# Copyright (c) 2022, Denis Bourgeois
+# Copyright (c) 2022-2023, Denis Bourgeois
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

lib/oslg/oslog.rb

@@ -1,6 +1,6 @@
 # BSD 3-Clause License
 #
-# Copyright (c) 2022, Denis Bourgeois
+# Copyright (c) 2022-2023, Denis Bourgeois
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -127,6 +127,7 @@ def fatal?
   # @return [String] "DEBUG", "INFO", "WARN", "ERROR" or "FATAL"
   def tag(level)
     return @@tag[level] if level >= DEBUG && level <= FATAL
+
     ""
   end
 
@@ -138,6 +139,7 @@ def tag(level)
   # @return [String] preset OSlg message
   def msg(status)
     return @@msg[status] if status >= DEBUG && status <= FATAL
+
     ""
   end
 
@@ -163,6 +165,7 @@ def log(level = DEBUG, message = "")
       @@logs << {level: level, message: message}
       @@status = level if level > @@status
     end
+
     @@status
   end
 
@@ -194,10 +197,11 @@ def invalid(id = "", mth = "", ord = 0, lvl = DEBUG, res = nil)
     mth = mth[0...60] + " ..." if mth.length > 60
     return res if mth.empty?
 
-    msg  = "Invalid '#{id}' "
+    msg = "Invalid '#{id}' "
     msg += "arg ##{ord} " if ord > 0
     msg += "(#{mth})"
     log(lvl, msg) if lvl >= DEBUG && lvl <= FATAL
+
     res
   end
 
@@ -232,6 +236,7 @@ def mismatch(id = "", obj = nil, cl = nil, mth = "", lvl = DEBUG, res = nil)
 
     msg = "'#{id}' #{obj.class}? expecting #{cl} (#{mth})"
     log(lvl, msg) if lvl >= DEBUG && lvl <= FATAL
+
     res
   end
 
@@ -264,8 +269,9 @@ def hashkey(id = "", hsh = {}, key = "", mth = "", lvl = DEBUG, res = nil)
     mth = mth[0...60] + " ..." if mth.length > 60
     return res if mth.empty?
 
-    msg  = "Missing '#{key}' key in '#{id}' Hash (#{mth})"
+    msg = "Missing '#{key}' key in '#{id}' Hash (#{mth})"
     log(lvl, msg) if lvl >= DEBUG && lvl <= FATAL
+
     res
   end
 
@@ -294,8 +300,9 @@ def empty(id = "", mth = "", lvl = DEBUG, res = nil)
     mth = mth[0...60] + " ..." if mth.length > 60
     return res if mth.empty?
 
-    msg  = "Empty '#{id}' (#{mth})"
+    msg = "Empty '#{id}' (#{mth})"
     log(lvl, msg) if lvl >= DEBUG && lvl <= FATAL
+
     res
   end
 
@@ -325,8 +332,9 @@ def zero(id = "", mth = "", lvl = DEBUG, res = nil)
     mth = mth[0...60] + " ..." if mth.length > 60
     return res if mth.empty?
 
-    msg  = "Zero '#{id}' (#{mth})"
+    msg = "Zero '#{id}' (#{mth})"
     log(lvl, msg) if lvl >= DEBUG && lvl <= FATAL
+
     res
   end
 
@@ -355,9 +363,10 @@ def negative(id = "", mth = "", lvl = DEBUG, res = nil)
 
     mth = mth[0...60] + " ..." if mth.length > 60
     return res if mth.empty?
-    
-    msg  = "Negative '#{id}' (#{mth})"
+
+    msg = "Negative '#{id}' (#{mth})"
     log(lvl, msg) if lvl >= DEBUG && lvl <= FATAL
+
     res
   end
 
@@ -368,6 +377,7 @@ def negative(id = "", mth = "", lvl = DEBUG, res = nil)
   def clean!
     @@status = 0
     @@logs   = []
+
     @@level
   end
 

lib/oslg/version.rb

@@ -1,6 +1,6 @@
 # BSD 3-Clause License
 #
-# Copyright (c) 2022, Denis Bourgeois
+# Copyright (c) 2022-2023, Denis Bourgeois
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -29,5 +29,5 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 module OSlg
-  VERSION = "0.2.5".freeze
+  VERSION = "0.2.6".freeze
 end

oslg.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rake",    "~> 13.0"
   s.add_development_dependency "rspec",   "~> 3.11"
 
-  s.metadata["homepage_uri"]    = s.homepage
+  s.metadata["homepage_uri"   ] = s.homepage
   s.metadata["source_code_uri"] = "#{s.homepage}/tree/v#{s.version}"
   s.metadata["bug_tracker_uri"] = "#{s.homepage}/issues"
 end