upl 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3f3986baaa4caf8654ae53619fc3606dd9f608f7f7722cd3860d6ec2af8a1fe
-  data.tar.gz: 18e8d59804dd3802da05df95d667ffff47d71e73af82d3bbad509dc0ab4f2930
+  metadata.gz: 933b536ad1c58be9cf92e474272904b5752d9eef7f3004be1ec35a5623438aa6
+  data.tar.gz: 2d212a7ea47101d3fd9255b8b53bffcb8bf4ce8f15989b7a34a66dbc39b09cc9
 SHA512:
-  metadata.gz: f34cf6fafe347a3f7494108bf286abbff5771e51450594858d455d13630ac7645f36f1b26c3f45757a611bdca52dbe604dbd5e4c63c54ee4cb3cf176d22de7a8
-  data.tar.gz: c4524355fa328c53fe99c56a1a99553e0a9cecff4b31c177571f4c6b895bc229388829d406a714e34b61667f975b046dde2507236c473d565f415634a130f604
+  metadata.gz: 52b2a3376e96852df1e690e40f89d784c7f5100bf72b628264dec970b1b48b238cad425c5e51c469b7496d7bc7e8951eaa276285e40009cbf2d94bba9463d363
+  data.tar.gz: b1fa64877cf05ab1a507eb082c592494976d36611e534fb543b6e89854d9ba01326bf89c7ea035577d8e21111949ea3901c3e8da35bdf43c5fdec5acd0816818

data/.github/workflows/build.yml

@@ -0,0 +1,77 @@
+name: rspecs
+
+on:
+  workflow_dispatch: {}
+  push:
+    branches: [test-workflow]
+    tags: v*
+
+jobs:
+  rspec:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        # note 20-Jul-2023 2.7.8 is EOL
+        ruby_version: ['2.7.8', '3.0.6', '3.1.4', '3.2.2']
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby_version }}
+
+    - run: bundle install
+
+    # install from ppa for up-to-date version
+    - name: update ubuntu packages
+      run: |
+        sudo apt-get update
+
+        # otherwise it prompts for timezone
+        sudo apt-get install -y tzdata
+        sudo apt-get install -y software-properties-common
+
+    - name: install swi-prolog from ppa
+      run: |
+        # Stable versions
+        sudo apt-add-repository -y ppa:swi-prolog/stable
+        sudo apt-get update
+        sudo apt-get install -y swi-prolog-nox
+
+        # Development versions
+        # sudo apt-add-repository ppa:swi-prolog/devel
+        # sudo apt-get update
+        # sudo apt-get install -y swi-prolog-nox
+
+    - run: rspec
+
+  rspec-macos:
+    runs-on: macos-latest
+    strategy:
+      matrix:
+        # note 20-Jul-2023 2.7.8 is EOL
+        ruby_version: ['2.7.8', '3.0.6', '3.1.4', '3.2.2']
+
+    steps:
+    - name: install swi-prolog
+      run: |
+        /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+        brew install swi-prolog
+
+        # for possible future debugging
+        # otool -L $(which swipl)
+        # swipl --dump-runtime-variables=sh
+        # env
+        # find /usr/local/Cellar/swi-prolog/9.0.4 -ls
+        # false
+
+    - uses: actions/checkout@v3
+
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby_version }}
+
+    - run: bundle install
+
+    - run: rspec

data/History.txt

@@ -1,3 +1,10 @@
+== 0.2.4
+* should now find the dylib on macos
+* run rspecs on multiple  ruby versions
+
+== 0.2.3
+* update C value for >=swi-prolog-8.1.29
+
 == 0.2.2
 * restrict to <=swi-prolog-8.1.22
 

data/README.md

