rice 4.2.0 → 4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1971d90148d0c032df2e58c7e251b57c69ad2a4ddd76d6835048b266f243e966
-  data.tar.gz: '0933de85d9bb135813adb756ac365dfbb333bc4ddf4575614f2200af1a78c1f4'
+  metadata.gz: abe0f01ee83328bbd99dbf4374116b08c9b01209f3171e59b4bae01013234b81
+  data.tar.gz: 37180b133a4f0ec09b66367070382800a33adeef4a7916c66171be3f417f3776
 SHA512:
-  metadata.gz: 47bbbb4ddfacf6f67fc47fdf3b1bc81b2b5a1d8c889238ef1fba751b3866598a41e82609637c294609ceb0f7d3728bde3328cc3b4110af5f676b7b293fded1e9
-  data.tar.gz: 609458d567c204fa4156520523715e9415ac2e79bee6ddf266568408b1cb7203be68a3e216022c2dab0988d73a06c757ec63a8169d37eb0c14d80883785a708b
+  metadata.gz: 1b4a6cc95a81a53ec6396001ac5e2fb4e9acf94701beda44cf46b35d17c835962abe5d7faffeac048b792c8bd0c079b9f190d52a0eba6dedba7d4831cd7b5ffe
+  data.tar.gz: 5ff9cb1abd2d3d0f32eeb7c78f9823918c12d87bcfce45a64d47331d53bf83ee8e73772856893b3cdb71bcc087825446a5df00b6b48fe96389c374591a368c54

data/CHANGELOG.md

@@ -1,4 +1,8 @@
-## Unreleased (4.2)
+## 4.2.1
+
+* Support systems who use `#include <experimental/filesystem>` over `#include<filesystem>`. See [#197](https://github.com/jasonroelofs/rice/issues/197) and [#201](https://github.com/jasonroelofs/rice/pull/201)
+
+## 4.2
 
 * Support Ruby 3.3.0.
 * Split Object.call to an explicit Object.call_kw for calling methods expecting keyword arguments.

data/CONTRIBUTORS.md

@@ -19,3 +19,4 @@ I'd like to thank the following people for their help in making Rice what it is
 * [Andrew Kane (ankane)](https://github.com/ankane) for helping [test Rice 4](https://github.com/jasonroelofs/rice/issues/149).
 * [Maxim Samsonov (maxirmx)](https://github.com/maxirmx) for [#193](https://github.com/jasonroelofs/rice/issues/193) and [#194](https://github.com/jasonroelofs/rice/pull/194)
 * [kvtb](https://github.com/kvtb) for [#191](https://github.com/jasonroelofs/rice/issues/191)
+* [thekendalmiller](https://github.com/thekendalmiller) for [#201](https://github.com/jasonroelofs/rice/pull/201)

data/include/rice/rice.hpp

@@ -1205,9 +1205,18 @@ namespace Rice::detail
 // =========   cpp_protect.hpp   =========
 
 #include <regex>
-#include <filesystem>
 #include <stdexcept>
 
+#if __has_include(<filesystem>)
+  #include <filesystem>
+  namespace fs = std::filesystem;
+#elif __has_include(<experimental/filesystem>)
+  #include <experimental/filesystem>
+  namespace fs = std::experimental::filesystem;
+#else
+  #error "no filesystem include found :'("
+#endif
+
 
 namespace Rice::detail
 {
@@ -1247,7 +1256,7 @@ namespace Rice::detail
       {
         rb_exc_raise(rb_exc_new2(rb_eArgError, ex.what()));
       }
-      catch (std::filesystem::filesystem_error const& ex)
+      catch (fs::filesystem_error const& ex)
       {
         rb_exc_raise(rb_exc_new2(rb_eIOError, ex.what()));
       }

data/lib/mkmf-rice.rb

@@ -126,5 +126,7 @@ end
 if IS_DARWIN
   have_library('c++')
 elsif !IS_MSWIN
-  have_library('stdc++')
+  if !have_library('stdc++fs')
+    have_library('stdc++')
+  end
 end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Rice
-  VERSION = "4.2.0"
+  VERSION = "4.2.1"
 end

data/rice/detail/cpp_protect.hpp

@@ -2,9 +2,18 @@
 #define Rice__detail__cpp_protect__hpp_
 
 #include <regex>
-#include <filesystem>
 #include <stdexcept>
 
+#if __has_include(<filesystem>)
+  #include <filesystem>
+  namespace fs = std::filesystem;
+#elif __has_include(<experimental/filesystem>)
+  #include <experimental/filesystem>
+  namespace fs = std::experimental::filesystem;
+#else
+  #error "no filesystem include found :'("
+#endif
+
 #include "Jump_Tag.hpp"
 #include "../Exception_defn.hpp"
 
@@ -46,7 +55,7 @@ namespace Rice::detail
       {
         rb_exc_raise(rb_exc_new2(rb_eArgError, ex.what()));
       }
-      catch (std::filesystem::filesystem_error const& ex)
+      catch (fs::filesystem_error const& ex)
       {
         rb_exc_raise(rb_exc_new2(rb_eIOError, ex.what()));
       }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rice
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.2.1
 platform: ruby
 authors:
 - Paul Brannan
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-10 00:00:00.000000000 Z
+date: 2024-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -231,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.4
 signing_key:
 specification_version: 4
 summary: Ruby Interface for C++ Extensions