rsyncbackup 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f1596ffc77f401908dae8ed0cae815e56720665
-  data.tar.gz: a362a37ecf71f1427e06d349ecbf8a40ff15a29a
+  metadata.gz: 6005b2502d88e96b50eeaf78ca1a44b16faf4bf8
+  data.tar.gz: 543789938c94f4650acdb096623a7308169ca082
 SHA512:
-  metadata.gz: 1ec7c869069858f94f1a555c8bc8f1c6c0f44f08e08921bb9cf8a958ece1f73412491638c66b56bc5049daa971d00fa059189e3a82b7df4dd29e1b4194e147fd
-  data.tar.gz: 75dad458110c68f0bf38060e6e7245d18bca48d8cdb552d59c6543ab7109cfc5867f5f6294017c1865d42db25ad1c77faad987b403c1194a9bc0ec83debe74dd
+  metadata.gz: 2edb9f263195660fee96ee25ce51738f37a6f4e12cee39fb241ec04c9b0d23a25ddeecc645aecc2ccfb2743108afb36801ee0880e832433b48694b1e97fc1a86
+  data.tar.gz: 0c063e820b653a58d64c32bbce898439cb876a3ce01cb9c0cd7d17bd8a1a4abd1e6970a613a9143ea717af5a83f85b88379019909d6faea6f6418b7b002a0713

data/lib/rsyncbackup/utilities.rb

@@ -89,7 +89,12 @@ class Rsyncbackup
   # *s*:: string to strip
   def strip_trailing_separator_if_any(s,keep_if_symlink=false)
     s = s.to_s
-    s = s.sub(%r{/+$},'') unless keep_if_symlink && File.symlink?(s)
+    s_s = s.sub(%r{#{File::SEPARATOR}+$},'')
+    unless keep_if_symlink
+      s_s
+    else
+      File.symlink?(s_s) ? s : s_s
+    end
   end
 
 end

data/lib/rsyncbackup/version.rb

@@ -1,5 +1,5 @@
 class Rsyncbackup
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
   DEFAULT_EXCLUSIONS = File.expand_path('.rsyncbackup.exclusions', ENV['HOME'])
   DEFAULT_INCOMPLETE_DIR_NAME = '.incomplete'
   DEFAULT_LAST_FULL_DIR_NAME  = '.lastfull'

data/spec/{utilities_spec.rb → rsyncbackup/utilities_spec.rb}

@@ -26,7 +26,7 @@ describe Rsyncbackup do
   end
 
   context "utilities" do
-    let(:syncer) { Rsyncbackup.new(source, target, :dry_run => true, :debug => true) }    
+    let(:syncer) { Rsyncbackup.new(source, target, :dry_run => true) }    
 
     context "#build_command" do
 
@@ -92,11 +92,34 @@ describe Rsyncbackup do
           syncer.strip_trailing_separator_if_any('source/',true).should == 'source'
         end
       
-        it "should not remove trailing slash from source if source is a symlink" do
-          source_link = Tempfile.new("sourcelink").to_s
-          syncer.strip_trailing_separator_if_any(source_link,true).should == source_link
+        context "when a symlink" do
+          let(:source_link) do
+            tmpfile = Tempfile.new("sourcelink")
+            path = tmpfile.path
+            tmpfile.close
+            tmpfile.unlink
+            path
+          end
+
+          let(:source_link_slash) {source_link + File::SEPARATOR}
+
+          
+          before do
+            File.symlink(source,source_link)
+          end
+
+          after do
+            File.unlink(source_link)
+          end
+
+          it "should not remove trailing slash from source if source is a symlink" do
+            syncer.strip_trailing_separator_if_any(source_link_slash,true).should == source_link_slash
+          end
+
+          
         end
 
+
         it "should remove trailing slash from target" do
           syncer.strip_trailing_separator_if_any('target/').should == 'target'
         end

data/spec/rsyncbackup_spec.rb

@@ -32,7 +32,7 @@ describe Rsyncbackup do
   end
   
   context "Options Validity" do
-    let(:syncer) { Rsyncbackup.new(source, target, :dry_run => true, :debug => true) }
+    let(:syncer) { Rsyncbackup.new(source, target, :dry_run => true) }
 
     it "has a command" do
       syncer.options[:rsync_cmd].should =~ /rsync/

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsyncbackup
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Tamara Temple
@@ -156,9 +156,9 @@ files:
 - lib/rsyncbackup/utilities.rb
 - lib/rsyncbackup/version.rb
 - rsyncbackup.gemspec
+- spec/rsyncbackup/utilities_spec.rb
 - spec/rsyncbackup_spec.rb
 - spec/spec_helper.rb
-- spec/utilities_spec.rb
 homepage: http://github.com/tamouse/rsyncbackup-rb
 licenses: []
 metadata: {}
@@ -196,6 +196,6 @@ test_files:
 - features/test_files/source/three
 - features/test_files/source/two
 - features/test_files/target/.gitignore
+- spec/rsyncbackup/utilities_spec.rb
 - spec/rsyncbackup_spec.rb
 - spec/spec_helper.rb
-- spec/utilities_spec.rb