duplicati 0.0.3 → 0.0.4

data/Rakefile

@@ -4,3 +4,5 @@ require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
+
+task :release => :spec

data/lib/duplicati/backup.rb

@@ -52,7 +52,13 @@ class Duplicati
 
     def filters(type, filters)
       filters.reduce([]) do |memo, filter|
-        memo << %Q[--#{type}-regexp="#{filter.source}"]
+        flag = "--#{type}"
+        if filter.is_a?(Regexp)
+          flag += %Q[-regexp="#{filter.source}"]
+        else
+          flag += %Q[="#{filter}"]
+        end
+        memo << flag
       end.join(" ")
     end
   end

data/lib/duplicati/version.rb

@@ -1,3 +1,3 @@
 class Duplicati
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/duplicati.rb

@@ -1,70 +1,70 @@
-require File.expand_path("duplicati/version", File.dirname(__FILE__))
-require File.expand_path("duplicati/backup", File.dirname(__FILE__))
-require File.expand_path("duplicati/notification/growl", File.dirname(__FILE__))
-
-class Duplicati
-
-  class << self
-    def backup(opts={})
-      new(opts).backup
-    end
-  end
-
-  attr_reader :opts, :execution_success
-
-  def initialize(opts={})
-    opts[:log_path] ||= "duplicati.log"
-    opts[:duplicati_path] = duplicati_path(opts[:duplicati_path])
-    opts[:notifications] ||= [Notification::Growl]
-    opts[:inclusion_filters] ||= [opts[:inclusion_filter]].compact
-    opts[:exclusion_filters] ||= [opts[:exclusion_filter]].compact
-
-    if !opts[:inclusion_filters].empty? && opts[:exclusion_filters].empty?
-      opts[:exclusion_filters] = [%r{.*[^\\/]}] 
-    end
-
-    @opts = opts
-  end
-
-  def backup
-    execute Backup.new(
-      options :duplicati_path, :backup_paths, :backup_store_path,
-        :backup_encryption_key, :inclusion_filters, :exclusion_filters, :log_path
-    ).command
-  end
-
-  private
-
-  def duplicati_path(path_from_options)
-    path = path_from_options || ENV["DUPLICATI_PATH"] || "/Program Files/Duplicati"
-    File.join(path, "Duplicati.CommandLine")
-  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
-    notify
-    @execution_success
-  end
-
-  def options(*options_to_extract)
-    options_to_extract.reduce({}) do |memo, option|
-      memo[option] = @opts[option]
-      memo
-    end
-  end
-
-  def format(command)
-    command.gsub($/, "").squeeze(" ")
-  end
-
-  def notify
-    @opts[:notifications].each do |notification|
-      notification.notify @execution_success
-    end
-  end
-
-end
-
+require File.expand_path("duplicati/version", File.dirname(__FILE__))
+require File.expand_path("duplicati/backup", File.dirname(__FILE__))
+require File.expand_path("duplicati/notification/growl", File.dirname(__FILE__))
+
+class Duplicati
+
+  class << self
+    def backup(opts={})
+      new(opts).backup
+    end
+  end
+
+  attr_reader :opts, :execution_success
+
+  def initialize(opts={})
+    opts[:log_path] ||= "duplicati.log"
+    opts[:duplicati_path] = duplicati_path(opts[:duplicati_path])
+    opts[:notifications] ||= [Notification::Growl]
+    opts[:inclusion_filters] ||= [opts[:inclusion_filter]].compact
+    opts[:exclusion_filters] ||= [opts[:exclusion_filter]].compact
+
+    if !opts[:inclusion_filters].empty? && opts[:exclusion_filters].empty?
+      opts[:exclusion_filters] = [%r{.*[^\\/]}] 
+    end
+
+    @opts = opts
+  end
+
+  def backup
+    execute Backup.new(
+      options :duplicati_path, :backup_paths, :backup_store_path,
+        :backup_encryption_key, :inclusion_filters, :exclusion_filters, :log_path
+    ).command
+  end
+
+  private
+
+  def duplicati_path(path_from_options)
+    path = path_from_options || ENV["DUPLICATI_PATH"] || "/Program Files/Duplicati"
+    File.join(path, "Duplicati.CommandLine")
+  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
+    notify
+    @execution_success
+  end
+
+  def options(*options_to_extract)
+    options_to_extract.reduce({}) do |memo, option|
+      memo[option] = @opts[option]
+      memo
+    end
+  end
+
+  def format(command)
+    command.gsub($/, "").squeeze(" ")
+  end
+
+  def notify
+    @opts[:notifications].each do |notification|
+      notification.notify @execution_success
+    end
+  end
+
+end
+

data/spec/duplicati/backup_spec.rb

@@ -88,6 +88,16 @@ describe Duplicati::Backup do
       command_parts[8].should == "--exclude-regexp=\"d\""
     end
 
+    it "works also with regular inclusion and exclusion filters" do
+      command_parts = Duplicati::Backup.new(:backup_paths => [], :backup_store_path => "", :inclusion_filters => ["a", /b/], :exclusion_filters => [/c/, "d"]).
+        command.split(" ")
+
+      command_parts[5].should == "--include=\"a\""
+      command_parts[6].should == "--include-regexp=\"b\""
+      command_parts[7].should == "--exclude-regexp=\"c\""
+      command_parts[8].should == "--exclude=\"d\""
+    end
+
     it "does not include filters into command when they're not specified" do
       command = Duplicati::Backup.new(:backup_paths => [], :backup_store_path => "").command
       command.should_not include("--include-regexp")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: duplicati
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -81,12 +81,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -687412045
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -687412045
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -99,4 +105,3 @@ test_files:
 - spec/duplicati/notification/growl_spec.rb
 - spec/duplicati_spec.rb
 - spec/spec_helper.rb
-has_rdoc: