lib/bubbles/config.rb in bubbles-0.0.2 vs lib/bubbles/config.rb in bubbles-0.0.3

- old
+ new

@@ -52,11 +52,13 @@ pathnamed(@local_dir_uploader_path) end # number of seconds between every command execution in queue seconds, defaults to 1 def sleep_interval - @sleep_interval || 1 + @sleep_interval \ + || config_yml['sleep_interval'] \ + || 1 end # how many files should DirWatcher schedule for upload, defaults to 1 def num_of_files_to_schedule @num_of_files_to_schedule || 1 @@ -89,9 +91,15 @@ def s3_path @s3_path \ || config_yml['s3_path'] \ || '' + end + + def s3_acl + @s3_acl \ + || config_yml['s3_acl'] \ + || 'private' end def s3_bucket @s3_bucket \ || config_yml['s3_bucket'] \