ocean-rails 7.2.0 → 7.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e310755cb9f8ae50faa37a527bb9fcf60114cf14dddd3e65ed7c409d3916abc
-  data.tar.gz: 7f50f5b0cc5c5ae1bb636fee39df5106ef176a0a7ca2e1165a9b8013b8fc259f
+  metadata.gz: acf56cf8bce9166dcc5a120e197bbdcd615f5c79baec5c99fe9b672fc07f1852
+  data.tar.gz: 27f9e22eab32031c503ac330fbe664c2e2fefd6bf9f3c235889a47a5442d1b10
 SHA512:
-  metadata.gz: ca3905a22de0b28182622dde001ecaaf1b1e062ed6fb1e2e8db08696505d69907e4112ef1930644af3079d29e588ac154323057b2db91df00837d18359296a61
-  data.tar.gz: c8d5df2e30cab29673d663fc6b591165c359750d9b1e11801b8d43a7af426c3626e418e32bb12d8d4ae1502001311dcd09b7ea04c82102aa0cbfb76d64270bf8
+  metadata.gz: 95889ce4e8ebb8aaf40c42f868e0c219a29617e17ccd2433f440cb137ee0df6b5a2fef9e84058322028479fe306388be394638a6f10ac4d1caa9573d10adffa0
+  data.tar.gz: a3a08fc01c54b7a59391329f02cc641f0bb2454aa70310bddba99a59bef7a27931ae1d5e37c2143a777b726b1cf1037b83f3bcd3f4c9260d02b5cd1d9d0a59f2

data/config/initializers/_aws_config.rb

@@ -4,53 +4,32 @@ if (ENV['AWS_ACCESS_KEY_ID'].present? &&
     ENV['AWS_REGION'].present?)
   Aws.config
 else
-
-  # The is the example file
-  ef = File.join(Rails.root, "config/aws.yml.example")
-
-  # Only load AWS data if there is an example file
-  if File.exists?(ef)
-
-    # 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
-      template = ERB.new(File.read(f))
-      processed = YAML.load(template.result(binding))
-      cfg = processed[Rails.env]
-      # Set the ENV variables
-      ENV['AWS_ACCESS_KEY_ID'] = cfg[:access_key_id] || cfg['access_key_id']
-      ENV['AWS_SECRET_ACCESS_KEY'] = cfg[:secret_access_key] || cfg['secret_access_key']
-      ENV['AWS_REGION'] ||= cfg[:region] || cfg['region']
-      # Configure AWS with the raw cfg data
-      AWS.config(cfg)
-      # Configure Aws with a massaged version of the cfg data
-      config = { region: ENV['AWS_REGION'],
-                 credentials: Aws::Credentials.new(ENV['AWS_ACCESS_KEY_ID'], ENV['AWS_SECRET_ACCESS_KEY'])
-      }
-      config[:endpoint] = cfg["endpoint"] if cfg["endpoint"]
-      Aws.config.update(config)
-    else
-      # Otherwise print an error message and exit with an error.
-      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
-      exit 1
-    end
+  f = File.join(Rails.root, "config/aws.yml")
+  if f
+    template = ERB.new(File.read(f))
+    processed = YAML.load(template.result(binding))
+    cfg = processed[Rails.env]
+    # Set the ENV variables
+    ENV['AWS_ACCESS_KEY_ID'] = cfg[:access_key_id] || cfg['access_key_id']
+    ENV['AWS_SECRET_ACCESS_KEY'] = cfg[:secret_access_key] || cfg['secret_access_key']
+    ENV['AWS_REGION'] ||= cfg[:region] || cfg['region']
+    # Configure AWS with the raw cfg data
+    AWS.config(cfg)
+    # Configure Aws with a massaged version of the cfg data
+    config = { region: ENV['AWS_REGION'],
+               credentials: Aws::Credentials.new(ENV['AWS_ACCESS_KEY_ID'], ENV['AWS_SECRET_ACCESS_KEY'])
+    }
+    config[:endpoint] = cfg["endpoint"] if cfg["endpoint"]
+    Aws.config.update(config)
+  else
+    # Otherwise print an error message and exit with an error.
+    puts
+    puts "-----------------------------------------------------------------------"
+    puts "AWS config file missing. Please copy config/aws.yml from the ocean-rails"
+    puts "gem. Alternatively export environment variables AWS_ACCESS_KEY_ID,"
+    puts "AWS_SECRET_ACCESS_KEY, and AWS_REGION."
+    puts "-----------------------------------------------------------------------"
+    puts
+    exit 1
   end
 end

data/lib/ocean/version.rb

@@ -1,3 +1,3 @@
 module Ocean
-  VERSION = "7.2.0"
+  VERSION = "7.2.1"
 end

metadata

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