Fix tests under unix.

jarmo · Feb 21, 2014 · 59ba1a3 · 59ba1a3
1 parent 0685f60
commit 59ba1a3
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/lib/duplicati.rb b/lib/duplicati.rb
@@ -70,7 +70,15 @@ def execution_success?
   private
 
   def duplicati_path(path_from_options)
-    path_from_options || ENV["DUPLICATI_PATH"] || (ENV["OS"] == "Windows_NT" ? "/Program Files/Duplicati/Duplicati.CommandLine" : "duplicati-commandline")
+    path_from_options || ENV["DUPLICATI_PATH"] || (windows? ? "/Program Files/Duplicati/#{duplicati_executable_name}" : duplicati_executable_name)
+  end
+
+  def duplicati_executable_name
+    windows? ? "Duplicati.CommandLine" : "duplicati-commandline"
+  end
+
+  def windows?
+    ENV["OS"] == "Windows_NT"
   end
 
   def execute(command)

diff --git a/lib/duplicati/version.rb b/lib/duplicati/version.rb
@@ -1,3 +1,3 @@
 class Duplicati
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end
diff --git a/spec/duplicati_spec.rb b/spec/duplicati_spec.rb
@@ -16,7 +16,8 @@
     end
 
     it "has default duplicati path" do
-      File.basename(Duplicati.new.opts[:duplicati_path]).should == "Duplicati.CommandLine"
+      duplicati = Duplicati.new
+      File.basename(duplicati.opts[:duplicati_path]).should == duplicati.send(:duplicati_executable_name)
     end
 
     it "allows to specify duplicati path via options" do