@@ -1,3 +1,5 @@
+![rspecs](https://github.com/djellemah/upl/actions/workflows/build.yml/badge.svg)
+
 # Upl
 
 Use SWI-Prolog from ruby.
@@ -8,6 +10,12 @@ Define foreign predicates in ruby, so prolog can call back into ruby code.
 
 Assert facts containing ruby objects, so prolog can query ruby data by calling ruby methods.
 
+## versions
+
+Works on ruby-2.7.8 ruby-3.0, ruby-3.1, ruby-3.2
+
+and swipl-8.1.29 to swipl-9.1.2
+
 ## Tutorial
 
 The query api always returns an ```Enumerable``` of all values which satisfy the query.

data/docker-compose.yml

@@ -0,0 +1,7 @@
+version: '3.8'
+
+services:
+  linux:
+    container_name: upl-linux
+    image: ubuntu:latest
+    command: sleep 14400

data/lib/upl/extern.rb

@@ -26,18 +26,28 @@ module Upl
     # should result in something like
     #   /usr/lib64/swipl-7.7.18/lib/x86_64-linux/libswipl.so
     # which should actually exist
-    def self.so_path
+    def self.calculate_so_path
       values = swipl_config_values
-      p = Pathname "#{values['PLBASE']}/lib/#{values['PLARCH']}/#{values['PLLIB'].gsub('-l', 'lib')}.#{values['PLSOEXT']}"
+      p = if easy_so = values['PLLIBSWIPL']
+        Pathname easy_so
+      else
+        # figure it out the hard way - this was prior to 8.1 or thereabouts
+        Pathname "#{values['PLBASE']}/lib/#{values['PLARCH']}/#{values['PLLIB'].gsub('-l', 'lib')}.#{values['PLSOEXT']}"
+      end
       p.realpath.to_s
     rescue Errno::ENOENT => ex
       puts "problem with library #{p.to_s}: #{ex.message}"
       exit 1
     end
 
-    if (version = swipl_config_values['PLVERSION']) >= '80100'
-      # 801xx seems to have changed some calls. Not sure yet what they are.
-      raise "unsupported version #{version}"
+    # where is the so/dylib
+    # overridable by env var SWIPL_SO_PATH
+    def self.so_path
+      ENV['SWIPL_SO_PATH'] || calculate_so_path
+    end
+
+    if (version = swipl_config_values['PLVERSION']) < '80129'
+      raise "unsupported version <#{version}"
     end
 
     dlload so_path
@@ -105,30 +115,31 @@ module Upl
     PL_VARIABLE =              (1)
     PL_ATOM =                  (2)
     PL_INTEGER =               (3)
-    PL_FLOAT =                 (4)
-    PL_STRING =                (5)
-    PL_TERM =                  (6)
-    PL_NIL =                   (7)
-    PL_BLOB =                  (8)
-    PL_LIST_PAIR =             (9)
-    PL_FUNCTOR =               (10)
-    PL_LIST =                  (11)
-    PL_CHARS =                 (12)
-    PL_POINTER =               (13)
-    PL_CODE_LIST =             (14)
-    PL_CHAR_LIST =             (15)
-    PL_BOOL =                  (16)
-    PL_FUNCTOR_CHARS =         (17)
-    _PL_PREDICATE_INDICATOR =  (18)
-    PL_SHORT =                 (19)
-    PL_INT =                   (20)
-    PL_LONG =                  (21)
-    PL_DOUBLE =                (22)
-    PL_NCHARS =                (23)
-    PL_UTF8_CHARS =            (24)
-    PL_UTF8_STRING =           (25)
-    PL_INT64 =                 (26)
-    PL_NUTF8_CHARS =           (27)
+    PL_RATIONAL =              (4)
+    PL_FLOAT =                 (5)
+    PL_STRING =                (6)
+    PL_TERM =                  (7)
+    PL_NIL =                   (8)
+    PL_BLOB =                  (9)
+    PL_LIST_PAIR =             (10)
+    PL_FUNCTOR =               (11)
+    PL_LIST =                  (12)
+    PL_CHARS =                 (13)
+    PL_POINTER =               (14)
+    PL_CODE_LIST =             (15)
+    PL_CHAR_LIST =             (16)
+    PL_BOOL =                  (17)
+    PL_FUNCTOR_CHARS =         (18)
+    PL_PREDICATE_INDICATOR =   (19)
+    PL_SHORT =                 (20)
+    PL_INT =                   (21)
+    PL_LONG =                  (22)
+    PL_DOUBLE =                (23)
+    PL_NCHARS =                (24)
+    PL_UTF8_CHARS =            (25)
+    PL_UTF8_STRING =           (26)
+    PL_INT64 =                 (27)
+    PL_NUTF8_CHARS =           (28)
     PL_NUTF8_CODES =           (29)
     PL_NUTF8_STRING =          (30)
     PL_NWCHARS =               (31)
@@ -159,27 +170,34 @@ module Upl
 
     # /usr/lib64/swipl/include/SWI-Prolog.h
     module Convert
-      BUF_DISCARDABLE = 0x0000
-      BUF_RING =        0x0100
-      BUF_MALLOC =      0x0200
-      BUF_ALLOW_STACK = 0x0400
-
-      REP_ISO_LATIN_1 = 0x0000
-      REP_UTF8  =       0x1000
-      REP_MB =          0x2000
-
-      CVT_ATOM =            0x0001
-      CVT_STRING =          0x0002
-      CVT_LIST =            0x0004
-      CVT_INTEGER =         0x0008
-      CVT_FLOAT =           0x0010
-      CVT_VARIABLE =        0x0020
-      CVT_NUMBER =          CVT_INTEGER|CVT_FLOAT
-      CVT_ATOMIC =          CVT_NUMBER|CVT_ATOM|CVT_STRING
-      CVT_WRITE =           0x0040
-      CVT_WRITE_CANONICAL = 0x0080
-      CVT_WRITEQ =          0x00C0
-      CVT_ALL =             CVT_ATOMIC|CVT_LIST
+      BUF_DISCARDABLE =     0x00000000  # Store in single thread-local buffer
+      BUF_RING =            0x00010000  # Store in ring of 16 buffers
+      BUF_MALLOC =          0x00020000  # Store using PL_malloc()
+      BUF_ALLOW_STACK =     0x00040000  # Allow pointer into (global) stack
+      BUF_NORING =          0x00080000  # Do not store in ring
+
+      # output representation
+      REP_ISO_LATIN_1 =     0x00000000
+      REP_UTF8 =            0x00100000
+      REP_MB =              0x00200000
+
+      CVT_ATOM =            0x00000001
+      CVT_STRING =          0x00000002
+      CVT_LIST =            0x00000004
+      CVT_INTEGER =         0x00000008
+      CVT_RATIONAL =        0x00000010
+      CVT_FLOAT =           0x00000020
+      CVT_VARIABLE =        0x00000040
+      CVT_NUMBER =          (CVT_RATIONAL|CVT_FLOAT)
+      CVT_ATOMIC =          (CVT_NUMBER|CVT_ATOM|CVT_STRING)
+      CVT_WRITE =           0x00000080
+      CVT_WRITE_CANONICAL = 0x00000080
+      CVT_WRITEQ =          0x000000C0
+      CVT_ALL =             (CVT_ATOMIC|CVT_LIST)
+      CVT_MASK =            0x00000fff
+
+      CVT_EXCEPTION =       0x00001000  # throw exception on error
+      CVT_VARNOFAIL =       0x00002000  # return 2 if argument is unbound
     end
 
     extern 'predicate_t PL_pred(functor_t f, module_t m)'

data/lib/upl/query.rb

@@ -47,7 +47,7 @@ module Upl
       call.map do |row|
         # TODO this assume the if statement is faster than a call to a default ->i{i}
         if @map_blk
-          blk.call @map_blk[row]
+          blk.call @map_blk[**row]
         else
           blk.call row
         end

data/lib/upl/runtime.rb

@@ -1,4 +1,5 @@
 require 'fiddle'
+require 'pp'
 
 require_relative 'extern'
 

data/lib/upl/tree.rb

@@ -53,6 +53,9 @@ module Upl
         bytes = double_ptr[0,8]
         bytes.unpack('D').first
 
+      when Extern::PL_RATIONAL
+        raise NotImplemented, 'convert to rational'
+
       when Extern::PL_STRING
         # TODO could possibly get away with BUF_DISCARDABLE here?
 

data/lib/upl/version.rb

@@ -1,3 +1,3 @@
 module Upl
-  VERSION = '0.2.2'
+  VERSION = '0.2.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: upl
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - John Anderson
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-05-24 00:00:00.000000000 Z
+date: 2023-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -87,6 +87,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/build.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -97,6 +98,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- docker-compose.yml
 - lib/upl.rb
 - lib/upl/atom.rb
 - lib/upl/dict.rb
@@ -118,7 +120,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -133,8 +135,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.4.6
+signing_key:
 specification_version: 4
 summary: Access SWI-Prolog engine from ruby
 test_files: []