emf2svg 0.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f40393f8fd1ee8fac3c0bac60dd57cdffa37e7c29fe4c84654a1c09fd3eddc6
-  data.tar.gz: 1177ab6679786bfaa7ee08dec8c38ac52cf7c9367c83a2c8197569950266c7df
+  metadata.gz: 2ebbbe5dc469180c1e2285aac506e24e1138dee6093002731715a8e36e427891
+  data.tar.gz: 6e5aa5c69d96ab761c2e5dbf2e51291582e27173be26734ef0a4a58d15f8b1d4
 SHA512:
-  metadata.gz: a969bc6a4061541d00b0385951622f0d640d96f2d03a5a9081e9b583b4b60e4527e331ea88c287a9049ace569e85f9473bfaca9d029a5ed0122091ef43778f5c
-  data.tar.gz: 688381d0362f87e799bbe26a18d673a3eda30f2eaa4e7c2e39d3e925f90304726d97b32d5d8e195c6fd1493c0dddc5643e08e1a0973d710eb3e1dbe2512690f3
+  metadata.gz: c922cb24fa99821013676059192859595077ed78f48dd767196ac976446a698af5e96656f045b01dbf80c4e3b87ee38da36b1dff890a69a256c3e9e2dbcb3a44
+  data.tar.gz: 3d4f558acde1ac4b8a0c9ccbaf9803c592e493f8b97a35558dc0cd2264a12587d551c4a4ac753079a9334fe8eb01ba4f3cd687e598169aa891c2d91709bc49d4

data/.github/workflows/main.yml

@@ -2,68 +2,162 @@ name: main
 
 on:
   push:
-    branches: [ main, master ]
+    branches: [ main ]
   pull_request:
+  workflow_dispatch:
 
 jobs:
   test:
     runs-on: ${{ matrix.os }}
     strategy:
+      max-parallel: 3
       fail-fast: false
       matrix:
-        os: [ ubuntu-latest, windows-latest, macos-latest ]
+        os: [ ubuntu-18.04, ubuntu-latest, windows-latest, macos-latest ]
+        ruby-version: [ '2.7' ]
+        include:
+          - os: windows-latest
+            ruby-version: '3.1'
     steps:
     - uses: actions/checkout@v2
 
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.6.6
         bundler-cache: true
+        ruby-version: ${{ matrix.ruby-version }}
 
     - run: bundle exec rake
 
-  build-gem:
-    runs-on: ubuntu-18.04
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      max-parallel: 3
+      fail-fast: false
+      matrix:
+        include:
+          - os: ubuntu-18.04
+            platform: any
+            ruby-version: '2.7'
+          - os: ubuntu-18.04
+            platform: x86_64-linux
+            ruby-version: '2.7'
+          - os: windows-latest
+            platform: x64-mingw32
+            ruby-version: '2.7'
+          - os: windows-latest
+            platform: x64-mingw-ucrt
+            ruby-version: '3.1'
+          - os: macos-latest
+            platform: x86_64-darwin
+            ruby-version: '2.7'
     steps:
       - uses: actions/checkout@v2
 
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '2.6'
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
 
