s3_meta_sync 0.4.6 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2539d4b1046c0137ed0312b606f8e6fce06badd
-  data.tar.gz: adcdfdbcd6fb0668b6757501d66d17d968f7ec5a
+  metadata.gz: 76bef3c6abd828c51f0d655a70cb20ddc105eda9
+  data.tar.gz: 031cf9ab48d0a25d92c2bbca7dad0a26ed33f83a
 SHA512:
-  metadata.gz: 52634d1a5f489dd89ab0af3fb57f64bdaa58c7c1fdad7ab77bbd704ee10e4cf09d93e63541c8b1a195e0693f71189423059de337f07f0ef49cc4521b9fe28616
-  data.tar.gz: d48b10f892ddecfb47d3c003ed51a04ce8cdd88481947781e8e65437999e06bb160d533f9a8f400c1d9707453011a4065447dca84ee9e7c5d6bdc1f791394213
+  metadata.gz: 6bb3dd0b41a96d4792a3d352d30f02c43e37383a9222e820c7b5a6ca8cbd915db5a5009bfb5fac2d1cbc70f64324e1b57516af896ddad48948ac348ecb505b9c
+  data.tar.gz: b814848c48971212b05c08fb50f5232c0bb661ba1a31640c5b38d13b4b439c49514ec1e8b5037678edcf6e1bd64d25fdfc3c8d75ba988b0829010e6ac6c39259

data/lib/s3_meta_sync/syncer.rb

@@ -17,6 +17,8 @@ require "s3_meta_sync/zip"
 
 module S3MetaSync
   class Syncer
+    DEFAULT_REGION = 'us-east-1'
+
     def initialize(config)
       @config = config
     end
@@ -67,7 +69,7 @@ module S3MetaSync
 
       log "Downloading: #{download.size} Deleting: #{delete.size}", true
 
-      unless download.empty? && delete.empty?
+      if download.any? || delete.any?
         Dir.mktmpdir do |staging_area|
           FileUtils.mkdir_p(destination)
           copy_content(destination, staging_area)
@@ -148,7 +150,7 @@ module S3MetaSync
     def delete_local_files(local, paths)
       paths = paths.map { |path| "#{local}/#{path}" }
       paths.each { |path| log "Deleting #{path}" }
-      File.delete(*paths)
+      FileUtils.rm_f(paths)
     end
 
     def s3
@@ -185,17 +187,21 @@ module S3MetaSync
 
     def read_meta(source)
       file = "#{source}/#{META_FILE}"
-      YAML.load(File.read(file)) if File.exist?(file)
+      parse_yaml_content(File.read(file)) if File.exist?(file)
     end
 
     def download_meta(destination)
       content = download_content("#{destination}/#{META_FILE}")
-      result = YAML.load(content)
-      result.key?(:files) ? result : {files: result} # support new an old format
+      parse_yaml_content(content)
     rescue
       raise RemoteWithoutMeta
     end
 
+    def parse_yaml_content(content)
+      result = YAML.load(content)
+      result.key?(:files) ? result : {files: result} # support new and old format
+    end
+
     def download_file(source, path, destination, zip)
       content = download_content("#{source}/#{path}")
       content = Zip.unzip(content) if zip
@@ -237,7 +243,8 @@ module S3MetaSync
     end
 
     def region
-      @config[:region] unless @config[:region].to_s.empty?
+      region = @config[:region]
+      region if region != DEFAULT_REGION
     end
 
     def in_multiple_threads(data)

data/lib/s3_meta_sync/version.rb

@@ -1,3 +1,3 @@
 module S3MetaSync
-  VERSION = "0.4.6"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s3_meta_sync
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.5.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-17 00:00:00.000000000 Z
+date: 2015-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-v1