ocean-rails 2.4.2 → 2.4.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/config/initializers/aws_config.rb +7 -4
- data/lib/ocean/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: e70e3b39c27f4d8c554010cf315b628f02b374fd
|
|
4
|
+
data.tar.gz: 929c2dcb66f8b56a5c913dd3ffb3015924254b7a
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: d4be7fdc2b0ebf0ad7806786cfb5bf9faf0b953a25f5c592194b7cfe0115e2178e2b10e5fd9636ee50a11de52975b7b5d823494d35ff5687f304403a5c8b162b
|
|
7
|
+
data.tar.gz: 8a6879c2ffa790094faa5679e2ce00722d9ed3b8fd0d51ac0dc35689b46c9aa72aafc8b2d64d1865edc58609596ad9c46cf9e3a1514b4fa4e374df468c89a131
|
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
if (ENV['AWS_ACCESS_KEY_ID'].present? &&
|
|
3
3
|
ENV['AWS_SECRET_ACCESS_KEY'].present? &&
|
|
4
4
|
ENV['AWS_REGION'].present?)
|
|
5
|
-
AWS.config if defined? AWS
|
|
6
|
-
Aws.config if defined? Aws
|
|
5
|
+
#AWS.config if defined? AWS
|
|
6
|
+
#Aws.config if defined? Aws
|
|
7
7
|
else
|
|
8
8
|
|
|
9
9
|
# The is the example file
|
|
@@ -24,8 +24,11 @@ else
|
|
|
24
24
|
# If there is a file to process, do so
|
|
25
25
|
if f
|
|
26
26
|
options = YAML.load(File.read(f))[Rails.env]
|
|
27
|
-
|
|
28
|
-
|
|
27
|
+
ENV['AWS_ACCESS_KEY_ID'] = options[:access_key_id] || options['access_key_id']
|
|
28
|
+
ENV['AWS_SECRET_ACCESS_KEY'] = options[:secret_access_key] || options['secret_access_key']
|
|
29
|
+
ENV['AWS_REGION'] = options[:region] || options['region']
|
|
30
|
+
#AWS.config options if defined? AWS
|
|
31
|
+
#Aws.config = options if defined? Aws
|
|
29
32
|
else
|
|
30
33
|
# Otherwise print an error message and abort.
|
|
31
34
|
puts
|
data/lib/ocean/version.rb
CHANGED