-      - run: bundle config set path 'vendor/bundle'
-
-      - run: bundle install --jobs 4 --retry 3
-
-      - run: bundle exec rake build
+      - run: bundle exec rake gem:native:${{ matrix.platform }}
 
       - uses: actions/upload-artifact@v2
         with:
           name: pkg
           path: pkg/*.gem
 
-  test-gem:
-    needs: build-gem
+      - name: Install gem
+        run: gem install -b pkg/emf2svg-*.gem
+
+      - name: Test conversion
+        run: |
+          ruby -remf2svg -e "puts File.write('output.svg', Emf2svg.from_file('spec/examples/image1.emf'), mode: 'wb')"
+
+  test-build:
+    needs: build
     runs-on: ${{ matrix.os }}
     strategy:
+      max-parallel: 3
       fail-fast: false
       matrix:
-        os: [ ubuntu-18.04, ubuntu-latest, windows-latest, macos-latest ]
+        include:
+          - os: ubuntu-latest
+            platform: any
+            ruby-version: '2.7'
+          - os: windows-latest
+            platform: any
+            ruby-version: '2.7'
+          - os: macos-latest
+            platform: any
+            ruby-version: '2.7'
+          - os: ubuntu-18.04
+            platform: x86_64-linux
+            ruby-version: '2.7'
+          - os: ubuntu-latest
+            platform: x86_64-linux
+            ruby-version: '2.7'
+          - os: windows-latest
+            platform: x64-mingw32
+            ruby-version: '2.7'
+          - os: windows-latest
+            platform: x64-mingw-ucrt
+            ruby-version: '3.1'
+          - os: macos-latest
+            platform: x86_64-darwin
+            ruby-version: '2.7'
+            
     steps:
       - uses: actions/checkout@v2
 
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+
       - uses: actions/download-artifact@v2
         with:
           name: pkg
           path: pkg
 
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: '2.6'
+      - name: Install native gem
+        if: matrix.platform == 'any'
+        run: gem install -b pkg/emf2svg-$(ruby -I lib -r emf2svg/version -e "puts Emf2svg::VERSION").gem
 
-      - name: Install gem
-        run: gem install --no-document pkg/emf2svg-*.gem
+      - name: Install binary gem
+        if: matrix.platform != 'any'
+        run: gem install -b pkg/emf2svg-*-${{ matrix.platform }}.gem
 
       - name: Test conversion
         run: |
           ruby -remf2svg -e "puts File.write('output.svg', Emf2svg.from_file('spec/examples/image1.emf'), mode: 'wb')"
+
+  cross:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      max-parallel: 3
+      fail-fast: false
+      matrix:
+        include:
+          - os: ubuntu-18.04
+            platform: arm64-linux
+            ruby-version: '2.7'
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install packages
+        run: |
+          sudo apt-get update
+          sudo apt-get install gcc-aarch64-linux-gnu g++-aarch64-linux-gnu binutils-aarch64-linux-gnu gperf
+        
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
+
+      - run: bundle exec rake gem:native:${{ matrix.platform }}
+
+      - uses: actions/upload-artifact@v2
+        with:
+          name: pkg
+          path: pkg/*.gem
+
+      - name: Install gem
+        run: gem install -b pkg/emf2svg-*.gem

data/.github/workflows/release.yml

@@ -6,31 +6,110 @@ on:
       - 'v*'
 
 jobs:
-  release:
-    runs-on: ubuntu-18.04
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      max-parallel: 3
+      fail-fast: false
+      matrix:
+        include:
+          - os: ubuntu-18.04
+            platform: any
+            ruby-version: '2.7'
+          - os: ubuntu-18.04
+            platform: x86_64-linux
+            ruby-version: '2.7'
+          - os: windows-latest
+            platform: x64-mingw32
+            ruby-version: '2.7'
+          - os: windows-latest
+            platform: x64-mingw-ucrt
+            ruby-version: '3.1'
+          - os: macos-latest
+            platform: x86_64-darwin
+            ruby-version: '2.7'
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
 
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '2.6'
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
 
-      - run: bundle config set path 'vendor/bundle'
+      - run: bundle exec rake gem:native:${{ matrix.platform }}
 
-      - run: bundle install --jobs 4 --retry 3
+      - uses: actions/upload-artifact@v2
+        with:
+          name: pkg
+          path: pkg/*.gem
+
+      - name: Install gem
+        run: gem install -b pkg/emf2svg-*.gem
+
+      - name: Test conversion
+        run: |
+          ruby -remf2svg -e "puts File.write('output.svg', Emf2svg.from_file('spec/examples/image1.emf'), mode: 'wb')"
+
+  cross:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      max-parallel: 3
+      fail-fast: false
+      matrix:
+        include:
+          - os: ubuntu-18.04
+            platform: arm64-linux
+            ruby-version: '2.7'
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install packages
+        run: |
+          sudo apt-get update
+          sudo apt-get install gcc-aarch64-linux-gnu g++-aarch64-linux-gnu binutils-aarch64-linux-gnu gperf
+        
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
 
-      - run: bundle exec rake
+      - run: bundle exec rake gem:native:${{ matrix.platform }}
+
+      - uses: actions/upload-artifact@v2
+        with:
+          name: pkg
+          path: pkg/*.gem
+
+      - name: Install gem
+        run: gem install -b pkg/emf2svg-*.gem
+
+  publish:
+    needs: [ build, cross ]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '2.7'
+          bundler-cache: true
+
+      - uses: actions/download-artifact@v2
+        with:
+          name: pkg
+          path: pkg
 
       - name: Publish to rubygems.org
         env:
           RUBYGEMS_API_KEY: ${{secrets.METANORMA_CI_RUBYGEMS_API_KEY}}
         run: |
-          gem install gem-release
+          mkdir -p ~/.gem
           touch ~/.gem/credentials
           cat > ~/.gem/credentials << EOF
           ---
           :rubygems_api_key: ${RUBYGEMS_API_KEY}
           EOF
           chmod 0600 ~/.gem/credentials
-          git status
-          gem release
+          gem signin
+          ls -l pkg/
+          for gem in pkg/*.gem; do gem push -V $gem; done

data/.rubocop.yml

@@ -2,4 +2,8 @@ inherit_from:
   - 'https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml'
 
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.7
+  SuggestExtensions: false
+
+Gemspec/RequireMFA:
+  Enabled: false

data/Rakefile

@@ -15,3 +15,53 @@ task :compile do
   require_relative "ext/extconf"
 end
 task spec: :compile
+
+desc "Build install-compilation gem"
+task "gem:native:any" do
+  sh "rake platform:any gem"
+end
+
+require "rubygems/package_task"
+
+desc "Define the gem task to build on any platform (compile on install)"
+task "platform:any" do
+  spec = Gem::Specification::load("emf2svg.gemspec").dup
+  task = Gem::PackageTask.new(spec)
+  task.define
+end
+
+platforms = [
+  "x64-mingw32",
+  "x64-mingw-ucrt",
+  "x86_64-linux",
+  "arm64-linux",
+  "x86_64-darwin",
+]
+
+platforms.each do |platform|
+  desc "Build pre-compiled gem for the #{platform} platform"
+  task "gem:native:#{platform}" do
+    sh "rake compile platform:#{platform} gem target_platform=#{platform}"
+  end
+
+  desc "Define the gem task to build on the #{platform} platform (binary gem)"
+  task "platform:#{platform}" do
+    spec = Gem::Specification::load("emf2svg.gemspec").dup
+    spec.platform = Gem::Platform.new(platform)
+    spec.files += Dir.glob("lib/emf2svg/*.{dll,so,dylib}")
+    spec.extensions = []
+    spec.dependencies.reject! { |d| d.name == "mini_portile2" }
+
+    task = Gem::PackageTask.new(spec)
+    task.define
+  end
+end
+
+require "rake/clean"
+
+CLOBBER.include("pkg")
+CLEAN.include("ports",
+              "tmp",
+              "lib/emf2svg/*.dll",
+              "lib/emf2svg/*.dylib",
+              "lib/emf2svg/*.so")

data/emf2svg.gemspec

@@ -9,9 +9,9 @@ Gem::Specification.new do |spec|
   spec.email         = ["open.source@ribose.com"]
 
   spec.summary       = "Ruby interface to libemf2svg."
-  # spec.description   = "TODO: Write a longer description or delete this line."
   spec.homepage      = "https://github.com/metanorma/emf2svg-ruby"
-  spec.required_ruby_version = ">= 2.5.0"
+  spec.license       = "BSD-2-Clause"
+  spec.required_ruby_version = ">= 2.7.0"
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/metanorma/emf2svg-ruby"
@@ -30,8 +30,8 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "mini_portile2", "~> 2.6"
 
   spec.add_development_dependency "rubocop", "1.5.2"
-  spec.add_development_dependency "rubocop-performance"
-  spec.add_development_dependency "rubocop-rails"
+  spec.add_development_dependency "rubocop-performance", "~> 1.0"
+  spec.add_development_dependency "rubocop-rails", "~> 2.0"
 
   spec.extensions = ["ext/extconf.rb"]
 end

data/lib/emf2svg/recipe.rb

@@ -1,3 +1,4 @@
+require "rbconfig"
 require "mini_portile2"
 require "pathname"
 require "tmpdir"
@@ -7,11 +8,11 @@ module Emf2svg
     ROOT = Pathname.new(File.expand_path("../..", __dir__))
 
     def initialize
-      super("libemf2svg", "1.3.0")
+      super("libemf2svg", "1.4.0")
 
       @files << {
-        url: "https://github.com/metanorma/libemf2svg/releases/download/1.3.0/libemf2svg.tar.gz",
-        sha256: "aacbf001701e3f863e97c6c117146ee710636283851d866b715de653fb79343e", # rubocop:disable Layout/LineLength
+        url: "https://github.com/metanorma/libemf2svg/releases/download/v1.4.0/libemf2svg.tar.gz",
+        sha256: "e05081986a0ec6c5bd494068825c7b55dd21fa1814942a61293b225af2d957d2", # rubocop:disable Layout/LineLength
       }
 
       @target = ROOT.join(@target).to_s
@@ -28,8 +29,42 @@ module Emf2svg
       FileUtils.touch(checkpoint)
     end
 
+    # rubocop:disable Metrics/MethodLength
+    # rubocop:disable Metrics/CyclomaticComplexity
+    def host_platform
+      @host_platform ||=
+        case @host
+        when /\Ax86_64.*mingw32/
+          "x64-mingw32"
+        when /\Ai[3-6]86.*mingw32/
+          "x86-mingw32"
+        when /\Ax86_64.*linux/
+          "x86_64-linux"
+        when /\Aarm64.*linux/
+          "xarm64-linux"
+        when /\Ai[3-6]86.*linux/
+          "x86-linux"
+        when /\Ax86_64.*darwin/
+          "x86_64-darwin"
+        when /\Aarm64.*darwin/
+          "arm64-darwin"
+        else
+          raise "CrossRuby.platform: unsupported host: #{@host}"
+        end
+    end
+    # rubocop:enable Metrics/CyclomaticComplexity
+    # rubocop:enable Metrics/MethodLength
+
+    def target_platform
+      @target_platform = ENV["target_platform"] || host_platform
+    end
+
+    def cross_compiling?
+      not host_platform.eql? target_platform
+    end
+
     def checkpoint
-      File.join(@target, "#{name}-#{version}-#{host}.installed")
+      File.join(@target, "#{name}-#{version}-#{target_platform}.installed")
     end
 
     def configure_defaults
@@ -37,9 +72,13 @@ module Emf2svg
 
       opts << "-DCMAKE_BUILD_TYPE=Release"
 
-      if MiniPortile.windows?
+      if MiniPortile.windows? || cross_compiling?
         opts << "-DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake"
-        opts << "-GVisual Studio 16 2019"
+      end
+
+      if cross_compiling? && (not MiniPortile.windows?)
+        message("Cross-compiling on #{host_platform} for #{target_platform}\n")
+        opts << "-DVCPKG_TARGET_TRIPLET=#{target_platform}"
       end
 
       opts

data/lib/emf2svg/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Emf2svg
-  VERSION = "0.1.1"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emf2svg
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Ribose
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-03 00:00:00.000000000 Z
+date: 2022-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -56,30 +56,30 @@ dependencies:
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 description: 
 email:
 - open.source@ribose.com
@@ -109,7 +109,8 @@ files:
 - lib/emf2svg/recipe.rb
 - lib/emf2svg/version.rb
 homepage: https://github.com/metanorma/emf2svg-ruby
-licenses: []
+licenses:
+- BSD-2-Clause
 metadata:
   homepage_uri: https://github.com/metanorma/emf2svg-ruby
   source_code_uri: https://github.com/metanorma/emf2svg-ruby
@@ -122,14 +123,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Ruby interface to libemf2svg.