onlyoffice_s3_wrapper 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6147e29e1e324812b01f9748f18a4aa66f1e391d8888acd2c2a8e49a28076db
-  data.tar.gz: f343cc5ca7cbc42e9412f2f127a05fc39ed9cdcbd31f9a1dd1eeb9820350c8f3
+  metadata.gz: 82668768004470091bdf2f1cf2c4c242f8ec8a7a0f5d6fdb7b20d4155d305782
+  data.tar.gz: 289810f2dde148fe5971954fcfee400480322d0a853d01268eecd263ecd5ee04
 SHA512:
-  metadata.gz: 627aa9ab9034ba2253555da52a7409edc0d521cbca545c8e11a7d0406dafe56e272d82da004712690b33856c95668280fbb2738e4f81c48dd2b5e4e4d83b9a8e
-  data.tar.gz: a297f145abe4a37aeb26bd7d48973793015e24e175979961ccb0313372ccf602e8d0085d3ccebca35fd983644cc86bdc274cce32fddbba582db6d422d5b0f94c
+  metadata.gz: 24446cf6c22cfecdfd41c37b1347c821244d8a79cf6eff4ebcc29c758313a80627c590c4903ee8f5488a29fe8fb1e50443d7cad5f762994613d6d55d02972de9
+  data.tar.gz: de18daabfed6d3d3c7db6041570894c4c2b0e60a4dcf68c943a26d3c8669b282f2d2f3dae5700eecc9f026ef976fae56dd55f819cf6739c801eff57d782a04fd

data/lib/onlyoffice_s3_wrapper.rb

@@ -136,27 +136,15 @@ module OnlyofficeS3Wrapper
     end
 
     # Get S3 key and S3 private key
-    # @param force_file_read [True, False] force key read from file
-    # @return [Array <String>] list of keys
-    def read_keys(force_file_read: false)
-      return if read_env_keys && !force_file_read
-
-      @access_key_id = File.read("#{Dir.home}/.s3/key").strip &&
-                       @secret_access_key = File.read("#{Dir.home}/.s3/private_key").strip
+    # @param key_location [String] Path to search for key files
+    # @return [nil]
+    def read_keys(key_location = "#{Dir.home}/.s3")
+      @access_key_id = File.read("#{key_location}/key").strip
+      @secret_access_key = File.read("#{key_location}/private_key").strip
     rescue Errno::ENOENT
-      raise Errno::ENOENT, "No key or private key found in #{Dir.home}/.s3/ "\
-                           "Please create files #{Dir.home}/.s3/key "\
-                           "and #{Dir.home}/.s3/private_key"
-    end
-
-    private
-
-    # Read keys from env variables
-    def read_env_keys
-      return false unless ENV['S3_KEY'] && ENV['S3_PRIVATE_KEY']
-
-      @access_key_id = ENV['S3_KEY']
-      @secret_access_key = ENV['S3_PRIVATE_KEY']
+      raise Errno::ENOENT, "No key or private key found in #{key_location} "\
+                           "Please create files #{key_location}/key "\
+                           "and #{key_location}/private_key"
     end
   end
 end

data/lib/onlyoffice_s3_wrapper/version.rb

@@ -2,5 +2,5 @@
 
 module OnlyofficeS3Wrapper
   # [String] Version of gem
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onlyoffice_s3_wrapper
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - ONLYOFFICE
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-10 00:00:00.000000000 Z
+date: 2020-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.79.1
+        version: 1.80.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.79.1
+        version: 1.80.0
 - !ruby/object:Gem::Dependency
   name: onlyoffice_file_helper
   requirement: !ruby/object:Gem::Requirement