snapsync 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 310d54c72fbee1f6e3b178b31ab584acb828b959
-  data.tar.gz: 941288cf6057ee138b0c8cefc9e46f03654ae7da
+  metadata.gz: 1db39c52daf088025f37bad911ed2cdf61b636d2
+  data.tar.gz: 2d301b73b85d3331020945823873403484230e13
 SHA512:
-  metadata.gz: a2c390799559934ba49dda8169cfccd4bce70ac3131dc10de722e9d6522e116d0edef8933960bf07cb14841ec668ae78a0992591f4f0045c7ecf5f013bfb3724
-  data.tar.gz: 38362e18d5b9195cc4d4ed1b3b5cc820b594eed2a4d73cb2fa3d4042b559ca572224ca283097c08192bfd5c8a27564c23680058bd8624965914479d46391c3c7
+  metadata.gz: cde7036bd9b9f4a02384d2ddb317905255ba064341b05cd0483ff62a3fbbe4745ddcc0ab599559faa2a51ed82d14fd68d1ac92378a41e0566758d1cfbb331308
+  data.tar.gz: af261e9db68b0905ba7b138956c5e98a29e783fbe5f4db7739091a226ec08342fb156518b4e805fd971cf249be589ed7324373061b6e1f4d3657c70348678737

data/lib/snapsync/cleanup.rb

@@ -32,16 +32,6 @@ module Snapsync
                     true
                 end
             end
-
-            if !deleted_snapshots.empty?
-                Snapsync.info "Waiting for subvolumes to be deleted"
-                deleted_snapshots.each do |s|
-                    begin
-                        Btrfs.popen("subvolume", "sync", s.subvolume_dir.to_s)
-                    rescue Btrfs::Error
-                    end
-                end
-            end
         end
     end
 end

data/lib/snapsync/cli.rb

@@ -150,29 +150,23 @@ policy for more information
             # Parse the policy option early to avoid breaking later
             begin
                 policy = normalize_policy(policy)
-            rescue Exception
+            rescue Exception => policy_validation_error
                 # Try to see if the user forgot to add the NAME option or added
                 # the name option but should not have
                 if options[:auto]
-                    valid_policy = begin normalize_policy(args[1..-1])
-                                       true
-                                   rescue InvalidConfiguration
-                                       false
-                                   end
-                    if valid_policy
+                    begin
+                        normalize_policy(args[1..-1])
                         raise ArgumentError, "--auto is set but it seems that you did not provide a name"
+                    rescue InvalidConfiguration
                     end
                 else
-                    valid_policy = begin normalize_policy(args[2..-1])
-                                       true
-                                   rescue InvalidConfiguration
-                                       false
-                                   end
-                    if valid_policy
+                    begin
+                        normalize_policy(args[2..-1])
                         raise ArgumentError, "--auto is not set but it seems that you provided a name"
+                    rescue InvalidConfiguration
                     end
                 end
-                raise ArgumentError, "invalid policy #{policy}"
+                raise policy_validation_error
             end
 
             dirs = Array.new

data/lib/snapsync/local_sync.rb

@@ -17,7 +17,7 @@ module Snapsync
         def create_synchronization_point
             config.create(
                 description: "synchronization snapshot for snapsync",
-                user_data: Hash['important' => 'yes', 'snapsync' => target.uuid])
+                user_data: Hash['important' => 'yes', 'snapsync-description' => target.description, 'snapsync' => target.uuid])
         end
 
         def remove_synchronization_points(except_last: true)

data/lib/snapsync/local_target.rb

@@ -34,6 +34,10 @@ module Snapsync
         class InvalidUUIDError < InvalidTargetPath; end
         class NoUUIDError < InvalidUUIDError; end
 
+        def description
+            "local:#{dir}"
+        end
+
         def initialize(dir, create_if_needed: true)
             if !dir.directory?
                 raise ArgumentError, "#{dir} does not exist"
@@ -168,18 +172,19 @@ module Snapsync
             return if dry_run
 
             begin
-                Btrfs.popen("subvolume", "delete", s.subvolume_dir.to_s)
+                Btrfs.popen("subvolume", "delete", '--commit-each', 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)
+                Btrfs.popen("subvolume", "sync", self.dir.to_s)
             rescue Btrfs::Error
             end
+
+            s.snapshot_dir.rmtree
         end
     end
 end

data/lib/snapsync/version.rb

@@ -1,3 +1,3 @@
 module Snapsync
-    VERSION = "0.3.2"
+    VERSION = "0.3.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: snapsync
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-01 00:00:00.000000000 Z
+date: 2016-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logging
@@ -232,9 +232,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: tool to automate backing up snapper snapshots to other medias
 test_files: []
-has_rdoc: