takenoko-s3 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2608fa6041d1280ad760abd979fdc662cb9e7fae
-  data.tar.gz: 2d6c23a967ca61e9207c1dcd96dea44f17c06c42
+  metadata.gz: f6922c02010745f12516ecedde82d5d58b28528d
+  data.tar.gz: 0d21656bde5a035f48bc594f634179325d20020d
 SHA512:
-  metadata.gz: 4c3f7e50d0d258e788191f24c7e9ad93b0a0181d8ef483d22f8bb01c559bb4331d4d1d60d2edfca25295dbee6c3db542e5d5ddb95fc1f2d5fcfc6afdcf52afcf
-  data.tar.gz: 07381f5976287f85c37bdda04d9209f188bd3880a2942f760c1aeb02f8742687f85b773188129fc80cfc4442c377a77634b2d7def9a02ef2775b5a32eeafbd05
+  metadata.gz: e7682d01f2a68bb3f78292495dd552494df603c43afad03780514882bec670c168c6663fc08754922145e0d89df04c5c6622c5c975c81119438884174c74e29c
+  data.tar.gz: 826600fc19787eb2ab050b9bf3fbb833d2fcba077e95ea0112dc10abb9818b7c4a3f7760cb696c5043c9b042f064565deb5d7cfdf3d1adb0cffa7e9d2d30cd31

data/lib/takenoko/s3/attach_helper.rb

@@ -2,29 +2,50 @@ module Takenoko
   module AttachHelper
     extend self
     def upload_to_s3(table_data)
+      errors = []
       return false unless table_data[:to_s3].present?
       raise 'bucket must be set' if table_data[:bucket].blank?
       raise 'attach_files empty' if table_data[:attach_files].blank?
       raise "Bucket not found:#{table_data[:bucket]}" unless bucket = Takenoko.s3.client.bucket(table_data[:bucket])
 
+      table_name = table_data[:table_name]
+      takelog = "#{Takenoko.log_folder}/#{table_name}_log.yml"
+      log_data = (File.exist?(takelog) && YAML.load_file(takelog)) || {}
+
       table_data[:attach_files].each do |col|
         next unless col[:to_s3].present?
         table_data[:rows].each do |row|
           next if row[col[:column_name]].blank?
           file_path = col[:download_location] + '/' + File.basename(row[col[:column_name]])
           unless File.file?(file_path)
-            raise "File not found: #{file_path}, download first or use download_and_upload_to_s3" 
+            errors << "Table[#{table_data[:table_name]}]File not found: #{file_path}" 
+            next
           end
+
           file = File.open(file_path)
           s3_path = col[:s3_folder]+ "/" +  File.basename(row[col[:column_name]])
+
+          find_val = row[table_data[:find_column]]
+
+          if log_data[find_val].present? && (f = bucket.files.get(s3_path))
+            next if log_data[find_val][:s3_last_upload] && log_data[find_val][:s3_last_upload] >= file.mtime.to_i
+          end
+
           Rails.logger.info "Uploading to s3: #{file_path} -> #{s3_path}"
-          bucket.files.create({
+          f = bucket.files.create({
             key: s3_path,
             body: file,
-            public: col[:s3_public]
+            public: col[:s3_public],
           })
+
+          log_data[find_val] ||= {}
+          log_data[find_val][:s3_last_upload] = file.mtime.to_i
         end
       end
+
+      File.open(takelog, 'w') {|f| f.write log_data.to_yaml }
+
+      raise errors.join("\n") unless errors.empty?
       return true
     end
   end

data/lib/takenoko/s3/takenoko.rb

@@ -11,10 +11,16 @@ module Takenoko
   end
 
   def upload_all_to_s3
+    errors = []
     mapping_config[:tables].each do |table,conf|
       next if conf[:attach_files].blank?
-      upload_table_to_s3 table
+      begin
+        upload_table_to_s3 table
+      rescue Exception => e
+        errors << e.to_s
+      end
     end
+    raise errors.join("\n") unless errors.empty?
     return true
   end
 
@@ -26,10 +32,16 @@ module Takenoko
   end
 
   def download_and_upload_all_to_s3
+    errors = []
     mapping_config[:tables].each do |table,conf|
       next if conf[:attach_files].blank?
-      download_and_upload_table_to_s3 table
+      begin
+        download_and_upload_table_to_s3 table
+      rescue Exception => e
+        errors << e.to_s
+      end
     end
+    raise errors.join("\n") unless errors.empty?
     return true
   end
 end

data/lib/takenoko/s3/version.rb

@@ -1,5 +1,5 @@
 module Takenoko
   module S3
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

data/takenoko-s3.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = %q{S3 Uploader plugin for takenoko}
   spec.description   = %q{S3 Uploader plugin for takenoko}
-  spec.homepage      = "https://github.com/khiemns54/takenoko-s3/tree/release/0.0.5"
+  spec.homepage      = "https://github.com/khiemns54/takenoko-s3/tree/release/0.0.6"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"
-  spec.add_dependency "takenoko", "~> 0.2.3"
+  spec.add_dependency "takenoko", "~> 0.2.5"
   spec.add_dependency "fog-aws"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: takenoko-s3
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - KhiemNS
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-15 00:00:00.000000000 Z
+date: 2016-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.2.5
 - !ruby/object:Gem::Dependency
   name: fog-aws
   requirement: !ruby/object:Gem::Requirement
@@ -104,7 +104,7 @@ files:
 - lib/takenoko/s3/tasks/takenoko.rake
 - lib/takenoko/s3/version.rb
 - takenoko-s3.gemspec
-homepage: https://github.com/khiemns54/takenoko-s3/tree/release/0.0.5
+homepage: https://github.com/khiemns54/takenoko-s3/tree/release/0.0.6
 licenses:
 - MIT
 metadata: {}