seven_zip_ruby 1.2.5 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 24d424d3f87e77974e436f6c044a54e5783baf95
-  data.tar.gz: f5280318feffbdc6e25222916fb1168969bd3a73
+SHA256:
+  metadata.gz: 5825d6fc6003666a0e46c7f7d04b02166df43dedfcce9c1321c585bdb572aa83
+  data.tar.gz: a1c55155547c4f190d5265adb38306d433b620c15b7dfd503e995577560b3708
 SHA512:
-  metadata.gz: 2db16fba18dfa60a526bd4b03317da8a512c541e1fefb55633f785493086047ce8334b47e839a72d470e1210a51546433d1ee6e67513c5649c3d45bc7b99676b
-  data.tar.gz: ccaa6fec52258413febf2db20388945fe30a19d48839e7f8287a4498fbe323893250fdfb5c54c788aa8a9ea51fee2438974f1296a2453e287c8276b4a3bcb1f9
+  metadata.gz: 143dfc6e36e05dc5697b90129f135beb67752425564fa761d973d4635b10c62ec2719ad2daab5076afc85301dd365c0c0e8ed5b35e9fa4934d3bc8672816ba14
+  data.tar.gz: 164fb272a9179e26ac2d0ee1f56c189047254ccd85e93ffc6bd1f4f6e56b399611f8dd3d655d6e816a35fd09615803354b54f4dbffee3bdd6bf58dc3f841727f

data/ext/seven_zip_ruby/seven_zip_archive.cpp

@@ -2,6 +2,7 @@
 #include <array>
 #include <vector>
 #include <cassert>
+#include <string>
 
 #ifndef _WIN32
 #include <dlfcn.h>
