s3simplesync 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79324be3816b37a893e39f6260aab1bda56e59d8
-  data.tar.gz: cc9540f33f4b643212e2fb458b48c8295820b363
+  metadata.gz: 07f36aa09435a50d56ce957b0be9eb995279e6e6
+  data.tar.gz: ad085a9c9cb2869be6feb75c56d35fe2c7b4808a
 SHA512:
-  metadata.gz: 0b8c2dcf6aca93189987ad3af956e47b9ca65d6012ef43d5ad6f393fcdc070f0f063b91de0819fc3f8aef65150a48f184ea2d56b208d8f8b2fefea152d709f82
-  data.tar.gz: 0c9f7b1d4794e4b93b3364ad4dcf2a62734636d7ef30caed2038ecf90c9d0692a9ed7abfe154ee0dfa74756c73a00366c447e166ec550ee0dbcf325be9639d65
+  metadata.gz: 115f20bbc2331b3fb4e4c016e0058a297d244a9e2828b7670f46ff9f08b0527a90e0d5c9ed4fc90966fe766afeade80cf0a3a5ca2af75bb6d2f71b17670eabfa
+  data.tar.gz: ef1158237193fd6d3e9e56c2caa42d6d95c2a4a0d836e013fa5913984d99c283d6776642be5835de862b7b82b40c98f4df8834230efba710bc81c4c815c8d79c

data/lib/s3sync/logger.rb

@@ -0,0 +1,22 @@
+require 'syslog/logger'
+
+module S3sync
+
+  class Logger
+    def initialize
+      @log = Syslog::Logger.new 'S3sync'
+    end
+
+    def info(message)
+      return puts message if ENV['DEBUG']
+      @log.info "INFO: #{message}"
+    end
+
+    def error(e)
+      message = "ERROR: #{e.message} #{e.backtrace.inspect}"
+      return puts message if ENV['DEBUG']
+      @log.error message
+    end
+  end
+
+end

data/lib/s3sync/syncer.rb

@@ -1,21 +1,19 @@
 require 'find'
 require 'fileutils'
-require 'syslog/logger'
 
 module S3sync
 
   class Syncer
     def initialize
       @s3 = AWS::S3.new
-      @log = Syslog::Logger.new 'S3sync'
+      @log = S3sync::Logger.new
     end
 
     def upload(local_path, s3_url)
       bucket_name, *folders = s3url_to_bucket_folder s3_url
 
-      log "Uploading files" 
-      # Yielding the remote s3 files and doing a 2 pass filter
-      # as better performance than computing a diff of 2 complete directory listings
+      @log.info "Uploading files" 
+
       local_files = local_files(local_path)
       remote_files(bucket_name, folders) do |s3|
         source = local_files[s3[:key]]
@@ -24,37 +22,34 @@ module S3sync
 
       local_files.each do |key,item|
         s3_key = File.join folders, key
-        log "#{item[:file]} => s3://#{bucket_name}/#{s3_key}"
+        @log.info "#{item[:file]} => s3://#{bucket_name}/#{s3_key}"
         s3_upload item, bucket_name, s3_key
       end
-      log "done"
-
+      @log.info "Done"
+    rescue Exception => e
+      @log.error e
     end
 
     def download(s3_location, local_path)
       bucket_name, *folders = s3url_to_bucket_folder s3_location
       destination_folder = File.absolute_path(local_path)
 
-      log "Downloading"
-      # Yielding the remote s3 files and doing a 2 pass filter
-      # as better performance than computing a diff of 2 complete directory listings
+      @log.info "Downloading"
+      
       local_files = local_files(local_path)
       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}"
+        @log.info "#{s3[:file].public_url} => #{destination_file}"
         s3_download s3, destination_file
       end
-      log "done"
+      @log.info "Done"
+    rescue Exception => e
+      @log.error e
     end
 
   private
 
-    def log(message)
-      return puts message if ENV['DEBUG']
-      @log.info message
-    end
-
     def ensure_folder_exists(folder)
       FileUtils.mkdir_p(folder) unless File.directory?(folder)
     end 
@@ -85,7 +80,7 @@ module S3sync
 
     def s3url_to_bucket_folder(s3_location)
       s3_path = s3_location.match(/s3:\/\/(.*)/)[1] rescue nil
-      exit 1 unless s3_path
+      raise 'Invalid S3 url must be s3://bucket form' unless s3_path
 
       s3_path.split /\//
     end
@@ -116,6 +111,8 @@ module S3sync
         file:object }
     end
 
+    # Yielding the remote s3 files and doing a 2 pass filter
+    # as better performance than computing a diff of 2 complete directory listings
     def remote_files(bucket, folders)
       objects = @s3.buckets[bucket].objects.with_prefix(File.join(folders))
       objects.each do |object|

data/lib/s3sync/version.rb

@@ -1,3 +1,3 @@
 module S3sync
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/lib/s3sync.rb

@@ -3,4 +3,5 @@ require 'aws-sdk'
 require "s3sync/version"
 require "s3sync/syncer"
 require "s3sync/file_diff"
+require "s3sync/logger"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: s3simplesync
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Christian Blunden
@@ -72,6 +72,7 @@ files:
 - bin/s3sync-upload
 - lib/s3sync.rb
 - lib/s3sync/file_diff.rb
+- lib/s3sync/logger.rb
 - lib/s3sync/syncer.rb
 - lib/s3sync/version.rb
 - s3sync.gemspec