s3simplesync 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19cd4a8ab623496d2f4c12d0d47919d28e1c819a
-  data.tar.gz: dbc4251d6a9db92ff8a634518a3a392bdc7f8a18
+  metadata.gz: 7b23a20a9f8bca002659951079050bc474f90730
+  data.tar.gz: 1168905a958f25feaea4830c886c9f1cd39df78c
 SHA512:
-  metadata.gz: d9ceb418c1e1886396268b77fcabbcd537a381ab166025a0f480947aa26f04042f71100823c49785bb2a0dfb9d3898efb89e656b9086d79c7a921a5213a07a3a
-  data.tar.gz: eed32456c025abfaed244f662e42821d1aad153c18dead83d69c43483af8120f439f89afc8f3a470ece884c8d6a938289be28ade832b09bcc46876619a9ada4a
+  metadata.gz: bcd2dd6d50139f009d106e13f5d7be8134d8c31e2a9b716da5ccba41f061b74123a8e70c3db6696c850d3b4b6f7f17415ff5a8df400af83a081506052c30e929
+  data.tar.gz: dbcc3fd4b4687fdefb2552b9712c428f2c034239d4c1997304bc5b2f2746624146fd6f09127e01e6f79ff72516832aa2b077648817613884979086d6d7ebe6aa

data/bin/s3sync-download

@@ -1,5 +1,8 @@
 #!/usr/bin/env ruby
 require 's3sync'
 
+s3_path = ARGV[0]
+local_path = ARGV[1]
+
 sync = S3sync::Syncer.new
-sync.download(ARGV[0], ARGV[1])
+sync.download(s3_path, local_path)

data/bin/s3sync-full

@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+require 's3sync'
+
+local_path = ARGV[0]
+s3_path = ARGV[1]
+
+sync = S3sync::Syncer.new
+sync.upload(local_path, s3_path)
+sync.download(s3_path, local_path)

data/bin/s3sync-upload

@@ -1,5 +1,8 @@
 #!/usr/bin/env ruby
 require 's3sync'
 
+local_path = ARGV[0]
+s3_path = ARGV[1]
+
 sync = S3sync::Syncer.new
-sync.upload(ARGV[0], ARGV[1])
+sync.upload(local_path, s3_path)

data/lib/s3sync/syncer.rb

@@ -17,9 +17,9 @@ module S3sync
       # Yielding the remote s3 files and doing a 2 pass filter
       # as better performance than computing a diff of 2 complete directory listings
       local_files = local_files(local_path)
-      remote_files(bucket_name, folders) do |key,dest|
-        source = local_files[key]
-        local_files.delete key if FileDiff::same_file? source, dest
+      remote_files(bucket_name, folders) do |s3|
+        source = local_files[s3[:key]]
+        local_files.delete s3[:key] if FileDiff::same_file? source, dest
       end
 
       local_files.each do |key,item|
@@ -39,11 +39,11 @@ module S3sync
       # Yielding the remote s3 files and doing a 2 pass filter
       # as better performance than computing a diff of 2 complete directory listings
       local_files = local_files(local_path)
-      remote_files(bucket_name, folders) do |key,source|
-        next if FileDiff::same_file? source, local_files[key]
-        destination_file = File.join destination_folder, key
-        log "#{source[:file].public_url} => #{destination_file}"
-        s3_download source, destination_file
+      remote_files(bucket_name, folders) do |s3|
+        next if FileDiff::same_file? s3, local_files[s3[:key]]
+        destination_file = File.join destination_folder, s3[:key]
+        log "#{s3[:file].public_url} => #{destination_file}"
+        s3_download s3, destination_file
       end
       log "done"
     end
@@ -107,14 +107,21 @@ module S3sync
       results
     end
 
+    def remote_item(object, relative_path)
+      last_modified = Time.parse object.metadata['last_modified'] rescue 0
+
+      { key:File.join(relative_path), 
+        last_modified:last_modified, 
+        content_length:object.content_length, 
+        file:object }
+    end
+
     def remote_files(bucket, folders)
       objects = @s3.buckets[bucket].objects.with_prefix(File.join(folders))
       objects.each do |object|
-        relative_file_name = File.join(object.key.split(/\//).drop folders.length)
-        last_modified      = Time.parse object.metadata['last_modified'] rescue 0
-        content_length     = object.content_length rescue 0
-        item = { key:relative_file_name, last_modified:last_modified, content_length:content_length, file:object }
-        yield relative_file_name,item
+        relative_path = object.key.split(/\//).drop folders.length
+        next if object.content_length.nil? or object.content_length == 0 or relative_path.empty?
+        yield remote_item(object, relative_path)
       end
     end
 

data/lib/s3sync/version.rb

@@ -1,3 +1,3 @@
 module S3sync
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s3simplesync
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Christian Blunden
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-22 00:00:00.000000000 Z
+date: 2014-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -57,6 +57,7 @@ email:
 - christian.blunden@gmail.com
 executables:
 - s3sync-download
+- s3sync-full
 - s3sync-upload
 extensions: []
 extra_rdoc_files: []
@@ -67,6 +68,7 @@ files:
 - README.md
 - Rakefile
 - bin/s3sync-download
+- bin/s3sync-full
 - bin/s3sync-upload
 - lib/s3sync.rb
 - lib/s3sync/file_diff.rb