@@ -1536,7 +1537,7 @@ STDMETHODIMP InStream::Read(void *data, UInt32 size, UInt32 *processedSize)
     bool ret = m_archive->runRubyAction([&](){
         VALUE str = rb_funcall(m_stream, INTERN("read"), 1, ULONG2NUM(size));
         if (!NIL_P(str) && data){
-            std::memcpy(data, RSTRING_PTR(str), RSTRING_LEN(str));
+            memcpy(data, RSTRING_PTR(str), RSTRING_LEN(str));
         }
 
         if (processedSize){
@@ -1766,13 +1767,33 @@ extern "C" void Init_seven_zip_archive(void)
     using namespace SevenZip;
     using namespace RubyCppUtil;
 
+    VALUE mod = rb_define_module("SevenZipRuby");
+    gSevenZipModule = mod;
+
+    VALUE external_lib_dir = rb_const_get(mod, INTERN("EXTERNAL_LIB_DIR"));
+    std::string external_lib_dir_str(RSTRING_PTR(external_lib_dir), RSTRING_LEN(external_lib_dir));
+
 #ifdef _WIN32
-    gSevenZipHandle = LoadLibrary("./7z.dll");
+    const int len = MultiByteToWideChar(CP_UTF8, 0, external_lib_dir_str.c_str(), external_lib_dir_str.length(),
+                                        NULL, 0);
+    if (len == 0) {
+        rb_warning("MultiByteToWideChar error.");
+        return;
+    }
+    std::vector<wchar_t> external_lib_dir_vec(len);
+    MultiByteToWideChar(CP_UTF8, 0, external_lib_dir_str.c_str(), external_lib_dir_str.length(),
+                        &external_lib_dir_vec[0], external_lib_dir_vec.size());
+    const std::wstring external_lib_dir_wstr(&external_lib_dir_vec[0], len);
+
+    const std::wstring dll_path = external_lib_dir_wstr + L"/7z.dll";
+    gSevenZipHandle = LoadLibraryW(dll_path.c_str());
     if (!gSevenZipHandle){
-        gSevenZipHandle = LoadLibrary("./7z64.dll");
+        const std::wstring dll_path2 = external_lib_dir_wstr + L"/7z64.dll";
+        gSevenZipHandle = LoadLibraryW(dll_path2.c_str());
     }
 #else
-    gSevenZipHandle = dlopen("./7z.so", RTLD_NOW);
+    std::string dll_path = external_lib_dir_str + "/7z.so";
+    gSevenZipHandle = dlopen(dll_path.c_str(), RTLD_NOW);
 #endif
     if (!gSevenZipHandle){
         rb_warning("7z library is not found.");
@@ -1790,9 +1811,6 @@ extern "C" void Init_seven_zip_archive(void)
     }
 
 
-    VALUE mod = rb_define_module("SevenZipRuby");
-    gSevenZipModule = mod;
-
     VALUE cls;
 
 // arg_count is needed by MSVC 2010...

data/lib/seven_zip_ruby.rb

@@ -2,19 +2,26 @@
 
 require("seven_zip_ruby/version")
 
-external_lib = (RUBY_PLATFORM.downcase.match(/mswin|mingw/) ? "7z.dll" : "7z.so")
-dir = $:.find do |i|
-  next File.file?(File.join(i, "seven_zip_ruby", external_lib))
-end
-raise "Failed to find 7z.dll or 7z.so" unless (dir)
+module SevenZipRuby
+  def self.find_external_lib_dir
+    external_lib = (RUBY_PLATFORM.downcase.match(/mswin|mingw/) ? "7z.dll" : "7z.so")
+    dir = $LOAD_PATH.find do |i|
+      path = File.expand_path(File.join(i, "seven_zip_ruby", external_lib))
+      next File.file?(path)
+    end
+    raise "Failed to find 7z.dll or 7z.so" unless dir
 
-Dir.chdir(File.join(dir, "seven_zip_ruby"))do
-  begin
-    version = RUBY_VERSION.match(/\d+\.\d+/)
-    require("seven_zip_ruby/#{version}/seven_zip_archive")
-  rescue LoadError
-    require("seven_zip_ruby/seven_zip_archive")
+    return File.join(dir, "seven_zip_ruby")
   end
+
+  EXTERNAL_LIB_DIR = self.find_external_lib_dir.encode(Encoding::UTF_8)
+end
+
+begin
+  version = RUBY_VERSION.match(/\d+\.\d+/)
+  require("seven_zip_ruby/#{version}/seven_zip_archive")
+rescue LoadError
+  require("seven_zip_ruby/seven_zip_archive")
 end
 raise "Failed to initialize SevenZipRuby" unless (defined?(SevenZipRuby::SevenZipReader))
 

data/lib/seven_zip_ruby/seven_zip_reader.rb

@@ -477,7 +477,7 @@ module SevenZipRuby
             path = arg_path.expand_path(base_dir)
             path.mkpath
             set_file_attribute(path.to_s, arg.attrib) if (arg.attrib)
-            path.utime(arg.atime || path.atime, arg.mtime || path.mtime)
+            path.utime(arg.atime || path.atime, arg.mtime || path.mtime) rescue nil
           end
           next ret
 
@@ -488,7 +488,7 @@ module SevenZipRuby
           unless (arg[:info].anti?)
             path = Pathname(arg[:info].path).expand_path(base_dir)
             set_file_attribute(path.to_s, arg[:info].attrib) if (arg[:info].attrib)
-            path.utime(arg[:info].atime || path.atime, arg[:info].mtime || path.mtime)
+            path.utime(arg[:info].atime || path.atime, arg[:info].mtime || path.mtime) rescue nil
           end
         end
       end

data/lib/seven_zip_ruby/version.rb

@@ -1,3 +1,3 @@
 module SevenZipRuby
-  VERSION = "1.2.5"
+  VERSION = "1.3.0"
 end

data/seven_zip_ruby.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.0.0'
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   if (RUBY_ENGINE == "rbx")

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: seven_zip_ruby
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.3.0
 platform: ruby
 authors:
 - Masamitsu MURASE
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-05 00:00:00.000000000 Z
+date: 2020-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -812,8 +812,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: This is a ruby gem library to read and write 7zip files.