openvfs-rb 1.1.1 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7db2b6192624579a536034b4262dea6bd5d85bb1e27c7ef3d198879f08f06433
-  data.tar.gz: ac795b00495af2250cd49daa11efe5eb229b367e5f3d72cb25601f2d41de861f
+  metadata.gz: 29c136caf4ca8b682906683f57159f2e248445ebda666a53e149a189c5842b68
+  data.tar.gz: adaea2a9c4acda51827589efe7546f9d52257df4de0752db599329e81c69a993
 SHA512:
-  metadata.gz: 688df5364dafc77a7badafd818b360cd33a2a05855171a6dde937cbabed507132baca20f5cf6bd7ac92f46ee88c1ec656e4ecd3fe4e09cae1341783f8268cc89
-  data.tar.gz: 3df24a80933c48aca4e04456e73fc58db4e16a802aa53e7d0d4b708b0490550daa0393ca800fed7aa7d9b782f39fa80a8b74d6f8d02bebe9caa895cd98086866
+  metadata.gz: 9630ec6c73b5817e413fd823feb040c7ac418ebe3474c3c5d746075bc5398c9455692c40b3876a3bc582afdc2111e0904cf898b9303964f6474851d7ab31f2be
+  data.tar.gz: 38a35118b91d71e4b4220b3b6518b591c10842c44189e352185eaf60bd36ab35199cb2e76c6a23243755b5f396d65f19e0ab80a69e12a8690fa157ba088cda15

data/ext/openvfs/occ/sync.cpp

@@ -636,6 +636,26 @@ extern "C" void Init_occ()
             .define_attr("estimated_bandwidth", &OCC::ProgressInfo::Estimates::estimatedBandwidth, Rice::AttrAccess::Read)
             .define_attr("estimated_eta", &OCC::ProgressInfo::Estimates::estimatedEta, Rice::AttrAccess::Read);
 
+        // One file's share of the run. The engine keeps a Progress per file in flight and
+        // discards it when the file finishes, so this is what a per-file progress bar reads;
+        // ProgressInfo's own totals are the whole run.
+        Data_Type<OCC::ProgressInfo::Progress> rb_cProgress =
+            define_class_under<OCC::ProgressInfo::Progress>(rb_mOpenVFS, "Progress")
+            .define_method("completed", &OCC::ProgressInfo::Progress::completed)
+            .define_method("remaining", &OCC::ProgressInfo::Progress::remaining)
+            .define_method("estimates", &OCC::ProgressInfo::Progress::estimates);
+
+        Data_Type<OCC::ProgressInfo::ProgressItem> rb_cProgressItem =
+            define_class_under<OCC::ProgressInfo::ProgressItem>(rb_mOpenVFS, "ProgressItem")
+            // Both by value, so Ruby owns a copy and may keep it after the signal returns -
+            // the engine's own entry goes when the file does.
+            .define_method("item", [](const OCC::ProgressInfo::ProgressItem &self) {
+                return OCC::SyncFileItemPtr::create(self._item);
+            })
+            .define_method("progress", [](const OCC::ProgressInfo::ProgressItem &self) {
+                return self._progress;
+            });
+
         Data_Type<OCC::ProgressInfo> rb_cProgressInfo =
             define_class_under<OCC::ProgressInfo>(rb_mOpenVFS, "ProgressInfo")
             .define_method("status", &OCC::ProgressInfo::status)
@@ -652,6 +672,18 @@ extern "C" void Init_occ()
             .define_method("file_progress", [](const OCC::ProgressInfo &self, const OCC::SyncFileItemPtr &item) {
                 return self.fileProgress(*item);
             }, Arg("item"))
+            // The files in flight, keyed by the path the engine names them by. A Hash rather
+            // than the QHash itself: Rice ships no converter for one, and what a caller wants
+            // is to look a path up.
+            .define_method("current_items", [](const OCC::ProgressInfo &self) {
+                Hash items;
+
+                for (auto entry = self._currentItems.constBegin(); entry != self._currentItems.constEnd(); ++entry) {
+                    items[entry.key()] = entry.value();
+                }
+
+                return items;
+            })
             .define_method("current_discovered_remote_folder", [](const OCC::ProgressInfo &self) {
                 return self._currentDiscoveredRemoteFolder;
             })

data/lib/openvfs/occ.rb

@@ -2,7 +2,13 @@
 
 # Deliberately not "../openvfs": that pulls in the openvfs extension, which wraps the placeholder attributes libopenvfs keeps in extended attributes. Nothing here needs them, and upstream ships no Windows build of that library.
 require_relative "version"
-require "openvfs/occ/occ"
+
+# One object per Ruby ABI in a platform gem, and in the source gem the single one extconf built under ext/. See lib/openvfs.rb.
+begin
+  require_relative "occ/#{RUBY_VERSION[/\d+\.\d+/]}/occ"
+rescue LoadError
+  require "openvfs/occ/occ"
+end
 
 require "fileutils"
 require "securerandom"

data/lib/openvfs/rb/version.rb

@@ -5,6 +5,6 @@
 
 module OpenVFS
   module Rb
-    VERSION = "1.1.1"
+    VERSION = "1.1.3"
   end
 end

data/lib/openvfs.rb

@@ -4,7 +4,13 @@
 # Copyright, 2026, by Nathan Kidd.
 
 require_relative "openvfs/version"
-require "openvfs/openvfs"
+
+# A precompiled platform gem carries one object per Ruby ABI, because an object only loads on the Ruby it was compiled against. The source gem has no ABI directory - extconf builds one object, under ext/ - so the fallback is the plain require the load path answers.
+begin
+  require_relative "openvfs/#{RUBY_VERSION[/\d+\.\d+/]}/openvfs"
+rescue LoadError
+  require "openvfs/openvfs"
+end
 
 # A virtual filesystem.
 module OpenVFS

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openvfs-rb
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.3
 platform: ruby
 authors:
 - Nathan Kidd