oso-oso 0.27.2 → 0.27.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da399a469c21dd0a204d167b3b6ad6ccf7688b17517d38e8d537702bf3ef5acd
-  data.tar.gz: 1c1465393516e39339b30430908aa84b3afc4269601b81ad6303da6d85ecd8a5
+  metadata.gz: f7d992230292bf72430961dbad9bae7ad4aeeae196ce1aacd7129258c584d9b2
+  data.tar.gz: 4df54cb43fed5053cd8cab3fa08348edfbd7647677312473490ff77626afb858
 SHA512:
-  metadata.gz: 7e4c13779aacb92f923ddc80d374ede8f6f06972f4faf799cec3329d49d976e6117255bc2838c8dc7c8779245760d5f2e6ed8da15ed9cc90d31bc0b6b69dd3a6
-  data.tar.gz: 88f5d89a819b23887acd17fb2a61e015417f06e48be8cea3f6ca153de04bc2b43bb3df80cfc4ec2263a520e85d8b0f9e0354cfb8cef8d156148a340765902a4d
+  metadata.gz: ee6e3a81baa5069ce4ab9aabbe1bd07c1b18905818af6c197c2733e828d7888dd0fdb48f93f7b3561e7039c987cae813bfc467bbde2a566e0bb392aa381051a1
+  data.tar.gz: ed3a2432dfeb6ac046127e789d7b7c56481e7a6cee58c42816c8a386e83b3f07124286b58f41c0aca8223bb0ada08501d18de108bc3e1c2d82df012601498d9f

data/.gitignore

@@ -11,3 +11,4 @@ vendor
 
 # rspec failure tracking
 .rspec_status
+ext

data/.rubocop.yml

@@ -1,10 +1,50 @@
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.6
   Exclude:
     - "**/*~"
     - "bin/oso"
     - "vendor/**/*"
   NewCops: enable
+  SuggestExtensions: false
+
 Naming/FileName:
   Exclude:
     - "lib/oso-oso.rb"
+
+Layout/EmptyLineBetweenDefs:
+  Enabled: false
+Layout/LineContinuationSpacing:
+  Enabled: false
+
+Gemspec/RequireMFA:
+  Enabled: false
+Gemspec/DevelopmentDependencies:
+  Enabled: false
+
+Lint/ConstantDefinitionInBlock:
+  Enabled: false
+Lint/SymbolConversion:
+  Enabled: false
+Lint/NonAtomicFileOperation:
+  Enabled: false
+Lint/EmptyBlock:
+  Enabled: false
+Lint/AmbiguousOperatorPrecedence:
+  Enabled: false
+
+Style/FetchEnvVar:
+  Enabled: false
+Style/RedundantCurrentDirectoryInPath:
+  Enabled: false
+Style/QuotedSymbols:
+  Enabled: false
+Style/RedundantConstantBase:
+  Enabled: false
+Style/RedundantInitialize:
+  Enabled: false
+Style/CommentAnnotation:
+  Enabled: false
+Style/FileRead:
+  Enabled: false
+Style/HashConversion:
+  Enabled: false

data/.ruby-version

@@ -0,0 +1 @@
+3.2.2

data/Gemfile.lock

@@ -1,43 +1,55 @@
 PATH
   remote: .
   specs:
-    oso-oso (0.27.2)
+    oso-oso (0.27.3)
       ffi (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.2.6)
-      activesupport (= 5.2.6)
-    activerecord (5.2.6)
-      activemodel (= 5.2.6)
-      activesupport (= 5.2.6)
-      arel (>= 9.0)
-    activesupport (5.2.6)
+    activemodel (7.1.2)
+      activesupport (= 7.1.2)
+    activerecord (7.1.2)
+      activemodel (= 7.1.2)
+      activesupport (= 7.1.2)
+      timeout (>= 0.4.0)
+    activesupport (7.1.2)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    arel (9.0.0)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      mutex_m
+      tzinfo (~> 2.0)
     ast (2.4.2)
     backport (1.2.0)
+    base64 (0.2.0)
     benchmark (0.3.0)
+    bigdecimal (3.1.4)
     byebug (11.1.3)
     coderay (1.1.3)
-    concurrent-ruby (1.1.9)
-    diff-lcs (1.4.4)
+    concurrent-ruby (1.2.2)
+    connection_pool (2.4.1)
+    diff-lcs (1.5.0)
+    drb (2.2.0)
+      ruby2_keywords
     e2mmap (0.1.0)
-    ffi (1.15.4)
-    i18n (1.8.11)
+    ffi (1.16.3)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.6)
+    json (2.7.1)
     kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
