duplicati 0.0.6 → 0.0.7

data/lib/duplicati.rb

@@ -12,7 +12,7 @@ class Duplicati
     end
   end
 
-  attr_reader :opts, :execution_success
+  attr_reader :opts
 
   def initialize(opts={})
     opts[:log_path] ||= "duplicati.log"
@@ -31,7 +31,7 @@ class Duplicati
   def backup
     execute Backup.new(
       options :duplicati_path, :backup_paths, :backup_store_path,
-        :backup_encryption_key, :inclusion_filters, :exclusion_filters, :log_path
+      :backup_encryption_key, :inclusion_filters, :exclusion_filters, :log_path
     ).command
   end
 
@@ -43,12 +43,12 @@ class Duplicati
   end
 
   def execute(command)
-    old_log_file_size = File.read(@opts[:log_path]).strip.size rescue 0
     formatted_command = format command
     puts formatted_command if $DEBUG
-    @execution_success = system(formatted_command) && File.read(@opts[:log_path]).strip.size > old_log_file_size
+    system(formatted_command)
+    @exit_status = $?.exitstatus
     notify
-    @execution_success
+    execution_success?
   end
 
   def options(*options_to_extract)
@@ -64,9 +64,20 @@ class Duplicati
 
   def notify
     @opts[:notifications].each do |notification|
-      notification.notify @execution_success
+      notification.notify execution_success?
     end
   end
 
+  # https://code.google.com/p/duplicati/issues/detail?id=678
+  # 0 - Success
+  # 1 - Success (but no changed files)
+  # 2 - Completed by retried some files, or some files were locked (warnings)
+  # 50 - Some files were uploaded, then connection died
+  # 100 - No connection to server -> Fatal error
+  # 200 - Invalid command/arguments
+  def execution_success?
+    @exit_status && @exit_status.between?(0, 2)
+  end
+
 end
 

data/lib/duplicati/backup.rb

@@ -18,8 +18,8 @@ class Duplicati
              --volsize=100mb
              --auto-cleanup                        
              --full-if-older-than=1M
-             --usn-policy=on
-             --snapshot-policy=on
+             --usn-policy=auto
+             --snapshot-policy=auto
              --full-if-sourcefolder-changed
              2>&1 1>> "#{@log_path}" &&
 

data/lib/duplicati/version.rb

@@ -1,3 +1,3 @@
 class Duplicati
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/spec/duplicati/backup_spec.rb

@@ -37,8 +37,8 @@ describe Duplicati::Backup do
              --volsize=100mb
              --auto-cleanup                        
              --full-if-older-than=1M
-             --usn-policy=on
-             --snapshot-policy=on
+             --usn-policy=auto
+             --snapshot-policy=auto
              --full-if-sourcefolder-changed
              2>&1 1>> "/zzz/output.log" &&
 

data/spec/duplicati_spec.rb

@@ -121,34 +121,53 @@ describe Duplicati do
         command     with  spaces"
       Object.any_instance.should_receive(:system).with("multiline command with spaces")
 
-      Duplicati.new(:log_path => "foo").send(:execute, cmd)
+      Duplicati.new.send(:execute, cmd)
     end
 
-    context "#execution_success" do
-      it "is false when command itself fails" do
+    context "#execution_success?" do
+      it "is false when command fails with negative exit status" do
         Object.any_instance.should_receive(:system).and_return false
+        $?.should_receive(:exitstatus).and_return -1
 
         duplicati = Duplicati.new
-        duplicati.send(:execute, "")
-        duplicati.execution_success.should be_false 
+        duplicati.send(:execute, "").should be_false
+        duplicati.should_not be_execution_success
       end
 
-      it "is false when command succeeds and log file size does not increase" do
+      it "is false when command fails with exit status above 2" do
+        Object.any_instance.should_receive(:system).and_return false
+        $?.should_receive(:exitstatus).and_return 3
+
+        duplicati = Duplicati.new
+        duplicati.send(:execute, "").should be_false
+        duplicati.should_not be_execution_success
+      end
+
+      it "is true when command succeeds with exit status 0" do
+        Object.any_instance.should_receive(:system).and_return true
+        $?.should_receive(:exitstatus).and_return 0
+
+        duplicati = Duplicati.new
+        duplicati.send(:execute, "").should be_true
+        duplicati.should be_execution_success
+      end
+
+      it "is true when command succeeds with exit status 1" do
         Object.any_instance.should_receive(:system).and_return true
-        File.should_receive(:read).with("foo").and_return "", ""
+        $?.should_receive(:exitstatus).and_return 1
 
-        duplicati = Duplicati.new :log_path => "foo"
-        duplicati.send(:execute, "")
-        duplicati.execution_success.should be_false 
+        duplicati = Duplicati.new
+        duplicati.send(:execute, "").should be_true
+        duplicati.should be_execution_success
       end
 
-      it "is true when command succeeds and log file size increases" do
+      it "is true when command succeeds with exit status 2" do
         Object.any_instance.should_receive(:system).and_return true
-        File.should_receive(:read).with("foo").and_return "", "output"
+        $?.should_receive(:exitstatus).and_return 2
 
-        duplicati = Duplicati.new :log_path => "foo"
-        duplicati.send(:execute, "")
-        duplicati.execution_success.should be_true
+        duplicati = Duplicati.new
+        duplicati.send(:execute, "").should be_true
+        duplicati.should be_execution_success
       end
     end
 
@@ -157,8 +176,9 @@ describe Duplicati do
         Duplicati.any_instance.unstub(:notify)
       end
 
-      it "notifies with all possible notifications" do
+      it "notifies with all possible notifications with false execution success" do
         Object.any_instance.stub(:system).and_return false
+        $?.should_receive(:exitstatus).and_return 3
         notification1 = double('notification1').as_null_object
         notification2 = double('notification2').as_null_object
         
@@ -166,6 +186,17 @@ describe Duplicati do
         notification2.should_receive(:notify).with(false)
         Duplicati.new(:notifications => [notification1, notification2]).send(:execute, "")
       end
+
+      it "notifies with all possible notifications with true execution success" do
+        Object.any_instance.stub(:system).and_return true
+        $?.should_receive(:exitstatus).and_return 0
+        notification1 = double('notification1').as_null_object
+        notification2 = double('notification2').as_null_object
+        
+        notification1.should_receive(:notify).with(true)
+        notification2.should_receive(:notify).with(true)
+        Duplicati.new(:notifications => [notification1, notification2]).send(:execute, "")
+      end
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: duplicati
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-15 00:00:00.000000000 Z
+date: 2013-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -84,12 +84,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -480531571
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -480531571
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -103,4 +109,3 @@ test_files:
 - spec/duplicati/notification/mail_spec.rb
 - spec/duplicati_spec.rb
 - spec/spec_helper.rb
-has_rdoc: