rbrsync 0.0.5 → 0.0.8

data/lib/rbrsync/rbrsync.rb

@@ -230,7 +230,10 @@ module RbRsync
     def from
       @from ||= build_path(from_user, from_host, from_path)
     end
-    attr_writer :from
+    
+    def from= (from)
+      @from = [from].flatten unless from.nil?
+    end
 
     def to
       @to ||= build_path(to_user, to_host, to_path)
@@ -260,7 +263,7 @@ module RbRsync
 
       argv.concat(options_to_argv(@options))
 
-      argv << from
+      argv.concat(from)
       argv << to
 
       argv
@@ -281,7 +284,7 @@ module RbRsync
           else
             [val].flatten.each do |val|
               argv << "-#{key}"
-              argv << "'#{shell_escape(val)}'"
+              argv << "#{val}"
             end
           end
         else
@@ -291,7 +294,7 @@ module RbRsync
             # ignore
           else
             [val].flatten.each do |val|
-              argv << "--#{key.to_s.tr('_', '-')}='#{shell_escape(val)}'"
+              argv << "--#{key.to_s.tr('_', '-')}=#{val}"
             end
             
           end
@@ -309,9 +312,5 @@ module RbRsync
         nil
       end
     end
-
-    def shell_escape(str)
-      str.to_s.gsub("'", "'\\\\''")
-    end
   end
 end

data/lib/rbrsync/version.rb

@@ -1,3 +1,3 @@
 module RbRsync
-  VERSION = '0.0.5'
-end
+  VERSION = '0.0.8'
+end

data/spec/rbrsync_spec.rb

@@ -140,7 +140,14 @@ describe RbRsync do
 
     @rsync.from = "newuser@newhost.com:/home/newuser"
 
-    @rsync.from.should == "newuser@newhost.com:/home/newuser"
+    @rsync.from.should == %w(newuser@newhost.com:/home/newuser)
+  end
+
+  it "should treat multiple sources as such" do
+    @rsync.from = %w(/var/apps /home/user /etc/nginx)
+    @rsync.to = "newuser@newhost.com:/backups"
+
+    @rsync.from.should == %w(/var/apps /home/user /etc/nginx)
   end
 
   describe "command method" do
@@ -185,29 +192,33 @@ describe RbRsync do
       @rsync.from = "/home/me/"
       @rsync.to = "user@host.com:/home/user"
 
-      command_should_have_only "/home/me/", "user@host.com:/home/user", "--exclude='*~'", "--archive"
+      command_should_have_only "/home/me/", "user@host.com:/home/user", "--exclude=*~", "--archive"
     end
     it "should set --exclude twice when exclude= is called with an array" do
       @rsync.exclude = ['*~', '/*']
       @rsync.from = "/home/me/"
       @rsync.to = "user@host.com:/home/user"
 
-      command_should_have_only "/home/me/", "user@host.com:/home/user", "--exclude='*~'", "--exclude='/*'"
+      command_should_have_only "/home/me/", "user@host.com:/home/user", "--exclude=*~", "--exclude=/*"
     end
 
-    it "should correctly escape argument values" do
+    it "should correctly handle quotes in arguments correctly" do
+      @rsync.dry_run!
       @rsync.log_file = 'rsync.log'
       @rsync.log_file_format = "'\\'%t '%f' with %b ''"
       @rsync.from = "/home"
       @rsync.to = "/home/user"
-      command_should_have_only "/home", "/home/user", "--log-file='rsync.log'", %q[--log-file-format=''\''\'\''%t '\''%f'\'' with %b '\'''\''']
+      status = @rsync.go!
+      status.err.should be_empty
+      command_should_have_only "/home", "/home/user", "--dry-run", "--log-file=rsync.log", %[--log-file-format='\\'%t '%f' with %b '']
+      
     end
   end
 
   describe "constructor" do
     it "should take source and destination parameters" do
       @rsync = RbRsync::RbRsync.new '/home/user', 'user@host.com:/home/user'
-      @rsync.from.should == '/home/user'
+      @rsync.from.should == %w(/home/user)
       @rsync.to.should == 'user@host.com:/home/user'
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbrsync
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-10 00:00:00.000000000 Z
+date: 2013-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: posix-spawn