ocean-rails 2.12.1 → 2.13.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/generators/ocean_setup/templates/spec_helper.rb +13 -0
- data/lib/ocean/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 273ddf2275399d070522b8f9d8b688a2f07f0b0b
|
|
4
|
+
data.tar.gz: 898f3e7597f2d140a2a98ecfaa9a9af08523b814
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: e050b69b13d0043ba8ed69d97e20c973f4a6c03bb7572b14d6b91784003a0e41e838f1ebdd7ff64a632f410b425a686836a0a58846f62a3b99a36237c4625837
|
|
7
|
+
data.tar.gz: 9169fc2f61c470dea7486f0aa056231030050d6416da2738bc8b8a786d5bf6d12fae3e99f946a64fa74fdcdcd5c51cb277a56479532fa81e6635197b06c3d902
|
|
@@ -47,6 +47,19 @@ RSpec.configure do |config|
|
|
|
47
47
|
end
|
|
48
48
|
|
|
49
49
|
|
|
50
|
+
aws_access_key_id = ENV['AWS_ACCESS_KEY_ID']
|
|
51
|
+
master, staging = aws_access_key_id.split(',')
|
|
52
|
+
aws_access_key_id = (ENV['GIT_BRANCH'] == 'staging' ? staging : master) if staging.present?
|
|
53
|
+
ENV['AWS_ACCESS_KEY_ID'] = aws_access_key_id
|
|
54
|
+
|
|
55
|
+
aws_secret_access_key = ENV['AWS_SECRET_ACCESS_KEY']
|
|
56
|
+
master, staging = aws_secret_access_key.split(',')
|
|
57
|
+
aws_secret_access_key = (ENV['GIT_BRANCH'] == 'staging' ? staging : master) if staging.present?
|
|
58
|
+
ENV['AWS_SECRET_ACCESS_KEY'] = aws_secret_access_key
|
|
59
|
+
|
|
60
|
+
aws_region = ENV['AWS_REGION']
|
|
61
|
+
|
|
62
|
+
|
|
50
63
|
# ------------------------------------------------------------------------------------
|
|
51
64
|
# Uncomment the entire following section if you're creating a client app.
|
|
52
65
|
# You can delete this section if you're creating a REST service.
|
data/lib/ocean/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: ocean-rails
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.
|
|
4
|
+
version: 2.13.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Peter Bengtson
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2014-06-
|
|
11
|
+
date: 2014-06-09 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: typhoeus
|