s3_meta_sync 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2ae988de36b8fabaa5dfa6f19726fc971b46133
-  data.tar.gz: 50e7f0a149cb5ed3bd3d6c09c9b32e2998118996
+  metadata.gz: d378c2048e347b69b8163925f00afe0be9fc81e1
+  data.tar.gz: da855bf2005d23ec2b707f12193c208fee1a3054
 SHA512:
-  metadata.gz: fa22acee1c5ecac7af983b52fa856948fb7c98f8b66bd374f5f869b24d08d725f6c083ebd89c6c440df3cd14ec50cfa0603546c8bfe899cf3bf1e5ddd09428fb
-  data.tar.gz: c6e7d3927654ec728757431865ced2cd2a08db8f5b78e9fe9a306f55a9b4c3527af8d114dffd5c2d3aa1fb92d5efdef22682787597bbf3a62270dcc71d3b42de
+  metadata.gz: 9a75bf8dbb10772fd13b5eeac525a461a070a2416ee4e49ca608e70154ba33fc9a6aecc81c212d67f92f2b26e1c4dde0696ffdb06eff711d8f08973028d910ab
+  data.tar.gz: 24254882c7a9db8bcfee7a5f9f452ee73dc7cda15f2ea5c99c36b175ec540e17f7d510ecd646c0231ddb5e5c25cbf4c65094bc8b60d59e89b5ce8005eb09b4d7

data/lib/s3_meta_sync.rb

@@ -41,12 +41,28 @@ module S3MetaSync
       local_info = read_meta(source)
       upload = local_info.select { |path, md5| remote_info[path] != md5 }.map(&:first)
       delete = remote_info.keys - local_info.keys
+      log "Uploading: #{upload.size} Deleting: #{delete.size}", true
 
       upload_files(source, destination, upload)
       delete_remote_files(destination, delete)
       upload_file(source, META_FILE, destination)
     end
 
+    def download(source, destination)
+      remote_info = download_meta(source)
+      generate_meta(destination)
+      local_info = read_meta(destination)
+      download = remote_info.select { |path, md5| local_info[path] != md5 }.map(&:first)
+      delete = local_info.keys - remote_info.keys
+
+      log "Downloading: #{download.size} Deleting: #{delete.size}", true
+
+      download_files(source, destination, download)
+      delete_local_files(destination, delete)
+      download_file(source, META_FILE, destination)
+      delete_empty_folders(destination)
+    end
+
     def upload_file(source, path, destination)
       log "Uploading #{path}"
       s3.objects["#{destination}/#{path}"].write File.read("#{source}/#{path}"), :acl => :public_read
@@ -103,19 +119,6 @@ module S3MetaSync
       raise "Unable to download #{url} -- #{$!}"
     end
 
-    def download(source, destination)
-      remote_info = download_meta(source)
-      generate_meta(destination)
-      local_info = read_meta(destination)
-      download = remote_info.select { |path, md5| local_info[path] != md5 }.map(&:first)
-      delete = local_info.keys - remote_info.keys
-
-      download_files(source, destination, download)
-      delete_local_files(destination, delete)
-      download_file(source, META_FILE, destination)
-      delete_empty_folders(destination)
-    end
-
     def delete_empty_folders(destination)
       `find #{destination} -depth -empty -delete`
     end
@@ -137,8 +140,8 @@ module S3MetaSync
       Parallel.each(data, :"in_#{way}" => processes, &block) # we tried threads but that blew up with weird errors when having lot's of uploads :/
     end
 
-    def log(text)
-      $stderr.puts text if @config[:verbose]
+    def log(text, important=false)
+      $stderr.puts text if @config[:verbose] or important
     end
   end
 

data/lib/s3_meta_sync/version.rb

@@ -1,3 +1,3 @@
 module S3MetaSync
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: s3_meta_sync
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Michael Grosser
@@ -29,7 +29,7 @@ cert_chain:
   y0kCSWmK6D+x/SbfS6r7Ke07MRqziJdB9GuE1+0cIRuFh8EQ+LN6HXCKM5pon/GU
   ycwMXfl0
   -----END CERTIFICATE-----
-date: 2013-09-27 00:00:00.000000000 Z
+date: 2013-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk