s3_meta_sync 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7642bf36775b6d4208777739adb5bc3f569f5a0
-  data.tar.gz: fa9e52f99fd14dc3fb7ae8b45aa6fb05e539954c
+  metadata.gz: 66fd72c5fa08fc841c1eabff28d2edcf17d1f9e7
+  data.tar.gz: 84ebb0bcc5ea31e17f7963434d16901f96b92f81
 SHA512:
-  metadata.gz: 8975619183d2678b7aea13118fe3ade6d5f7d6e3492f5e663b64f65392005c814a4e8be96f57705e061243c29e888b874e0db1ac887f656112e3bf1df163e345
-  data.tar.gz: 503dd14f0784246ac2ac636dc86ae544421d7baa98d41c259812dfc84226cd4b8162481567fb2c51f4036b748ac73e781a7a1b28f32b2eabb3299bfcd9171c75
+  metadata.gz: 8ad3f56ec2eba6491ceb9c42d5aa60c563ce286d573799959861309e966af77fe7bcff0788ddf11a567fd9de66be101b1091d8eed70d00c90437f3e1f62fa3f4
+  data.tar.gz: b69b8d36b3e2211ed6c8f9b11505fa5c5d00116096c5eaef5ef0bda4e9ed59ce51ed0c6d138fa30a2940d260cc647f15d6a51bd13868adbb95864ad39ba3d20c

data.tar.gz.sig

@@ -1 +1 @@
-n?�C#��o��ۊ��WcB����|�#�;t��y�U��a���cuT��;d����sJ,� #A�XH9"�z!|O�,�+˜ͳx����&N� �SNjc��Q�	��hо� 3���H�+9"�+�Ӎ�&<'I-Mcc�['�+E0����?�lkPC�4�R��+砌�k
+i|87�h{�����~!9���p�d�y�]��kE�/��R�=�[��r�	���=��7���?����F,�SXZ)��ʏl$�y©�6���Y~��4�o�4a�"(��	f�يp¨�԰_L8��zx�4���R���A��u�.�j#o�u�O:�3���[�]�!�Y/��A����Q�eǂ

data/lib/s3_meta_sync.rb

@@ -121,9 +121,19 @@ module S3MetaSync
     def download_content(path)
       log "Downloading #{path}"
       url = "https://s3#{"-#{region}" if region}.amazonaws.com/#{@bucket}/#{path}"
-      open(url).read
+      options = (@config[:ssl_none] ? {:ssl_verify_mode => OpenSSL::SSL::VERIFY_NONE} : {})
+      open(url, options).read
     rescue OpenURI::HTTPError
       raise "Unable to download #{url} -- #{$!}"
+    rescue OpenSSL::SSL::SSLError
+      retries ||= 0
+      retries += 1
+      if retries == 1
+        log "SSL error downloading #{path}, retrying"
+        retry
+      else
+        raise
+      end
     end
 
     def delete_empty_folders(destination)
@@ -189,6 +199,7 @@ module S3MetaSync
         opts.on("-s", "--secret SECRET", "AWS secret key") { |c| options[:secret] = c }
         opts.on("-r", "--region REGION", "AWS region if not us-standard") { |c| options[:region] = c }
         opts.on("-p", "--parallel COUNT", Integer, "Use COUNT threads for download/upload default: 10") { |c| options[:parallel] = c }
+        opts.on("--ssl-none", "Do not verify ssl certs") { |c| options[:ssl_none] = true }
         opts.on("-V", "--verbose", "Verbose mode"){ options[:verbose] = true }
         opts.on("-h", "--help", "Show this.") { puts opts; exit }
         opts.on("-v", "--version", "Show Version"){ puts VERSION; exit}

data/lib/s3_meta_sync/version.rb

@@ -1,3 +1,3 @@
 module S3MetaSync
-  VERSION = "0.2.1"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: s3_meta_sync
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Michael Grosser
@@ -29,7 +29,7 @@ cert_chain:
   y0kCSWmK6D+x/SbfS6r7Ke07MRqziJdB9GuE1+0cIRuFh8EQ+LN6HXCKM5pon/GU
   ycwMXfl0
   -----END CERTIFICATE-----
-date: 2013-10-08 00:00:00.000000000 Z
+date: 2013-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -75,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Sync folders with s3 using a metadata file and md5 diffs