ocean-rails 1.23.7 → 1.23.8

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: d2697df8c214b9b41bf15dbb1be550ec42d10cca
4
- data.tar.gz: 328a234b5380d163362588b56e2747cb41c17ec3
3
+ metadata.gz: 55f6670dd69706b4b4117f07a1c99e5b3b0d89d4
4
+ data.tar.gz: cfa5dcf116e7754d9806a9009cc689d87ad049b7
5
5
  SHA512:
6
- metadata.gz: 295d7b58f2807d27518df08596572ff02e6c4094e551004641465453862e85850e3dcdf53672338a2a0662dc54d50c85c9e223e4e22372584d5e8428e98ca41c
7
- data.tar.gz: e564ab952407cf3f4fdebaaf982b06506276dce0d070eeabe4d2fa4395e0ac9463c17d64490cd8988308a06f8cb428cadec18122920a978fb0e570112db54b97
6
+ metadata.gz: 131e464789b4a30bd5cd3c6caa95611667a29d53bf5b130aebc3d94a039c887548111779fd8b8d51d8f6d916f40905a7d3a5430e29e75c0dcd680433d8e7c018
7
+ data.tar.gz: c2813fb328575ec9f65edc0019cdd1e976bf0ec3b084d667a1e6f035199bc2cda18431d70ca25853774671a60ca897c34a6780af03afd5ade5ed5a1f2ee4cf73
@@ -7,20 +7,12 @@ if File.exists?(ef)
7
7
  # This is the tailored file, not under source control.
8
8
  f = File.join(Rails.root, "config/config.yml")
9
9
 
10
- puts
11
- puts "--- Rails.env = #{Rails.env}"
12
- puts "--- ef = #{ef}"
13
- puts "--- f = #{f}"
14
-
15
10
  # If the tailored file doesn't exist, and we're running in test mode
16
11
  # (which is the case under TeamCity), use the example file as-is.
17
12
  unless File.exists?(f)
18
13
  f = ENV['OCEAN_API_HOST'] ? ef : false
19
14
  end
20
15
 
21
- puts "--- LOADING #{f}"
22
- puts
23
-
24
16
  # If there is a file to process, do so
25
17
  if f
26
18
  cfg = YAML.load(File.read(f))
@@ -1,4 +1,3 @@
1
-
2
1
  # The is the example file
3
2
  ef = File.join(Rails.root, "config/aws.yml.example")
4
3
 
@@ -7,9 +6,12 @@ if File.exists?(ef)
7
6
 
8
7
  # This is the tailored file, not under source control.
9
8
  f = File.join(Rails.root, "config/aws.yml")
9
+
10
10
  # If the tailored file doesn't exist, and we're running in test mode
11
11
  # (which is the case under TeamCity), use the example file as-is.
12
- f = (File.exists?(f) && f) || ((Rails.env == 'test') && ef)
12
+ unless File.exists?(f)
13
+ f = ENV['OCEAN_API_HOST'] ? ef : false
14
+ end
13
15
 
14
16
  # If there is a file to process, do so
15
17
  if f
@@ -1,3 +1,3 @@
1
1
  module Ocean
2
- VERSION = "1.23.7"
2
+ VERSION = "1.23.8"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ocean-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.23.7
4
+ version: 1.23.8
5
5
  platform: ruby
6
6
  authors:
7
7
  - Peter Bengtson