mini_suffix 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c3f65d0b7aa566e043a131ba8bec90b666a74e51
-  data.tar.gz: 9ecb681e664faabdc1aa12797fcb16e6d0456319
+SHA256:
+  metadata.gz: da562466a7635ef4abe50e473d7314be39a80487aa3d77fbb39cee066b0a5d64
+  data.tar.gz: 963f965dbeb5b87c876a818f1e0d4fa6a53b66ec56f5a12ac4a7ae7e890aa302
 SHA512:
-  metadata.gz: 285ba55404360a24fda9ccbfb80fa5116b77ec52e2ab2d5c2791129884f7db119d272fcff843b805438c7c1d10a247b9cb1fe617a91402bb3a2b4f19372a4698
-  data.tar.gz: a8df30f6c91c4e7fe1a19a123cab748241919337d76e4097a84cbf61d5d6c6b562da3bb9277d4f6cb2895a118fcc04be67c34031784e2c6d1c38fad32357c318
+  metadata.gz: 1938b29e11700f29a1f3ca7956d1fa9513ab48a0ebd91dcb6e037fbb772744485dc30702b50ec04eab953ad3832fac8eb5c2c4d378f2dede939d933fb12b4499
+  data.tar.gz: 0f442e1772a36e5932d6e942c8c0824da1a5b9b3c12e1c8c1ee2b488540f16452b42d7397959d5df7487f511ea62f02e2c6f489c9fa9ec53cdc364e67c83e0a8

data/.github/workflows/ci.yml

@@ -0,0 +1,34 @@
+name: Mini Suffix Tests
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    name: Ruby ${{ matrix.ruby }}
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ["2.7", "2.6", "2.5"]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - name: Bundler cache
+        uses: actions/cache@v2
+        with:
+          path: vendor/bundle
+          key: ${{ runner.os }}-${{ matrix.ruby }}-gems-${{ hashFiles('**/Gemfile.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-${{ matrix.ruby }}-gems-
+      - name: Setup gems
+        run: |
+          bundle config path vendor/bundle
+          bundle install --jobs 4
+      - name: Tests
+        run: bundle exec rspec

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+# 0.3.2
+
+* Bump libpsl to v0.21.1, and bump binaries
+* Add binary for Apple silicon devices
+
+  *davidtaylorhq*
+
+# 0.3.1
+
+* Add libpsl shared libary for Linux ppc64le
+
+  *runlevel5*
+
 # 0.3.0
 
 * Add libpsl shared library for osx support.

data/README.md

@@ -3,7 +3,6 @@
 ## Installation
 
 ### Debian
-`sudo apt-get install libpsl-dev`
 
 Add this line to your application's Gemfile:
 
@@ -31,7 +30,7 @@ MiniSuffix.domain("www.careers.gov.sg")
 # => "careers.gov.sg"
 ```
 
-##Benchmark
+## Benchmark
 
 ```
 # benchmark/bench.rb
@@ -59,6 +58,15 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
+## Updating libpsl
+
+Libpsl binaries are bundled with the gem. The current version is checked out as a submodule in `./libpsl/`. To update, checkout a later commit
+in the submodule (ideally matching an upstream release tag). You will then need to rebuild the binaries for all architectures. This requires running `./build-libpsl.sh` in each environment. Depending on your setup, you may be able to accomplish that via virtual machines and/or Docker.
+
+Check the comments in `./build-libpsl.sh` for more information.
+
+The submodule bump and updated binaries should be checked in to the repository.
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/discourse/mini_suffix.

data/build-libpsl.sh

@@ -0,0 +1,28 @@
+#! /bin/bash
+
+set -e
+export DEBIAN_FRONTEND=noninteractive
+cd $(dirname ${BASH_SOURCE[0]})/libpsl
+
+# A rough script to build libpsl from source, and move the binary to the /vendor directory.
+# 
+# On linux, you will need a number of dependencies:
+# apt-get update
+# apt-get install -y meson gcc clang libtool llvm-dev valgrind python3 python3-setuptools libicu-dev
+#
+# On macOS, run this script in the homebrew build environment using `brew sh -c ./build-libpsl.sh`
+#
+# If you're running this, make sure to update the binaries for all other architectures as well
+
+rm -rf builddir
+meson builddir --buildtype=release -Druntime=no -Dbuiltin=libicu
+ninja -C builddir
+ninja -C builddir test
+
+if [[ "$OSTYPE" == "darwin"* ]]; then
+  cp builddir/src/libpsl.dylib ../vendor/libpsl.darwin-$(arch).dylib
+else
+  cp builddir/src/libpsl.so ../vendor/libpsl.$(arch).so
+fi
+
+echo "Done $(arch)"

data/lib/mini_suffix.rb

@@ -5,8 +5,10 @@ module MiniSuffix
   extend FFI::Library
 
   ffi_lib [
-    File.join(File.dirname(File.expand_path('..', __FILE__)), 'vendor/libpsl.so'),
-    File.join(File.dirname(File.expand_path('..', __FILE__)), 'vendor/libpsl.dylib'),
+    File.join(File.dirname(File.expand_path('..', __FILE__)), 'vendor/libpsl.x86_64.so'),  
+    File.join(File.dirname(File.expand_path('..', __FILE__)), 'vendor/libpsl.ppc64le.so'),
+    File.join(File.dirname(File.expand_path('..', __FILE__)), 'vendor/libpsl.darwin-i386.dylib'),
+    File.join(File.dirname(File.expand_path('..', __FILE__)), 'vendor/libpsl.darwin-arm64.dylib'),
   ]
 
   attach_function :psl_builtin, [], :pointer

data/lib/mini_suffix/version.rb

@@ -1,3 +1,3 @@
 module MiniSuffix
-  VERSION = "0.3.0"
+  VERSION = "0.3.2"
 end

data/mini_suffix.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'ffi', '~> 1.9'
 
-  spec.add_development_dependency "bundler", "~> 1.16"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mini_suffix
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Guo Xiang Tan
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2017-11-30 00:00:00.000000000 Z
+date: 2021-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -28,16 +28,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -66,17 +66,17 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description: 
+description:
 email:
 - tgx@discourse.org
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".gitmodules"
 - ".rspec"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -85,16 +85,19 @@ files:
 - benchmark/bench.rb
 - bin/console
 - bin/setup
+- build-libpsl.sh
 - lib/mini_suffix.rb
 - lib/mini_suffix/version.rb
 - mini_suffix.gemspec
-- vendor/libpsl.dylib
-- vendor/libpsl.so
+- vendor/libpsl.darwin-arm64.dylib
+- vendor/libpsl.darwin-i386.dylib
+- vendor/libpsl.ppc64le.so
+- vendor/libpsl.x86_64.so
 homepage: https://github.com/discourse/mini_suffix
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -109,9 +112,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: FFI wrapper for libpsl
 test_files: []

data/.travis.yml

@@ -1,5 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.4.2
-before_install: gem install bundler -v 1.16.0