duplicati 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 559e0a35ca6da1990875258ccb47a3582514e216
-  data.tar.gz: 6241c2f9810c34ca04c06f087180652d72306c38
+  metadata.gz: e2763cab2cbf50ef80682a8f5b49e201fc1793be
+  data.tar.gz: 237e8ae9aaec837a9248d1c3a52fde316334fa9c
 SHA512:
-  metadata.gz: 58aa7e086bb8e2f27ad811cf66a1ab34caff69f2b90f4ceaafa4eb95942b2d689e8bd26085cf7def20ac60e843609cb5d603495565c618d6ec0665442928e3c3
-  data.tar.gz: a7abd76a1afc88cec7f7727724cf0114304d9f9036b2ea52593bd90450a2e3d476ac7a20a66aab1c7f51681e85492db15dff461213bf27ba563319d3aa7740b1
+  metadata.gz: cc07ac10f4531affcce90abf23179b29fe7e099ceca409dfcb718b19b3cba43b75fcb0b70d110b5479066025c84e7d51f6c9aa3002621de4a540bb6765dd9475
+  data.tar.gz: d427a4e22a3afd4811e058aa099d518d8c7e0c04636603e422d2399428135e0ba0e78b7ba2b7de10834ca03d534ae144cfeedb4bfae673b27db6165947c6b49d

data/.travis.yml

@@ -1,7 +1,7 @@
 rvm:
-  - 1.8.7
   - 1.9.3
   - 2.0.0
+  - 2.1.0
   - ruby-head
 notifications:
   recipients:

data/lib/duplicati.rb

@@ -70,8 +70,7 @@ class Duplicati
   private
 
   def duplicati_path(path_from_options)
-    path = path_from_options || ENV["DUPLICATI_PATH"] || "/Program Files/Duplicati"
-    File.join(path, "Duplicati.CommandLine")
+    path_from_options || ENV["DUPLICATI_PATH"] || (ENV["OS"] == "Windows_NT" ? "/Program Files/Duplicati/Duplicati.CommandLine" : "duplicati-commandline")
   end
 
   def execute(command)

data/lib/duplicati/version.rb

@@ -1,3 +1,3 @@
 class Duplicati
-  VERSION = "1.0.0"
+  VERSION = "2.0.0"
 end

data/spec/duplicati_spec.rb

@@ -16,17 +16,17 @@ describe Duplicati do
     end
 
     it "has default duplicati path" do
-      Duplicati.new.opts[:duplicati_path].should == "/Program Files/Duplicati/Duplicati.CommandLine"
+      File.basename(Duplicati.new.opts[:duplicati_path]).should == "Duplicati.CommandLine"
     end
 
     it "allows to specify duplicati path via options" do
-      Duplicati.new(:duplicati_path => "/zzz/baz").opts[:duplicati_path].should == "/zzz/baz/Duplicati.CommandLine"
+      Duplicati.new(:duplicati_path => "/zzz/baz/duplicati-commandline").opts[:duplicati_path].should == "/zzz/baz/duplicati-commandline"
     end
 
     it "allows to specify duplicati path via environment variable" do
       begin
-        ENV["DUPLICATI_PATH"] = "/env/path"
-        Duplicati.new.opts[:duplicati_path].should == "/env/path/Duplicati.CommandLine"
+        ENV["DUPLICATI_PATH"] = "/env/path/duplicati-commandline"
+        Duplicati.new.opts[:duplicati_path].should == "/env/path/duplicati-commandline"
       ensure
         ENV.delete "DUPLICATI_PATH"
       end
@@ -86,7 +86,7 @@ describe Duplicati do
     end
 
     it "proxies options to backup command" do
-      duplicati_path = "/foo/bar"
+      duplicati_path = "/foo/bar/duplicati-commandline"
       options = {
         :duplicati_path => duplicati_path,
         :backup_paths => ["foo", "bar"],
@@ -96,9 +96,8 @@ describe Duplicati do
         :exclusion_filters => [],
         :log_path => "tmp"
       }
-      expected_formatted_options = options.dup
-      expected_formatted_options[:duplicati_path] += "/Duplicati.CommandLine"
-      Duplicati::Backup.should_receive(:new).with(expected_formatted_options).and_return(double('backup').as_null_object)
+      expected_options = options.dup
+      Duplicati::Backup.should_receive(:new).with(expected_options).and_return(double('backup').as_null_object)
       Duplicati.any_instance.stub(:execute)
 
       Duplicati.new(options).backup

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: duplicati
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Jarmo Pertman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-30 00:00:00.000000000 Z
+date: 2014-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake