mini_suffix 0.1.0 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0be3c2c9d92f4a37a7691c18bb0cfcef55c1231f
-  data.tar.gz: 65a80e40e464a618508698c3d906d54d31c8a06d
+SHA256:
+  metadata.gz: fccde82176bf00cfeafda11ca5155185a0dd476a6a22531289883a20d20da96d
+  data.tar.gz: e8e30e2c0433f05fb37338809276c909c2dcf82c9dc5075c48b2a469870e7928
 SHA512:
-  metadata.gz: c18c41f0b55013130fad3aae53d83d80ac14123435cb24ea444e8f5c9ebd6850384a734b395099d91dada8af5a8096e8cc4179617585eb04e4d5313fb46667bf
-  data.tar.gz: f02b57073cbfa0f41bb0a84dd44a97cbe0b863518003d26d876012612ea9da7502c074fd49e559840d37b60a75094b708657e4c7f911496df8817b814b867130
+  metadata.gz: ff8f7597ce5345ce451ec496d48ff667dec1b13e86d0075af34a1f1baacf2d70c38b20648122f3adb49558a0468d5452e4647770939348cd285156fd3bf0fbf2
+  data.tar.gz: 203f22ca8c0da035d40291600a19d3552967e276d857edbb66dea702fc10bf4002c6c1e14c4d82c9fa04e84f8a1223df1ecd7c4e3dd552212d36049f924a0e13

data/.github/workflows/ci.yml

@@ -0,0 +1,49 @@
+name: Mini Suffix Tests
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+      - main
+
+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
+  publish:
+    if: github.event_name == 'push' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master')
+    needs: build
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Release Gem
+        uses: discourse/publish-rubygems-action@v2
+        env:
+          RUBYGEMS_API_KEY: ${{ secrets.RUBYGEMS_API_KEY }}
+          GIT_EMAIL: team@discourse.org
+          GIT_NAME: discoursebot

data/.gitmodules

@@ -0,0 +1,3 @@
+[submodule "libpsl"]
+	path = libpsl
+	url = https://github.com/rockdaboot/libpsl.git

data/CHANGELOG.md

@@ -0,0 +1,24 @@
+# 0.3.3
+
+* Add libpsl shared libary for Linux aarch64
+
+  *xfalcox*
+
+# 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.
+
+  *tgxworld*

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/version.rb

@@ -1,3 +1,3 @@
 module MiniSuffix
-  VERSION = "0.1.0"
+  VERSION = "0.3.3"
 end

data/lib/mini_suffix.rb

@@ -4,7 +4,14 @@ require 'ffi'
 module MiniSuffix
   extend FFI::Library
 
-  ffi_lib File.join(File.dirname(File.expand_path('..', __FILE__)), 'vendor/libpsl.so')
+  ffi_lib [
+    File.join(File.dirname(File.expand_path('..', __FILE__)), 'vendor/libpsl.aarch64.so'),  
+    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
   attach_function :psl_registrable_domain, [:pointer, :string], :string
   attach_function :psl_get_version, [], :string

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 "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  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.1.0
+  version: 0.3.3
 platform: ruby
 authors:
 - Guo Xiang Tan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-29 00:00:00.000000000 Z
+date: 2021-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -28,42 +28,42 @@ 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
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '3.0'
 description: 
@@ -73,9 +73,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
+- ".gitmodules"
 - ".rspec"
-- ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -83,10 +85,15 @@ 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.so
+- vendor/libpsl.aarch64.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
@@ -106,8 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: FFI wrapper for libpsl

data/.travis.yml

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