s3_meta_sync 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7a6e80c1fb50514a2c9b8d3ae92d5b64e36ea04
-  data.tar.gz: c981a2e2d8f5e66f71ee137fc5fcdd0447536ef0
+  metadata.gz: 69de05c47d37f1180bc63baee1e0e6a44ae9b015
+  data.tar.gz: 95adb0d72567884df6d36f2de1b98821bfe8f075
 SHA512:
-  metadata.gz: f509c31ef5ed0f1ddb956b7b3d7ae8c4e714df69e69502b6f422a5095d4c494b25c128aba169c63dabab33af944504c4f84573bd79012cf0adc7ec7cfe2772f3
-  data.tar.gz: 2e60e1c6f3b49400c21b4cc25f210f2eec9a7aa1a87f00effdeb0d290bbf1674697b2b2cb46f6a6b2d8a236893800c117221cc966b01c2e928455407154002fa
+  metadata.gz: 94f6110520c5bbb3f309436c1fbb8bdae2923298f37c1cfac8d8e0a8f8e36031c1811c7d84f91583f7134908e57559a590f365a69612e519ac2ee7146edce31d
+  data.tar.gz: 17bf888f1b3b0f7ed35b6fdd61d183a42487cd0682005a1ba60948b6131b3e6565d385063e91455b1f2b3354d9192a3ecb02edce8b34c51f26f2508889d6766b

data/lib/s3_meta_sync/syncer.rb

@@ -17,13 +17,18 @@ module S3MetaSync
     end
 
     def sync(source, destination)
-      raise if source.end_with?("/") or destination.end_with?("/")
+      raise ArgumentError if source.end_with?("/") or destination.end_with?("/")
 
       if destination.include?(":")
         @bucket, destination = destination.split(":")
         upload(source, destination)
       else
-        @bucket, source = source.split(":")
+        if url?(source)
+          @bucket = nil
+          source = source
+        else
+          @bucket, source = source.split(":")
+        end
         download(source, destination)
       end
     end
@@ -35,7 +40,7 @@ module S3MetaSync
       remote_meta = begin
         download_meta(destination)
       rescue RemoteWithoutMeta
-        log "Remote has no .s3-meta-sync, uploading everything", true
+        log "Remote has no #{META_FILE}, uploading everything", true
         {files: {}}
       end
       local_files = generate_meta(source)[:files]
@@ -232,7 +237,12 @@ module S3MetaSync
 
     def download_content(path)
       log "Downloading #{path}"
-      url = "https://s3#{"-#{region}" if region}.amazonaws.com/#{@bucket}/#{path}"
+      url =
+        if url?(path)
+          path
+        else
+          "https://s3#{"-#{region}" if region}.amazonaws.com/#{@bucket}/#{path}"
+        end
       options = (@config[:ssl_none] ? {:ssl_verify_mode => OpenSSL::SSL::VERIFY_NONE} : {})
       open(url, options)
     rescue OpenURI::HTTPError
@@ -280,6 +290,10 @@ module S3MetaSync
       end.each(&:join)
     end
 
+    def url?(source)
+      source.include?("://")
+    end
+
     def log(text, important=false)
       $stderr.puts text if @config[:verbose] or important
     end

data/lib/s3_meta_sync/version.rb

@@ -1,3 +1,3 @@
 module S3MetaSync
-  VERSION = "0.8.1"
+  VERSION = "0.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s3_meta_sync
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-18 00:00:00.000000000 Z
+date: 2016-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core