snapsync 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dba428d67c91dbc087576e7127910fe46aec8304
-  data.tar.gz: d530b254f9cdd7ca46c9d8e2d43ce6c64133afac
+  metadata.gz: 4a591ba7179ca6238815f6aa99b747ce66468010
+  data.tar.gz: e8cdd470db1ed3e0118c8a6c4804c548f62fec96
 SHA512:
-  metadata.gz: f41595ef065834ee02890fde9fbdd7b94fa8c3197ed3808435e5d7f769e1be62201b41201772ae4651ececbadfcb38b3ac3809dc8be2425944250fc9205d4bba
-  data.tar.gz: 33cabe605c668f31b3d05ae704284f22ed312a108ced80741903c407a7d15f6b4ac87af17486664b3c82d4e287b9b4dddb7fd4003bf6c08415dc2fa7a405d5ee
+  metadata.gz: c2f58dd6c19a0cdca23cf65f6564a151ac126eee30af7e84bcfc7120be42f83460912f01ec8fcfdee627ca17f6df6d47d23e2418802450605c1be9a739d7f841
+  data.tar.gz: f85021d8c1b5375b50b7f4b1e4bb89706d45e6ebc19f26c4ff69177ae6fc4755f6bb71822a64ac2621126c53295948cec608bcdb43c4096f54e3f4091c84fb9d

data/lib/snapsync/btrfs.rb

@@ -23,11 +23,14 @@ module Snapsync
             block_error, block_result = nil
             IO.popen(['btrfs', *args, err: err_w, **options], mode) do |io|
                 err_w.close
-                begin
-                    block_result = yield(io)
-                rescue Error
-                    raise
-                rescue Exception => block_error
+                if block_given?
+                    begin
+                        block_result = yield(io)
+                    rescue Error
+                        raise
+                    rescue Exception => block_error
+                    end
+                else io.read
                 end
             end
 

data/lib/snapsync/local_target.rb

@@ -55,6 +55,9 @@ module Snapsync
             write_config
         end
 
+        def each_snapshot_raw(&block)
+            Snapshot.each_snapshot_raw(dir, &block)
+        end
         def each_snapshot(&block)
             Snapshot.each(dir, &block)
         end

data/lib/snapsync/snapshot.rb

@@ -98,6 +98,20 @@ module Snapsync
             end
         end
 
+        def self.each_snapshot_raw(snapshot_dir)
+            return enum_for(__method__, snapshot_dir) if !block_given?
+            snapshot_dir.each_child do |path|
+                if path.directory? && path.basename.to_s =~ /^\d+$/
+                    begin
+                        snapshot = Snapshot.new(path)
+                        yield(path, snapshot, nil)
+                    rescue InvalidSnapshot => e
+                        yield(path, nil, e)
+                    end
+                end
+            end
+        end
+
         # Enumerate the snapshots from the given directory
         #
         # The directory is supposed to be maintained in a snapper-compatible
@@ -105,22 +119,15 @@ module Snapsync
         # snapshot's number
         def self.each(snapshot_dir, with_partial: false)
             return enum_for(__method__, snapshot_dir, with_partial: with_partial) if !block_given?
-            snapshot_dir.each_child do |path|
-                if path.directory? && path.basename.to_s =~ /^\d+$/
-                    begin
-                        snapshot = Snapshot.new(path)
-                    rescue InvalidSnapshot => e
-                        Snapsync.warn "ignored #{path} in #{self}: #{e}"
-                    end
-                    if snapshot
-                        if snapshot.num != Integer(path.basename.to_s)
-                            Snapsync.warn "ignored #{path} in #{self}: the snapshot reports num=#{snapshot.num} but its directory is called #{path.basename}"
-                        elsif !with_partial && snapshot.partial?
-                            Snapsync.warn "ignored #{path} in #{self}: this is a partial snapshot"
-                        else
-                            yield snapshot
-                        end
-                    end
+            each_snapshot_raw(snapshot_dir) do |path, snapshot, error|
+                if error
+                    Snapsync.warn "ignored #{path} in #{self}: #{error}"
+                elsif snapshot.num != Integer(path.basename.to_s)
+                    Snapsync.warn "ignored #{path} in #{self}: the snapshot reports num=#{snapshot.num} but its directory is called #{path.basename}"
+                elsif !with_partial && snapshot.partial?
+                    Snapsync.warn "ignored #{path} in #{self}: this is a partial snapshot"
+                else
+                    yield snapshot
                 end
             end
         end

data/lib/snapsync/sync.rb

@@ -31,7 +31,37 @@ module Snapsync
             LocalSync.new(config, target).sync
         end
 
+        def remove_partially_synchronized_snapshots
+            target.each_snapshot_raw do |path, snapshot, error|
+                next if !error && !snapshot.partial?
+
+                Snapsync.info "Removing partial snapshot at #{path}"
+                begin
+                    if (path + "snapshot").exist?
+                        Btrfs.popen("subvolume", "delete", (path + "snapshot").to_s)
+                    elsif (path + "snapshot.partial").exist?
+                        Btrfs.popen("subvolume", "delete", (path + "snapshot.partial").to_s)
+                    end
+                rescue Btrfs::Error => e
+                    Snapsync.warn "failed to remove snapshot at #{path}, keeping the rest of the snapshot"
+                    Snapsync.warn e.message
+                    next
+                end
+
+                path.rmtree
+                Snapsync.info "Flushing data to disk"
+                begin
+                    Btrfs.popen("subvolume", "sync", path.to_s)
+                rescue Btrfs::Error
+                end
+            end
+        end
+
         def run
+            if autoclean?
+                remove_partially_synchronized_snapshots
+            end
+
             sync
 
             if autoclean?

data/lib/snapsync/version.rb

@@ -1,3 +1,3 @@
 module Snapsync
-    VERSION = "0.2.1"
+    VERSION = "0.3.0"
 end

data/snapsync.gemspec

@@ -12,6 +12,11 @@ Gem::Specification.new do |spec|
   spec.summary       = "tool to automate backing up snapper snapshots to other medias"
   spec.homepage      = "https://github.com/doudou/snapsync"
   spec.license       = "MIT"
+  spec.description   =<<-EOD
+Snapsync is a tool that automates transferring snapper snapshots to
+external media (USB drives ...) and managing these snapshots (e.g.
+timeline cleanup)
+EOD
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "bin"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: snapsync
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-28 00:00:00.000000000 Z
+date: 2015-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logging
@@ -158,7 +158,10 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.3
-description: 
+description: |
+  Snapsync is a tool that automates transferring snapper snapshots to
+  external media (USB drives ...) and managing these snapshots (e.g.
+  timeline cleanup)
 email:
 - sylvain.joyeux@m4x.org
 executables:
@@ -215,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: tool to automate backing up snapper snapshots to other medias