+    language_server-protocol (3.17.0.3)
     method_source (1.0.0)
     mini_portile2 (2.8.5)
-    minitest (5.14.4)
+    minitest (5.20.0)
+    mutex_m (0.2.0)
     nokogiri (1.15.5)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
@@ -45,68 +57,78 @@ GEM
       racc (~> 1.4)
     nokogiri (1.15.5-x86_64-linux)
       racc (~> 1.4)
-    parallel (1.20.1)
-    parser (2.7.2.0)
+    parallel (1.23.0)
+    parser (3.2.2.4)
       ast (~> 2.4.1)
-    pry (0.13.1)
+      racc
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    pry-byebug (3.9.0)
+    pry-byebug (3.10.1)
       byebug (~> 11.0)
-      pry (~> 0.13.0)
+      pry (>= 0.13, < 0.15)
     racc (1.7.3)
-    rainbow (3.0.0)
+    rainbow (3.1.1)
     rake (12.3.3)
-    regexp_parser (2.1.1)
+    rbs (2.8.4)
+    regexp_parser (2.8.3)
     reverse_markdown (2.1.1)
       nokogiri
-    rexml (3.2.5)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rexml (3.2.6)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.3)
-    rubocop (0.89.1)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.1)
+    rubocop (1.58.0)
+      json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 2.7.1.1)
+      parser (>= 3.2.2.4)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.7)
-      rexml
-      rubocop-ast (>= 0.3.0, < 1.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.8.0)
-      parser (>= 2.7.1.5)
-    ruby-progressbar (1.11.0)
-    solargraph (0.40.1)
-      backport (~> 1.1)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.30.0)
+      parser (>= 3.2.1.0)
+    ruby-progressbar (1.13.0)
+    ruby2_keywords (0.0.5)
+    solargraph (0.49.0)
+      backport (~> 1.2)
       benchmark
-      bundler (>= 1.17.2)
+      bundler (~> 2.0)
+      diff-lcs (~> 1.4)
       e2mmap
       jaro_winkler (~> 1.5)
       kramdown (~> 2.3)
       kramdown-parser-gfm (~> 1.1)
-      parser (~> 2.3)
-      reverse_markdown (>= 1.0.5, < 3)
-      rubocop (>= 0.52)
+      parser (~> 3.0)
+      rbs (~> 2.0)
+      reverse_markdown (~> 2.0)
+      rubocop (~> 1.38)
       thor (~> 1.0)
       tilt (~> 2.0)
       yard (~> 0.9, >= 0.9.24)
-    sqlite3 (1.4.2)
+    sqlite3 (1.6.9)
+      mini_portile2 (~> 2.8.0)
+    sqlite3 (1.6.9-x86_64-darwin)
+    sqlite3 (1.6.9-x86_64-linux)
     thor (1.3.0)
-    thread_safe (0.3.6)
     tilt (2.3.0)
-    tzinfo (1.2.9)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.8.0)
+    timeout (0.4.1)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.5.0)
     yard (0.9.34)
 
 PLATFORMS
@@ -117,13 +139,13 @@ PLATFORMS
 DEPENDENCIES
   activerecord
   oso-oso!
-  pry-byebug (~> 3.9.0)
+  pry-byebug (~> 3.10.1)
   rake (~> 12.0)
   rspec (~> 3.0)
-  rubocop (~> 0.89.1)
-  solargraph (~> 0.40.0)
+  rubocop (~> 1.58.0)
+  solargraph (~> 0.49.0)
   sqlite3
   yard (~> 0.9.25)
 
 BUNDLED WITH
-   2.2.4
+   2.4.22

data/Makefile

@@ -1,12 +1,28 @@
-.PHONY: rust install test lint typecheck repl
+.PHONY: rust copy_lib install test lint typecheck repl
+
+UNAME_S := $(shell uname -s)
+UNAME_M := $(shell uname -m)
 
 rust:
 	$(MAKE) -C ../.. rust-build
 
+copy_lib:
+	mkdir -p ext/oso-oso/lib/
+ifeq ($(UNAME_S),Linux)
+ifeq ($(UNAME_M),x86_64)
+	cp ../../target/debug/libpolar.so ext/oso-oso/lib/libpolar-x86_64.so
+else
+	cp ../../target/debug/libpolar.so ext/oso-oso/lib/libpolar-aarch64.so
+endif
+endif
+ifeq ($(UNAME_S),Darwin)
+	cp ../../target/debug/libpolar.dylib ext/oso-oso/lib/
+endif
+
 install:
 	bundle install
 
-test: install rust
+test: install rust copy_lib
 	POLAR_IGNORE_NO_ALLOW_WARNING=1 bundle exec rake spec
 
 lint: install
