excavate 0.3.3 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae1e2f6707705a5247f26db5c29f7ffb3618ccdf890277ca664cc91361e9ab7c
-  data.tar.gz: 5ea58834d2bcbb1005a36c9f239d32f34a7e61a2bff4a4a0548cdc5e4ae38688
+  metadata.gz: 704f5dd69fe570114126bfbf749ed868c09d349fe1674985c80a17220925b79e
+  data.tar.gz: 2d0379e74a4bd6aca696a9152e34af882ff571d90e3e6733c068cfc115aa0eb0
 SHA512:
-  metadata.gz: 38d73443fa50e9d4af01d9adcde21e45cee4c201f7bb586ce9097d37e092153d18acd5109183ba3bec3c9ecbd4a017d4f4882a44f3f1caf9e83ad98b769b8997
-  data.tar.gz: 0c6b9f6673b571ca5f582b4b0080180b89d091cfbaa85932b642f3c9ee690433e9e0afbac4b7ad1536307c09f54f2d614dc9df1a1690cdde0e0f736ac9f3151b
+  metadata.gz: 00510a511d26c739c7974731029ab2e6a568d0cf89528fed6b738040d84184aa82cd351c2f762ec69c42e54790cf550019a80c9853a59330a364ab590b5a8223
+  data.tar.gz: c9ae9914ef53b9677c1e0eff643c667f756f464c258e6f427c34010162c3f2b8aede1ad3c5d06176e18dc3fe390f3e4e15ebd6c6abbe4e1f001b7ebe53e0937b

data/.github/workflows/test-and-release.yml

@@ -11,71 +11,78 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  BUNDLER_VER: 2.3.24
+  BUNDLER_VER: 2.4.22
 # Forcing bundler version to ensure that it is consistent everywhere and
 # does not cause bundler gem reinstalls
-# bundler/rubygems 2.3.22 is a minimal requirement to support gnu/musl differentiation
-# https://github.com/rubygems/rubygems/pull/4488
 
 jobs:
+  prepare:
+    uses: metanorma/ci/.github/workflows/prepare-rake.yml@main
+
   test:
-    name: Test on Ruby ${{ matrix.ruby }} ${{ matrix.os }}
+    name: Test on Ruby ${{ matrix.ruby.version }} ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
-    continue-on-error: false
+
+    needs: prepare
+    if: needs.prepare.outputs.push-for-tag != 'true'
+
+    continue-on-error: ${{ matrix.ruby.experimental }}
     strategy:
       fail-fast: false
