ocean-rails 2.4.1 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7b5a78372d3c35068c061e3004599974cc799b8
-  data.tar.gz: 43d486b1440b968dddcc88d143cd4ed6f0c6da15
+  metadata.gz: 9d4700f58e4efcefda8d03924a2f00d42767ca1b
+  data.tar.gz: 6e471c7095d2471839111c092ecbd0d1656597e4
 SHA512:
-  metadata.gz: 63ae97e72021e9040ea979d7204e0ea6f3b02d3cf17e279207cc3b4b27f3d688eba591f6dd4fd02709871fd4b46a852197a017f2e677dc603910671604e12da9
-  data.tar.gz: e038b3a1d74d55c715485baa14cdd7b8cdf328603d74af85a5fffdaedf3f2dffbfa1a526e340fad59aec7ef8d98496c192be687186142ed4689b3c60f238f142
+  metadata.gz: cb3406dd08bc094045841d5bde5bed442c233b0468834ea335c9075ac5fd02e36eec531ec2ca7d9a55428b59f9654e32724df731f68a7349a9c4f497c8694c59
+  data.tar.gz: 0354d7eac1d60908a00ce514aa0dd6c3fe0c9376f046c3252347569dbef6ebb0d2778421e569d889a788fb462daaef7464d33b135fdf232442e58d07393609de

data/config/initializers/aws_config.rb

@@ -1,35 +1,45 @@
-# The is the example file
-ef = File.join(Rails.root, "config/aws.yml.example")
+# Check if the ENV vars are set; if so, don't read any file
+if (ENV['AWS_ACCESS_KEY_ID'].present? &&
+    ENV['AWS_SECRET_ACCESS_KEY'].present? &&
+    ENV['AWS_REGION'].present?)
+  AWS.config if defined? AWS
+  Aws.config if defined? Aws
+else
 
-# Only load AWS data if there is an example file
-if File.exists?(ef)
+  # The is the example file
+  ef = File.join(Rails.root, "config/aws.yml.example")
 
-  # 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 test mode
-  # (which is the case under TeamCity), use the example file as-is.
-  unless File.exists?(f)
-    f = ENV['OCEAN_API_HOST'] ? ef : false
-  end
+  # Only load AWS data if there is an example file
+  if File.exists?(ef)
 
-  # If there is a file to process, do so
-  if f
-    options = YAML.load(File.read(f))[Rails.env]
-    AWS.config options if defined? AWS
-    Aws.config = options if defined? Aws
-  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
+    # 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 test mode
+    # (which is the case under TeamCity), use the example file as-is.
+    unless File.exists?(f)
+      f = ENV['OCEAN_API_HOST'] ? ef : false
+    end
 
+    # If there is a file to process, do so
+    if f
+      options = YAML.load(File.read(f))[Rails.env]
+      AWS.config options if defined? AWS
+      Aws.config = options if defined? Aws
+    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 "Alternatively export environment variables AWS_ACCESS_KEY_ID,"
+      puts "AWS_SECRET_ACCESS_KEY, and AWS_REGION."
+      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
 end

data/lib/ocean/version.rb

@@ -1,3 +1,3 @@
 module Ocean
-  VERSION = "2.4.1"
+  VERSION = "2.4.2"
 end

metadata

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