ocean-rails 1.27.0 → 1.27.1

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: 68185321c29cc2326f71f3a6a33e62282f29ab4a
4
- data.tar.gz: c48b60d0c5baca7468330646f5d9b36f81e44aca
3
+ metadata.gz: eae839f8f398c03ddccff192d62a1dcea63c58f4
4
+ data.tar.gz: db831dd89beb0d6258fd4e6d363770ff0d86fe4b
5
5
  SHA512:
6
- metadata.gz: baac769d1e6869b13659d54070cfd7545525b111b4345fae9b31392b239fb93c86d407e2d8e73b58ab245d1a0b81e77b41cb634e7725f4b5a6a011b858d6f79d
7
- data.tar.gz: 5aec9f52b1a274328f1d18e0538d2d83fa9a784e0fe1ea2d384b5b13bd356a24f0918e29775b01d50e3153a706f768ed829635592b1c08c15d855d86645687ba
6
+ metadata.gz: 60a369f6fd64ca30a903f4228cb943f7dab96300b26b3df20bc8e1be7d133ac16302a2ee69b8df12f5f653df8b72e2bcc2ed3046e449f3c7be7a328316689c54
7
+ data.tar.gz: c7e3f4a34450e2daf04ee3acf5c4047085276f7ce3e299607542387ce3b2048d4e411a51e41b50ffee152bdfb6c64dfebae5ce8b160e34dfbfc188e4b1544e7b
@@ -7,8 +7,8 @@ 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
- # If the tailored file doesn't exist, and we're running in test mode
11
- # (which is the case under TeamCity), use the example file as-is.
10
+ # If the tailored file doesn't exist, and we're running under TeamCity,
11
+ # use the example file as-is.
12
12
  unless File.exists?(f)
13
13
  f = ENV['OCEAN_API_HOST'] ? ef : false
14
14
  end
@@ -19,7 +19,11 @@ if File.exists?(ef)
19
19
  cfg.merge! cfg.fetch(Rails.env, {}) if cfg.fetch(Rails.env, {})
20
20
  cfg.each do |k, v|
21
21
  next if k =~ /[a-z]/
22
- eval "#{k} = #{v.inspect}"
22
+ if ENV["OVERRIDE_#{k}"]
23
+ eval "#{k} = #{ENV["OVERRIDE_#{k}"].inspect}"
24
+ else
25
+ eval "#{k} = #{v.inspect}"
26
+ end
23
27
  end
24
28
  else
25
29
  # Otherwise print an error message and abort.
data/lib/ocean/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Ocean
2
- VERSION = "1.27.0"
2
+ VERSION = "1.27.1"
3
3
  end
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: 1.27.0
4
+ version: 1.27.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Peter Bengtson
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-12-19 00:00:00.000000000 Z
11
+ date: 2013-12-21 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: faraday