seven-zip 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5754655f14b4dab69c657e6265d14225f0c920de3c531891c86d24c69918691
-  data.tar.gz: 76c240c43acc63406a8d58a786327d7cca089098b6afbdbdc42411b19ca1b9ce
+  metadata.gz: 214494944476db8bda1b17d9b934ca5f67a744c2b9cb5f908c6483bb58a933a6
+  data.tar.gz: e1b6242c1b7ed0e4efa9d83f346023ce6ca0d82f102432ede254e1830c1ebaf3
 SHA512:
-  metadata.gz: a61c6bf1e41b3ede64d95c38935afd96d52faab5c5ea3bde656c5bca45536c8a7cf0b42fd9bdfa56962a617d4f0e839508eb94d5623fd8069ba5d564ecc07e15
-  data.tar.gz: 692b6af87e1d0598816513af0038231ff95ff05b1ee20c19c6adc7797aa29eff92675615337be6fa5b8ada5ee880ba9f505eddf6792ae268331132b99be8bc60
+  metadata.gz: 72ed9a5c1ad17ee54b512e198c5539cc0402d17a69d502be3e5ccdea3b8f7d34af2316e64335a8d6e1d83d4c44f168c4504de5c344b6ec88a286db2e5af2495d
+  data.tar.gz: 3e63c60cf00e43cfa666aa9e16d1b2493f79ce0ca6d0cea5d6a062ed4ac5e5a2c5742fe8fcffeee36a20285adc6018c4accee013189db41010db99894d1571de

data/.github/workflows/{ci.yml → test-and-release.yml}

@@ -1,10 +1,14 @@
-name: Rspec
+name: test-and-release
 
 on:
   push:
     branches: [ master ]
+    tags: [ 'v*' ]
   pull_request:
-    branches: [ master ]
+
+concurrency:
+  group: '${{ github.workflow }}-${{ github.job }}-${{ github.head_ref || github.ref_name }}'
+  cancel-in-progress: true
 
 jobs:
   test:
@@ -21,11 +25,19 @@ jobs:
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
-    # - run: sudo apt-get install p7zip-full
-    #   if: ${{ matrix.os == 'ubuntu' }}
-    # - run: brew update && brew tap wk8/p7zip9.20 && brew install p7zip920
-    #   if: ${{ matrix.os == 'macos' }}
     - run: gem update bundler
     - run: bundle install
     - run: bundle exec rake build_local
     - run: bundle exec rake spec
+
+  release:
+    name: Release gem
+    needs: test
+    runs-on: ubuntu-latest
+    if: contains(github.ref, 'refs/tags/v')
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: cadwallion/publish-rubygems-action@master
+        env:
+          RUBYGEMS_API_KEY: ${{secrets.FONTIST_CI_RUBYGEMS_API_KEY}}

data/README.md

@@ -1,6 +1,6 @@
 # SevenZipRuby ![Logo](https://raw.github.com/fontist/seven_zip_ruby/master/resources/seven_zip_ruby_logo.png)
 
-![Rspec](https://github.com/fontist/seven_zip_ruby/workflows/Rspec/badge.svg) [![Gem Version](https://badge.fury.io/rb/seven-zip.png)](http://badge.fury.io/rb/seven-zip)
+![RSpec](https://github.com/fontist/seven_zip_ruby/workflows/test-and-release/badge.svg) [![Gem Version](https://badge.fury.io/rb/seven-zip.png)](http://badge.fury.io/rb/seven-zip)
 
 This is a Ruby gem library to extract/compress [7-Zip](http://www.7-zip.org) archives.
 
@@ -191,6 +191,8 @@ p(Time.now - start)
 LGPL license. Please refer to LICENSE.txt.
 
 ## Releases
+* 1.4.2
+  - CI improvement, cleanup of debug output
 * 1.4.1
   - Fixed minor rubygems.org issues
 * 1.4.0

data/ext/seven_zip_ruby/seven_zip_archive.cpp

@@ -1761,7 +1761,6 @@ STDMETHODIMP OutStream::SetSize(UInt64 size)
 
 }
 
-
 extern "C" void Init_seven_zip_archive(void)
 {
     using namespace SevenZip;
@@ -1796,6 +1795,8 @@ extern "C" void Init_seven_zip_archive(void)
         gSevenZipHandle = LoadLibraryW(dll_path2.c_str());
     }
 #else
+    Dl_info dl_info;
+    dladdr(reinterpret_cast<void*>(Init_seven_zip_archive), &dl_info);
     std::string dll_path = external_lib_dir_str + "/7z.so";
     gSevenZipHandle = dlopen(dll_path.c_str(), RTLD_NOW);
 #endif
@@ -1873,4 +1874,3 @@ extern "C" void Init_seven_zip_archive(void)
 #undef WRITER_FUNC
 
 }
-

data/lib/seven_zip_ruby/version.rb

@@ -1,3 +1,3 @@
 module SevenZipRuby
-  VERSION = "1.4.1"
+  VERSION = "1.4.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seven-zip
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-15 00:00:00.000000000 Z
+date: 2022-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -62,8 +62,7 @@ extensions:
 - ext/p7zip/extconf.rb
 extra_rdoc_files: []
 files:
-- ".github/workflows/ci.yml"
-- ".github/workflows/release.yml"
+- ".github/workflows/test-and-release.yml"
 - ".gitignore"
 - Gemfile
 - LICENSE.txt
@@ -817,7 +816,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: This is a ruby gem library to read and write 7zip files.

data/.github/workflows/release.yml

@@ -1,36 +0,0 @@
-name: release
-
-on:
-  push:
-    tags:
-      - 'v*'
-
-jobs:
-  release:
-    runs-on: ubuntu-18.04
-    steps:
-      - uses: actions/checkout@v3
-
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: '2.7'
-
-      - run: gem update bundler
-
-      - run: bundle install
-
-      - run: bundle exec rake build
-
-      - name: Publish to rubygems.org
-        env:
-          RUBYGEMS_API_KEY: ${{secrets.FONTIST_CI_RUBYGEMS_API_KEY}}
-        run: |
-          gem install gem-release
-          touch ~/.gem/credentials
-          cat > ~/.gem/credentials << EOF
-          ---
-          :rubygems_api_key: ${RUBYGEMS_API_KEY}
-          EOF
-          chmod 0600 ~/.gem/credentials
-          git status
-          gem release