s3sync 0.3.2 → 0.3.3

data/lib/s3sync/sync.rb

@@ -112,18 +112,18 @@ module S3Sync
     def list_files
       nodes = {}
       Find.find(@source) do |file|
-        st = File.stat file
+        begin
+          st = File.stat file        # Might fail
+          raise if not st.readable?  # We're not interested in things we can't read
+        rescue
+          $stderr.puts "WARNING: Skipping unreadable file #{file}"
+          Find.prune
+        end
 
         # We don't support following symlinks for now, we don't need to follow
         # folders and I don't think we care about any other thing, right?
         next unless st.file?
 
-        # Well, we're kinda out of options right now, I'll just yell!
-        if not st.readable?
-          $stderr.puts "WARNING: Skipping unreadable file #{file}"
-          next
-        end
-
         # We only need the relative path here
         file_name = file.gsub(/^#{@source}\/?/, '').squeeze('/')
         node = Node.new(@source.squeeze('/'), file_name, st.size)
@@ -227,7 +227,11 @@ module S3Sync
       # dst prefix testing for empty isn't good enough here.. needs to be
       # "empty apart from potentially having 'bucket:'"
       if source =~ %r{/$}
-        File.join [destination, file]
+        if remote_prefix? destination and destination.end_with? ':'
+          S3Sync.safe_join [destination, file]
+        else
+          File.join [destination, file]
+        end
       else
         if remote_prefix? source
           _, name = source.split ":"
@@ -266,6 +270,7 @@ module S3Sync
       # canonicalize the S3 stuff
       remote_prefix = source_is_s3 ? source : destination
       bucket, remote_prefix = remote_prefix.split ":"
+
       remote_prefix ||= ""
 
       # Just making sure we preserve the direction

data/lib/s3sync/version.rb

@@ -23,5 +23,5 @@
 # THE SOFTWARE.
 
 module S3Sync
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: s3sync
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -170,7 +170,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4017142764294384593
+      hash: 236637635868227634
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -179,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4017142764294384593
+      hash: 236637635868227634
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24