snapsync 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95ec11fc2543f694b0067aec51d92e8a377db86c
-  data.tar.gz: 68c883971fa9a51ada600b7bf5d581ac7989374a
+  metadata.gz: 84ad233f04295d4430ab02819f5e8b86a9d52d05
+  data.tar.gz: 6dfb17bd0f62219c2a877538e36a890d229876d9
 SHA512:
-  metadata.gz: 42b5c23eea493a255c85571dbb6427ddc2e4f6cfb24c6c3c1549bb7d2bd2dcf5a8b9a6a65d01f73aae48e5a6fdb62ffb300d5e3e9f6a0848ebe82596b83a9983
-  data.tar.gz: 233573b3be382d2d9ab5cc5e6e467bbe45cf54e6930c3fffcef438fdbe24808b4bb87a9a46a631a35b8c169d24e99c3d50132ee8578c5750bea4eafb6046ca0e
+  metadata.gz: e6fa273bf0a52e2a1655b4f5dcff8f294ba0cace17286e4a94ad04e0713bb8d9c31a7cdb773abeabf84079b29ea048aa4ed7fdc9f3f252a62f122f893d00c5ac
+  data.tar.gz: 5ca8843ef3c4567de8432244c9300b4d4fd04444368f6d71a37cf3e7078bf3b39a8afa3ef534023938e098959d22106b2610dd024e8c8c8ca8de214b6386fb3b

data/lib/snapsync/auto_sync.rb

@@ -146,13 +146,17 @@ module Snapsync
             end
         end
 
+        def sync
+            each_available_autosync_target do |path, t|
+                Snapsync.info "sync-all on #{path} (partition #{t.partition_uuid})"
+                op = SyncAll.new(path, config_dir: config_dir)
+                op.run
+            end
+        end
+
         def run(period: 600)
             while true
-                each_available_autosync_target do |path, t|
-                    Snapsync.info "sync-all on #{path} (partition #{t.partition_uuid})"
-                    op = SyncAll.new(path, config_dir: config_dir)
-                    op.run
-                end
+                sync
                 Snapsync.info "done all declared autosync partitions, sleeping #{period}s"
                 sleep period
             end

data/lib/snapsync/btrfs.rb

@@ -20,6 +20,10 @@ module Snapsync
         class UnexpectedBtrfsOutput < Error
         end
 
+        def self.btrfs_prog
+            ENV['BTRFS_PROG'] || 'btrfs'
+        end
+
         # @api private
         #
         # A IO.popen-like API to btrfs subcommands
@@ -27,7 +31,7 @@ module Snapsync
             err_r, err_w = IO.pipe
 
             block_error, block_result = nil
-            IO.popen(['btrfs', *args, err: err_w, **options], mode) do |io|
+            IO.popen([btrfs_prog, *args, err: err_w, **options], mode) do |io|
                 err_w.close
 
                 begin

data/lib/snapsync/cli.rb

@@ -286,13 +286,19 @@ While it can easily be done manually, this command makes sure that the snapshots
         end
 
         desc "auto-sync", "automatic synchronization"
+        option :one_shot, desc: "do one synchronization and quit", type: :boolean,
+            default: false
         option :config_file, desc: "path to the config file (defaults to /etc/snapsync.conf)",
             default: '/etc/snapsync.conf'
         def auto_sync
             handle_class_options
             auto = AutoSync.new(SnapperConfig.default_config_dir)
             auto.load_config(Pathname.new(options[:config_file]))
-            auto.run
+            if options[:one_shot]
+                auto.sync
+            else
+                auto.run
+            end
         end
 
         desc 'list [DIR]', 'list the snapshots present on DIR. If DIR is omitted, tries to access all targets defined as auto-sync targets'

data/lib/snapsync/partitions_monitor.rb

@@ -116,7 +116,7 @@ module Snapsync
             return enum_for(__method__) if !block_given?
             udisk.root['org']['freedesktop']['UDisks2']['block_devices'].each do |device_name, _|
                 dev = udisk.object("/org/freedesktop/UDisks2/block_devices/#{device_name}")
-                if dev['org.freedesktop.UDisks2.Partition'] && dev['org.freedesktop.UDisks2.Filesystem']
+                if dev['org.freedesktop.UDisks2.Block'] && dev['org.freedesktop.UDisks2.Filesystem']
                     yield(device_name, dev)
                 end
             end

data/lib/snapsync/version.rb

@@ -1,3 +1,3 @@
 module Snapsync
-    VERSION = "0.3.6"
+    VERSION = "0.3.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: snapsync
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-14 00:00:00.000000000 Z
+date: 2017-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logging