-      matrix:
-        ruby: [ '2.7', '3.0', '3.1' ]
-        os: [ ubuntu-latest, windows-latest, macos-latest ]
+      max-parallel: 5
+      matrix: ${{ fromJson(needs.prepare.outputs.matrix) }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: ${{ matrix.ruby }}
+          ruby-version: ${{ matrix.ruby.version }}
+          rubygems: ${{ matrix.ruby.rubygems }}
           bundler: ${{ env.BUNDLER_VER }}
           bundler-cache: true
 
       - run: bundle exec rspec
 
   metanorma:
-    name: Test with Metanorma on Ruby ${{ matrix.ruby }} ${{ matrix.os }}
+    name: Test with Metanorma on Ruby ${{ matrix.ruby.version }} ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
-    continue-on-error: false
+
+    needs: prepare
+    if: needs.prepare.outputs.push-for-tag != 'true'
+
+    continue-on-error: ${{ matrix.ruby.experimental }}
+
     strategy:
       fail-fast: false
-      matrix:
-        ruby: [ '2.7', '3.0', '3.1' ]
-        os: [ ubuntu-latest, windows-latest, macos-latest ]
+      matrix: ${{ fromJson(needs.prepare.outputs.matrix) }}
+
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           repository: metanorma/metanorma
 
       - uses: metanorma/metanorma-build-scripts/inkscape-setup-action@main
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
-          path: "excavate"
+          path: excavate
 
-      - run: 'echo ''gem "excavate", path: "./excavate"'' > Gemfile.devel'
-
-      # https://github.com/rubygems/rubygems/issues/5160
-      - if: matrix.ruby == '3.0'
-        uses: ruby/setup-ruby@v1
+      - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
+          ruby-version: ${{ matrix.ruby.version }}
+          rubygems: ${{ matrix.ruby.rubygems }}
           bundler: ${{ env.BUNDLER_VER }}
-          rubygems: latest
+          bundler-cache: false
 
-      - if: matrix.ruby != '3.0'
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler: ${{ env.BUNDLER_VER }}
-          bundler-cache: true
+      - name: Install excavate from source
+        run: |
+          cd excavate
+          bundle install
+          bundle exec rake install
+
+      - name: Install metanorma
+        run: bundle install
 
       - run: bundle exec rake
 
@@ -85,7 +92,7 @@ jobs:
     runs-on: ubuntu-latest
     if: contains(github.ref, 'refs/tags/v')
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: cadwallion/publish-rubygems-action@master
         env:

data/README.adoc

@@ -1,6 +1,6 @@
 image:https://img.shields.io/gem/v/excavate.svg["Gem Version", link="https://rubygems.org/gems/excavate"]
-// image:https://codeclimate.com/github/fontist/expressir/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/fontist/excavate"]
-image:https://github.com/fontist/excavate/workflows/rspec/badge.svg["Build Status", link="https://github.com/fontist/excavate/actions?workflow=rspec"]
+image:https://codeclimate.com/github/fontist/excavate/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/fontist/excavate"]
+image:https://github.com/fontist/excavate/workflows/test-and-release/badge.svg["Build Status", link="https://github.com/fontist/excavate/actions?workflow=test-and-release"]
 
 = Excavate: Ruby gem to extract nested archives
 

data/excavate.gemspec

@@ -40,9 +40,13 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "seven-zip", "~> 1.4"
   spec.add_runtime_dependency "thor", "~> 1.0"
 
+  # Workaround for https://github.com/metanorma/ruby-libmspack/issues/2
+  spec.add_development_dependency "ffi-compiler2", "= 2.0.1"
+
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rubocop", "~> 1.7"
   spec.add_development_dependency "rubocop-performance", "~> 1.15"
+
   spec.metadata["rubygems_mfa_required"] = "false"
 end
 

data/lib/excavate/archive.rb

@@ -240,6 +240,8 @@ module Excavate
       return false unless File.file?(file)
 
       ext = normalized_extension(file)
+      return false if ext == "gz" && FileMagic.detect(file) != :gzip
+
       TYPES.key?(ext)
     end
   end

data/lib/excavate/file_magic.rb

@@ -9,9 +9,15 @@ module Excavate
     end
 
     def detect
-      case File.read(@path, 8, mode: "rb")
+      beginning = File.read(@path, 8, mode: "rb")
+      case beginning
       when "MSCF\x00\x00\x00\x00".force_encoding("BINARY")
         :cab
+      else
+        case beginning.byteslice(0, 2)
+        when "\x1F\x8B".force_encoding("BINARY")
+          :gzip
+        end
       end
     end
   end

data/lib/excavate/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Excavate
-  VERSION = "0.3.3"
+  VERSION = "0.3.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: excavate
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.5
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-27 00:00:00.000000000 Z
+date: 2024-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arr-pm
@@ -128,6 +128,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: ffi-compiler2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -215,7 +229,7 @@ metadata:
   source_code_uri: https://github.com/fontist/excavate
   changelog_uri: https://github.com/fontist/excavate
   rubygems_mfa_required: 'false'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -230,8 +244,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key: 
+rubygems_version: 3.5.3
+signing_key:
 specification_version: 4
 summary: Extract nested archives with a single command.
 test_files: []