@@ -15,5 +31,5 @@ lint: install
 typecheck: install
 	bundle exec solargraph typecheck
 
-repl: install rust
+repl: install rust copy_lib
 	bundle exec oso

data/lib/oso/polar/ffi.rb

@@ -6,12 +6,17 @@ module Oso
   module Polar
     # FFI classes shared between all ffi/*.rb modules
     module FFI
-      LIB = "#{::FFI::Platform::LIBPREFIX}polar.#{::FFI::Platform::LIBSUFFIX}"
-      RELEASE_PATH = File.expand_path(File.join(__dir__, "../../../ext/oso-oso/lib/#{LIB}"))
-      DEV_PATH = File.expand_path(File.join(__dir__, "../../../../../target/debug/#{LIB}"))
-      # If the lib exists in the ext/ dir, use it. Otherwise, fall back to
-      # checking the local Rust target dir.
-      LIB_PATH = File.file?(RELEASE_PATH) ? RELEASE_PATH : DEV_PATH
+      LIB =
+        case ::FFI::Platform::OS
+        when /darwin/
+          'libpolar.dylib'
+        when /windows|cygwin|msys/
+          'polar.dll'
+        else
+          "libpolar-#{::FFI::Platform::ARCH}.so"
+        end
+
+      LIB_PATH = File.expand_path(File.join(__dir__, "../../../ext/oso-oso/lib/#{LIB}"))
 
       # Wrapper classes defined upfront to fix Ruby loading issues. Actual
       # implementations live in the sibling `ffi/` directory and are `require`d

data/lib/oso/polar/polar.rb

@@ -153,14 +153,11 @@ module Oso
 
       # Query for a Polar predicate or string.
       #
-      # @overload query(query)
-      #   @param query [String]
-      #   @return [Enumerator] of resulting bindings
-      #   @raise [Error] if the FFI call raises one.
-      # @overload query(query)
-      #   @param query [Predicate]
-      #   @return [Enumerator] of resulting bindings
-      #   @raise [Error] if the FFI call raises one.
+      # @param query [String, Predicate]
+      # @param host [Host]
+      # @param bindings [Hash]
+      # @return [Enumerator] of resulting bindings
+      # @raise [Error] if the FFI call raises one.
       def query(query, host: self.host.dup, bindings: {})
         case query
         when String

data/lib/oso/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Oso
-  VERSION = '0.27.2'
+  VERSION = '0.27.3'
 end

data/oso-oso.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
                        'fixes. More context: [here](https://www.osohq.com/docs/oss/getting-started/deprecation.html).'
   spec.homepage      = 'https://www.osohq.com/'
 
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.4.0')
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.6.10')
 
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = 'https://github.com/osohq/oso'
@@ -37,11 +37,11 @@ Gem::Specification.new do |spec|
 
   # Development dependencies
   spec.add_development_dependency 'activerecord'
-  spec.add_development_dependency 'pry-byebug', '~> 3.9.0'
+  spec.add_development_dependency 'pry-byebug', '~> 3.10.1'
   spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop', '~> 0.89.1'
-  spec.add_development_dependency 'solargraph', '~> 0.40.0'
+  spec.add_development_dependency 'rubocop', '~> 1.58.0'
+  spec.add_development_dependency 'solargraph', '~> 0.49.0'
   spec.add_development_dependency 'sqlite3'
   spec.add_development_dependency 'yard', '~> 0.9.25'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oso-oso
 version: !ruby/object:Gem::Version
-  version: 0.27.2
+  version: 0.27.3
 platform: ruby
 authors:
 - Oso Security, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-20 00:00:00.000000000 Z
+date: 2024-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: 3.10.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: 3.10.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -86,28 +86,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.89.1
+        version: 1.58.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.89.1
+        version: 1.58.0
 - !ruby/object:Gem::Dependency
   name: solargraph
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.40.0
+        version: 0.49.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.40.0
+        version: 0.49.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -147,6 +147,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".ruby-version"
 - ".solargraph.yml"
 - Gemfile
 - Gemfile.lock
@@ -154,8 +155,9 @@ files:
 - README.md
 - Rakefile
 - bin/oso
+- ext/oso-oso/lib/libpolar-aarch64.so
+- ext/oso-oso/lib/libpolar-x86_64.so
 - ext/oso-oso/lib/libpolar.dylib
-- ext/oso-oso/lib/libpolar.so
 - ext/oso-oso/lib/polar.dll
 - lib/oso-oso.rb
 - lib/oso.rb
@@ -197,14 +199,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.6.10
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: 'We have deprecated the legacy Oso open source library. We have plans for