snapsync 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f9224076ddb7de222c830cb7ad068742631d46b
-  data.tar.gz: b3ced85dbdc080938b61ec158e8d803f72ebeed1
+  metadata.gz: 62c200ca50a3f1aa39d7ba8ece8167cedd05dd09
+  data.tar.gz: fe946f70afa36619c9aa307704762a4a9d4afb81
 SHA512:
-  metadata.gz: c26502e714514d0d8f686c62a3d237ded6c85f0cd1a665b2d55d340d357c40aa139a36d5040f371fc719d80aa1c7010654199b6de47b3f2534bae1a3871bb56d
-  data.tar.gz: 0c67490d86f8ad9fc007e88a7c9054883be9f45ee94410ca18dd55dbc6e422620b90f33406693ff44817a13c70f262253cc9283f568035a50b2b029b2ae56aa8
+  metadata.gz: 746d7b8a0c4b18a9aa121de9dfb7a03ceeec4492a8f8c4143a907505d2555c0c778166f55026d932ee482c1e8be0475443175e8e5917e716271b010918bb4805
+  data.tar.gz: cb76bb425572ea908df6a5c1609a73e17a2ff37cf725b64373e7fbdb6c5eaf744cd3f8000c3490194ec0c4e6d28ee22fb500b1e1af9e655b44e650e070a4a535

data/lib/snapsync/auto_sync.rb

@@ -125,8 +125,8 @@ module Snapsync
             return enum_for(__method__) if !block_given?
             each_available_autosync_target do |path, t|
                 op = SyncAll.new(path, config_dir: config_dir)
-                op.each_target do |target|
-                    yield(target)
+                op.each_target do |config, target|
+                    yield(config, target)
                 end
             end
         end

data/lib/snapsync/cleanup.rb

@@ -26,14 +26,19 @@ module Snapsync
             filtered_snapshots << last_sync_point
             filtered_snapshots = filtered_snapshots.to_set
 
-            snapshots.sort_by(&:num).each do |s|
+            deleted_snapshots = snapshots.sort_by(&:num).find_all do |s|
                 if !filtered_snapshots.include?(s)
                     target.delete(s, dry_run: dry_run)
+                    true
                 end
             end
 
-            Snapsync.info "Waiting for subvolumes to be deleted"
-            IO.popen(["btrfs", "subvolume", "sync", err: '/dev/null']).read
+            if !deleted_snapshots.empty?
+                Snapsync.info "Waiting for subvolumes to be deleted"
+                deleted_snapshots.each do |s|
+                    IO.popen(["btrfs", "subvolume", "sync", s.subvolume_dir.to_s, err: '/dev/null']).read
+                end
+            end
         end
     end
 end

data/lib/snapsync/cli.rb

@@ -42,13 +42,13 @@ module Snapsync
                     rescue LocalTarget::InvalidTargetPath
                     end
 
-                    SyncAll.new(dir).each_target do |target|
-                        yield(target)
+                    SyncAll.new(dir).each_target do |config, target|
+                        yield(config, target)
                     end
                 else
                     autosync = AutoSync.load_default
-                    autosync.each_available_target do |target|
-                        yield(target)
+                    autosync.each_available_target do |config, target|
+                        yield(config, target)
                     end
                 end
             end
@@ -73,6 +73,7 @@ module Snapsync
         def sync_all(dir)
             handle_class_options
 
+            dir = Pathname.new(dir)
             op = SyncAll.new(dir, config_dir: SnapperConfig.default_config_dir, autoclean: options[:autoclean])
             op.run
         end
@@ -196,7 +197,7 @@ for 10 days). snapsync understands the following period names: year month day ho
         EOD
         def policy(dir, type, *options)
             handle_class_options
-            each_target(dir) do |target|
+            each_target(dir) do |_, target|
                 target.change_policy(type, options)
                 target.write_config
             end
@@ -230,7 +231,7 @@ While it can easily be done manually, this command makes sure that the snapshots
         desc 'list [DIR]', 'list the snapshots present on DIR. If DIR is omitted, tries to access all targets defined as auto-sync targets'
         def list(dir = nil)
             handle_class_options
-            each_target(dir) do |target|
+            each_target(dir) do |_, target|
                 puts "== #{target.dir}"
                 puts "UUID: #{target.uuid}"
                 puts "Enabled: #{target.enabled?}"

data/lib/snapsync/sync_all.rb

@@ -40,13 +40,13 @@ module Snapsync
                 if !dir.exist?
                     Snapsync.warn "no directory for configuration #{config.name} in #{target_dir}"
                 else
-                    yield(LocalTarget.new(dir))
+                    yield(config, LocalTarget.new(dir))
                 end
             end
         end
 
         def run
-            each_target do |target|
+            each_target do |config, target|
                 if !target.enabled?
                     Snapsync.warn "not synchronizing to #{target.dir}, it is disabled"
                     next

data/lib/snapsync/version.rb

@@ -1,3 +1,3 @@
 module Snapsync
-    VERSION = "0.1.6"
+    VERSION = "0.1.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: snapsync
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Sylvain Joyeux