ocean-rails 1.23.0 → 1.23.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa74489b2e95cf9784f9a4d43c87298865e4c41d
-  data.tar.gz: 1464ba97f4c0a785947f9e412d8b88831d4076ef
+  metadata.gz: a60f9e5ddde0f53ae3f5164a61b946f103a465d1
+  data.tar.gz: d78c366ddd1750da5f4339c67ff97e1956a7fd8d
 SHA512:
-  metadata.gz: 77f8e945949e311cb05ee4a3b395c122384344141ceeb05ff8760fb6ee5fce6479826e2456b795741934ac4ffe319002f6414b227460d40cf96b202c95cec2cb
-  data.tar.gz: 8533c9aa7fdf99d731221f6f91543068a56a143da5ff5970b7d1c055c1028a0ff5024164df5fbde92563f542262b4b6799a6f90341641716a2c1e6826eb7b522
+  metadata.gz: eb38170d80e1723704b8fc5312df41b19f42bbdcaab49d5f51c1c4a2288e0ce50e08b63dde76a805259a0090555944510e116e078d3db10ba05d7ead406a51fa
+  data.tar.gz: f9d70e6d7c2183a3b0bfd25f98e486300f8b7188a8639f02d574669e9dd749127ce7d100c76cebddef9f77e28aa93f3086f032acf0083e8c4d6b98111907630f

data/config/initializers/api_constants.rb

@@ -1,25 +1,35 @@
-f = File.join(Rails.root, "config/config.yml")
+# The is the example file
 ef = File.join(Rails.root, "config/config.yml.example")
 
-f = File.exists?(f) && f || 
-    File.exists?(ef) && Rails.env == 'production' && ef
+# Only load AWS data if there is an example file
+if File.exists?(ef)
 
-if f
-  cfg = YAML.load(File.read(f))
-  cfg.merge! cfg.fetch(Rails.env, {}) if cfg.fetch(Rails.env, {})
-  cfg.each do |k, v|
-    next if k =~ /[a-z]/
-    eval "#{k} = #{v.inspect}"
+  # This is the tailored file, not under source control.
+  f = File.join(Rails.root, "config/config.yml")
+  # If the tailored file doesn't exist, and we're running in production mode
+  # (which is the case under TeamCity), use the example file as-is.
+  f = File.exists?(f) && f || Rails.env == 'production' && ef
+
+  # If there is a file to process, do so
+  if f
+    cfg = YAML.load(File.read(f))
+    cfg.merge! cfg.fetch(Rails.env, {}) if cfg.fetch(Rails.env, {})
+    cfg.each do |k, v|
+      next if k =~ /[a-z]/
+      eval "#{k} = #{v.inspect}"
+    end
+  else
+    # Otherwise print an error message and abort.
+    puts
+    puts "-----------------------------------------------------------------------"
+    puts "Constant definition file missing. Please copy config/config.yml.example"
+    puts "to config/config.yml and tailor its contents to suit your dev setup."
+    puts
+    puts "NB: config.yml is excluded from git version control as it will contain"
+    puts "    data private to your Ocean system."
+    puts "-----------------------------------------------------------------------"
+    puts
+    abort
   end
-else
-  puts
-  puts "-----------------------------------------------------------------------"
-  puts "Constant definition file missing. Please copy config/config.yml.example"
-  puts "to config/config.yml and tailor its contents to suit your dev setup."
-  puts
-  puts "NB: config.yml is excluded from git version control as it will contain"
-  puts "    data private to your Ocean system."
-  puts "-----------------------------------------------------------------------"
-  puts
-  abort
+
 end

data/config/initializers/aws_constants.rb

@@ -1,22 +1,31 @@
-f = File.join(Rails.root, "config/aws.yml")
+
+# The is the example file
 ef = File.join(Rails.root, "config/aws.yml.example")
 
-f = File.exists?(f) && f || 
-    File.exists?(ef) && Rails.env == 'production' && ef
+# Only load AWS data if there is an example file
+if File.exists?(ef)
 
-if f
-  AWS.config YAML.load(File.read(f))[Rails.env]
-else
-  puts
-  puts "-----------------------------------------------------------------------"
-  puts "AWS config file missing. Please copy config/aws.yml.example"
-  puts "to config/aws.yml and tailor its contents to suit your dev setup."
-  puts
-  puts "NB: aws.yml is excluded from git version control as it will contain"
-  puts "    data private to your Ocean system."
-  puts "-----------------------------------------------------------------------"
-  puts
-  abort
-end
+  # This is the tailored file, not under source control.
+  f = File.join(Rails.root, "config/aws.yml")
+  # If the tailored file doesn't exist, and we're running in production mode
+  # (which is the case under TeamCity), use the example file as-is.
+  f = File.exists?(f) && f || Rails.env == 'production' && ef
 
+  # If there is a file to process, do so
+  if f
+    AWS.config YAML.load(File.read(f))[Rails.env]
+  else
+    # Otherwise print an error message and abort.
+    puts
+    puts "-----------------------------------------------------------------------"
+    puts "AWS config file missing. Please copy config/aws.yml.example"
+    puts "to config/aws.yml and tailor its contents to suit your dev setup."
+    puts
+    puts "NB: aws.yml is excluded from git version control as it will contain"
+    puts "    data private to your Ocean system."
+    puts "-----------------------------------------------------------------------"
+    puts
+    abort
+  end
 
+end

data/lib/ocean/version.rb

@@ -1,3 +1,3 @@
 module Ocean
-  VERSION = "1.23.0"
+  VERSION = "1.23.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ocean-rails
 version: !ruby/object:Gem::Version
-  version: 1.23.0
+  version: 1.23.1
 platform: ruby
 authors:
 - Peter Bengtson