snapsync 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75228e89d473612d045f56e995ddc5492506a119
-  data.tar.gz: 476af2e900213d61aa7fd9c5d606f33ca33df4d8
+  metadata.gz: dba428d67c91dbc087576e7127910fe46aec8304
+  data.tar.gz: d530b254f9cdd7ca46c9d8e2d43ce6c64133afac
 SHA512:
-  metadata.gz: 2aafcd762a596944cf0d1997b92e2e3a74ff9daa19e706529ce6f26e4d697202c7223b0e80075cc1653a8ed0322173321bee62abf29fd573bf251cf579071eca
-  data.tar.gz: e3e0b871f358c5a76cfcaa09a5d3d88b8614dbcb623fbc91fa04f4d8232ce4fd8bf76539153c4ce3b319d699184f690efaddfc4dfa160220615b488676601975
+  metadata.gz: f41595ef065834ee02890fde9fbdd7b94fa8c3197ed3808435e5d7f769e1be62201b41201772ae4651ececbadfcb38b3ac3809dc8be2425944250fc9205d4bba
+  data.tar.gz: 33cabe605c668f31b3d05ae704284f22ed312a108ced80741903c407a7d15f6b4ac87af17486664b3c82d4e287b9b4dddb7fd4003bf6c08415dc2fa7a405d5ee

data/lib/snapsync/auto_sync.rb

@@ -146,7 +146,7 @@ module Snapsync
             end
         end
 
-        def run(period: 60)
+        def run(period: 600)
             while true
                 each_available_autosync_target do |path, t|
                     Snapsync.info "sync-all on #{path} (partition #{t.partition_uuid})"

data/lib/snapsync/btrfs.rb

@@ -19,15 +19,26 @@ module Snapsync
 
         def self.popen(*args, mode: 'r', raise_on_error: true, **options)
             err_r, err_w = IO.pipe
-            result = IO.popen(['btrfs', *args, err: err_w, **options], mode) do |io|
+
+            block_error, block_result = nil
+            IO.popen(['btrfs', *args, err: err_w, **options], mode) do |io|
                 err_w.close
-                yield(io)
+                begin
+                    block_result = yield(io)
+                rescue Error
+                    raise
+                rescue Exception => block_error
+                end
             end
 
-            if $?.success?
-                result
+            if $?.success? && !block_error
+                block_result
             elsif raise_on_error
-                raise Error.new, "btrfs failed"
+                if block_error
+                    raise Error.new, block_error.message
+                else
+                    raise Error.new, "btrfs failed"
+                end
             end
 
         rescue Error => e

data/lib/snapsync/cleanup.rb

@@ -36,7 +36,10 @@ module Snapsync
             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
+                    begin
+                        Btrfs.popen("subvolume", "sync", s.subvolume_dir.to_s)
+                    rescue Btrfs::Error
+                    end
                 end
             end
         end

data/lib/snapsync/cli.rb

@@ -231,7 +231,9 @@ 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
+            matched_uuids = Set.new
             each_target(dir) do |_, target|
+                matched_uuids << target.uuid
                 puts "== #{target.dir}"
                 puts "UUID: #{target.uuid}"
                 puts "Enabled: #{target.enabled?}"

data/lib/snapsync/local_sync.rb

@@ -84,7 +84,7 @@ module Snapsync
 
             if copy_snapshot(target_snapshot_dir, src, parent: parent)
                 partial_marker_path.unlink
-                IO.popen(["btrfs", "filesystem", "sync", target_snapshot_dir.to_s, err: '/dev/null']).read
+                Btrfs.popen("filesystem", "sync", target_snapshot_dir.to_s)
                 Snapsync.info "Successfully synchronized #{src.snapshot_dir}"
                 true
             end

data/lib/snapsync/local_target.rb

@@ -136,15 +136,18 @@ module Snapsync
             Snapsync.info "Removing snapshot #{s.num} #{s.date.to_time} at #{s.subvolume_dir}"
             return if dry_run
 
-            IO.popen(["btrfs", "subvolume", "delete", s.subvolume_dir.to_s, err: '/dev/null']) do |io|
-                io.read
-            end
-            if $?.success?
-                s.snapshot_dir.rmtree
-                Snapsync.info "Flushing data to disk"
-                IO.popen(["btrfs", "filesystem", "sync", s.snapshot_dir.to_s, err: '/dev/null']).read
-            else
+            begin
+                Btrfs.popen("subvolume", "delete", s.subvolume_dir.to_s)
+            rescue Btrfs::Error
                 Snapsync.warn "failed to remove snapshot at #{s.subvolume_dir}, keeping the rest of the snapshot"
+                return
+            end
+
+            s.snapshot_dir.rmtree
+            Snapsync.info "Flushing data to disk"
+            begin
+                Btrfs.popen("subvolume", "sync", s.subvolume_dir.to_s)
+            rescue Btrfs::Error
             end
         end
     end

data/lib/snapsync/snapshot.rb

@@ -134,7 +134,9 @@ module Snapsync
             end
 
             xml = REXML::Document.new(info_xml.read)
-            if xml.root.name != 'snapshot'
+            if !xml.root
+                raise InvalidInfoFile, "#{snapshot_dir}/info.xml does not look like a snapper info file (not an XML file ?)"
+            elsif xml.root.name != 'snapshot'
                 raise InvalidInfoFile, "#{snapshot_dir}/info.xml does not look like a snapper info file (root is not 'snapshot')"
             end
 

data/lib/snapsync/sync_all.rb

@@ -56,10 +56,10 @@ module Snapsync
                 rescue Interrupt
                     raise
                 rescue Exception => e
-                    Snapsync.warn "failed to synchronization #{config.name} on #{target.dir}"
+                    Snapsync.warn "failed to synchronize #{config.name} on #{target.dir}"
                     PP.pp(e, buffer = String.new)
                     buffer.each_line do |line|
-                        Snapsync.warn "  #{line}"
+                        Snapsync.warn "  #{line.chomp}"
                     end
                     e.backtrace.each do |line|
                         Snapsync.debug "  #{line}"

data/lib/snapsync/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: snapsync
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-07 00:00:00.000000000 Z
+date: 2015-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logging