ocean-rails 1.22.8 → 1.23.0

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 CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: c50ab1b13f8a43e5f81ec8b40d7b87a2b58ddd53
4
- data.tar.gz: 381cd76a1991ad97a346116547388e834ef0c056
3
+ metadata.gz: aa74489b2e95cf9784f9a4d43c87298865e4c41d
4
+ data.tar.gz: 1464ba97f4c0a785947f9e412d8b88831d4076ef
5
5
  SHA512:
6
- metadata.gz: a83b9f37f7ee95dec92b898918d28a935036b5be284fe0f82a5f91b4bafdd79ce60fb0d0f3670be350a2abb668d643f0b889cc3576ccad3ab755a319e3c768d4
7
- data.tar.gz: 276a8b34e00e39447ec24c107af508177f15dd1ef3bf10f8d0c5a83ce43ee6aaf745d60c8adcd6f1e0f1d724df7095cca4f6b3fb510c3ba3344dee9c0b37153c
6
+ metadata.gz: 77f8e945949e311cb05ee4a3b395c122384344141ceeb05ff8760fb6ee5fce6479826e2456b795741934ac4ffe319002f6414b227460d40cf96b202c95cec2cb
7
+ data.tar.gz: 8533c9aa7fdf99d731221f6f91543068a56a143da5ff5970b7d1c055c1028a0ff5024164df5fbde92563f542262b4b6799a6f90341641716a2c1e6826eb7b522
@@ -1,5 +1,17 @@
1
1
  f = File.join(Rails.root, "config/config.yml")
2
- unless File.exists?(f)
2
+ ef = File.join(Rails.root, "config/config.yml.example")
3
+
4
+ f = File.exists?(f) && f ||
5
+ File.exists?(ef) && Rails.env == 'production' && ef
6
+
7
+ if f
8
+ cfg = YAML.load(File.read(f))
9
+ cfg.merge! cfg.fetch(Rails.env, {}) if cfg.fetch(Rails.env, {})
10
+ cfg.each do |k, v|
11
+ next if k =~ /[a-z]/
12
+ eval "#{k} = #{v.inspect}"
13
+ end
14
+ else
3
15
  puts
4
16
  puts "-----------------------------------------------------------------------"
5
17
  puts "Constant definition file missing. Please copy config/config.yml.example"
@@ -11,9 +23,3 @@ unless File.exists?(f)
11
23
  puts
12
24
  abort
13
25
  end
14
- cfg = YAML.load(File.read(f))
15
- cfg.merge! cfg.fetch(Rails.env, {}) if cfg.fetch(Rails.env, {})
16
- cfg.each do |k, v|
17
- next if k =~ /[a-z]/
18
- eval "#{k} = #{v.inspect}"
19
- end
@@ -0,0 +1,22 @@
1
+ f = File.join(Rails.root, "config/aws.yml")
2
+ ef = File.join(Rails.root, "config/aws.yml.example")
3
+
4
+ f = File.exists?(f) && f ||
5
+ File.exists?(ef) && Rails.env == 'production' && ef
6
+
7
+ if f
8
+ AWS.config YAML.load(File.read(f))[Rails.env]
9
+ else
10
+ puts
11
+ puts "-----------------------------------------------------------------------"
12
+ puts "AWS config file missing. Please copy config/aws.yml.example"
13
+ puts "to config/aws.yml and tailor its contents to suit your dev setup."
14
+ puts
15
+ puts "NB: aws.yml is excluded from git version control as it will contain"
16
+ puts " data private to your Ocean system."
17
+ puts "-----------------------------------------------------------------------"
18
+ puts
19
+ abort
20
+ end
21
+
22
+
@@ -1,3 +1,3 @@
1
1
  module Ocean
2
- VERSION = "1.22.8"
2
+ VERSION = "1.23.0"
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.22.8
4
+ version: 1.23.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: 2013-10-01 00:00:00.000000000 Z
11
+ date: 2013-10-29 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: faraday
@@ -66,6 +66,20 @@ dependencies:
66
66
  - - '>='
67
67
  - !ruby/object:Gem::Version
68
68
  version: '0'
69
+ - !ruby/object:Gem::Dependency
70
+ name: ffi
71
+ requirement: !ruby/object:Gem::Requirement
72
+ requirements:
73
+ - - '='
74
+ - !ruby/object:Gem::Version
75
+ version: 1.9.0
76
+ type: :runtime
77
+ prerelease: false
78
+ version_requirements: !ruby/object:Gem::Requirement
79
+ requirements:
80
+ - - '='
81
+ - !ruby/object:Gem::Version
82
+ version: 1.9.0
69
83
  - !ruby/object:Gem::Dependency
70
84
  name: ffi-rzmq
71
85
  requirement: !ruby/object:Gem::Requirement
@@ -247,6 +261,7 @@ files:
247
261
  - app/controllers/errors_controller.rb
248
262
  - app/helpers/application_helper.rb
249
263
  - config/initializers/api_constants.rb
264
+ - config/initializers/aws_constants.rb
250
265
  - config/initializers/ocean_constants.rb
251
266
  - config/initializers/zeromq_logger.rb
252
267
  - config/routes.rb