bubbles 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 383a1a649c6407ee1a6038a046e20b32211330e2
-  data.tar.gz: 16793183bce0ff30fad261b567f24a436b282fbf
+  metadata.gz: 96b3d1b99a3f79cb2e58d1c9634b6cf4e1ba6748
+  data.tar.gz: 034a1c88110918f379452ac746a73e9775e271e0
 SHA512:
-  metadata.gz: daa6af748d3aab608fe92dac4f6480c860f1f3a2500e021d62bfcd46a6173b60d92950a60e1b7c2fca23431213553d55ffdf6beb8e4545ca76929552fe4153bf
-  data.tar.gz: ae647141df468d36e0efbb7ebf31cb12f31094e4564da47a3da4785634a842adddcfaff351f46d897b487157de8b335e84d66341f161356b48f8f5730ab94aa3
+  metadata.gz: d69142f0393fc6ed34094edc8526db90a4e531163a88f728ce723df64f27940bf4dd134716f2662fa130ab2b2d19b9e19774b60b16c76a0a7ba3f6eeb4ccced4
+  data.tar.gz: 4f6d3fff532eed8f0e305f1e6a5ae87a7f6aef6b0ba28d4b9f57b1bac239bba37736c3a6f0470e4c1522ff854d9584aeb9b276255cca41fc94f93c1f2267df1e

data/README.md

@@ -75,8 +75,10 @@ s3_secret_access_key: yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy
 s3_bucket: bucket_name
 s3_region: eu-west-1
 s3_path: foo_folder/bar_folder/car_folder          # will upload to s3://bucket/foo_folder/bar_folder/car_folder
+s3_acl: private                                    # # accepts private, public-read, public-read-write, authenticated-read, aws-exec-read, bucket-owner-read, bucket-owner-full-control
 
-local_dir_uploader_path: /mnt/network_smb_storage
+local_dir_uploader_path: /mnt/network_smb_storage/
+local_dir_metadata_file_path /var/log/uploads_metadata.yaml
 ```
 
 > Look into [lib/bubbles/config.rb](https://github.com/equivalent/bubbles/blob/master/lib/bubbles/config.rb) for more details.

data/lib/bubbles.rb

@@ -3,6 +3,7 @@ require 'pathname'
 require 'logger'
 require 'securerandom'
 require 'yaml'
+require 'json'
 require 'forwardable'
 require 'aws-sdk'
 require "bubbles/version"

data/lib/bubbles/config.rb

@@ -11,7 +11,7 @@ module Bubbles
     attr_writer :config_path, :logger, :source_dir, :processing_dir, :log_path,
       :log_level, :sleep_interval, :uploader_classes, :num_of_files_to_schedule,
       :uniq_filename_randomizer, :local_dir_uploader_path, :s3_access_key_id, :s3_secret_access_key,
-      :s3_region, :s3_path, :s3_bucket, :use_default_config_locations
+      :s3_region, :s3_path, :s3_bucket, :use_default_config_locations, :local_dir_metadata_file_path
 
     def log_path
       @log_path || config_yml['log_path'] || STDOUT
@@ -44,6 +44,11 @@ module Bubbles
       end
     end
 
+    def local_dir_metadata_file_path
+      err_msg = 'You need to set `local_dir_metadata_file_path`'
+      @local_dir_metadata_file_path ||= config_yml.fetch('local_dir_metadata_file_path') { raise err_msg }
+    end
+
     def local_dir_uploader_path
       err_msg = 'As you are using LocalDir uploader,' +
         ' you need to specify `local_dir_uploader_path` in your config' +

data/lib/bubbles/uploaders/local_dir.rb

@@ -7,6 +7,7 @@ module Bubbles
       def call
         config.logger.debug("#{self.class.name}: transfering #{uid_file} to #{local_dir_uploader_path}")
         FileUtils.cp(uid_file, local_dir_uploader_path)
+        write_metadata
       rescue Errno::ENOENT => e
         config.logger.error("#{e.message}")
         command_queue.reschedule(self)
@@ -17,8 +18,23 @@ module Bubbles
       end
 
       private
-        def_delegators :config, :local_dir_uploader_path
-        def_delegators :bfile, :uid_file
+        def_delegators :config, :local_dir_uploader_path, :local_dir_metadata_file_path
+        def_delegators :bfile, :uid_file, :uid_file_name, :metadata
+
+        def write_metadata
+          File.open(local_dir_metadata_file_path, 'a') do |f|
+            f.write yaml_append
+          end
+        end
+
+        def yaml_append
+<<EOF
+-
+  key: #{uid_file_name}
+  path: #{uid_file}
+  metadata: #{metadata.to_json}
+EOF
+        end
     end
   end
 end

data/lib/bubbles/uploaders/s3.rb

@@ -6,7 +6,7 @@ module Bubbles
 
       def call
         File.open(uid_file, 'rb') do |file|
-          s3.put_object(bucket: s3_bucket, key: s3_full_path, body: file, acl: config.s3_acl)
+          s3.put_object(bucket: s3_bucket, key: s3_full_path, body: file, acl: config.s3_acl, metadata: metadata)
         end
       rescue => e
         config.logger.error("#{e.message}")
@@ -19,7 +19,7 @@ module Bubbles
 
       private
         def_delegators :config, :s3_bucket, :s3_path, :s3_credentials, :s3_region
-        def_delegators :bfile, :uid_file, :uid_file_name
+        def_delegators :bfile, :uid_file, :uid_file_name, :metadata
 
         def s3
           @s3 ||= Aws::S3::Client.new({

data/lib/bubbles/version.rb

@@ -1,3 +1,3 @@
 module Bubbles
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bubbles
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Tomas Valent
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-19 00:00:00.000000000 Z
+date: 2017-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk