ocean-rails 7.2.4 → 7.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25bda2932322cad874e89ae83e013275c4c816177530b5825fec74eb339dfb30
-  data.tar.gz: 34c5a09aa1c5f6e9fa308cf78430ce0f65230752f2e5bf5d83830e9a706358bf
+  metadata.gz: ae94418c6ed9425568ee1da771c64cff6dc5dc25720c451e4d27b5d3bd446c91
+  data.tar.gz: 11b92197a8b0fc5cac8c825fc85ae51d73f216772ccd2abe51cccce98663143c
 SHA512:
-  metadata.gz: 902294e159a0c9bc06b0a2a13347687bc91f2a91916e3feeb74bbab6145b3ab7e5e6dfd5fc72db9a77f80b108f25791c2f560268c65cbb0b1cd84b625024405c
-  data.tar.gz: 4480c1cfdf7eefb75ab6b9edda68a8a7fca09254247931aba349f205f35f20bd7cd9a96ff912e54e7faa9911ef6608c4a3e536aca3c1273e5716636b1a131970
+  metadata.gz: d93655a8e004101667ba7c02c608648ca3e07801a47b556e1459fc055c641e7a9acbee11d452dcade0f23ac3bec238d4460b77676f604c68d432dcae3425cec1
+  data.tar.gz: 29561210bd7dad8ebccc975613e341b2e5e3ef50dda1906521341a9d0dd180de130718c2353d6fc8ac4936da750a1265d9b975d84cb18839ef145dc67fcb6df6

data/lib/generators/ocean_setup/ocean_setup_generator.rb

@@ -76,12 +76,11 @@ class OceanSetupGenerator < Rails::Generators::NamedBase #:nodoc: all
   end
 
   def install_config_yml_files
-    template  "config.yml.example", "#{Rails.root}/config/config.yml.example"
-    template  "config.yml.example", "#{Rails.root}/config/config.yml"
+    template  "config.yml", "#{Rails.root}/config/config.yml"
   end
 
   def install_aws_yml_files
-    template  "aws.yml.example", "#{Rails.root}/config/aws.yml"
+    template  "aws.yml", "#{Rails.root}/config/aws.yml"
   end
 
   def install_default_cache_time_file
@@ -98,9 +97,4 @@ class OceanSetupGenerator < Rails::Generators::NamedBase #:nodoc: all
     git :init
   end
 
-  def add_zeromq_logging_in_production
-    prepend_to_file 'config/environments/production.rb',
-                    "Rails.logger = ZeromqLogger.new\n\n"
-  end
-
 end

data/lib/generators/ocean_setup/templates/Gemfile

@@ -25,9 +25,3 @@ group :test do
   gem 'rspec-rails'
   gem 'simplecov', require: false
 end
-
-group :test , :development do
-  gem 'guard'#, require:false
-  gem 'guard-rspec'#, require: false
-  gem 'foreman'
-end

data/lib/generators/ocean_setup/templates/config.yml

@@ -0,0 +1,32 @@
+# The Ocean environment
+OCEAN_ENV: <%= ENV['OCEAN_ENV'] %>
+
+# This is the application's name
+APP_NAME:     <%= ENV['APP_NAME'] %>
+
+# Authentication data to use when the app authenticates with the Auth service.
+# You should substitute your own password. Passwords should not be identical
+# between services. Use a unique password in each case.
+API_USER:     <%= ENV['API_USER'] %>
+API_PASSWORD: <%= ENV['API_PASSWORD'] %>
+
+# This is the base domain used for all Ocean calls.
+BASE_DOMAIN:  <%= ENV['BASE_DOMAIN'] %>
+OCEAN_API_HOST: <%= ENV['OCEAN_API_HOST'] %>
+OCEAN_API_URL: <%= ENV['OCEAN_API_URL'] %>
+INTERNAL_OCEAN_API_URL: <%= ENV['INTERNAL_OCEAN_API_URL'] %>
+
+# This enumerates the latest versions of all resources in the system, not just the
+# ones defined by this service. You should keep it updated at all times.
+# The special key _default is used as a fallback.
+#API_VERSIONS: <%= JSON.parse(ENV['API_VERSIONS']) %>
+
+# This is the list of IP numbers for the Varnish instances. (For PURGE and BAN.)
+LOAD_BALANCERS: <%= ENV['LOAD_BALANCERS'].split "," %>
+
+# This is the list of IP numbers for the memcached servers. (Only used in production.)
+MEMCACHED_SERVERS: <%= ENV['MEMCACHED_SERVERS'].split "," %>
+
+# The password regex and error message
+PASSWORD_REGEXP: <%= ENV['PASSWORD_REGEXP'] %>
+PASSWORD_MSG: <%= ENV['PASSWORD_MSG'] %>

data/lib/generators/ocean_setup/templates/gitignore

@@ -7,9 +7,6 @@
 # Ignore bundler config
 /.bundle
 
-# Ignore the default SQLite database.
-/db/*.sqlite3
-
 # Ignore all logfiles and tempfiles.
 /log/*.log
 /tmp
@@ -24,11 +21,5 @@
 # Ignore coverage artefacts
 /coverage
 
-# Ignore the tailored config.yml file
-config/config.yml
-
 # Ignore any tailored smtp.yml file
 config/smtp.yml
-
-# Ignore the Tork config dir
-/.tork

data/lib/ocean/version.rb

@@ -1,3 +1,3 @@
 module Ocean
-  VERSION = "7.2.4"
+  VERSION = "7.2.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ocean-rails
 version: !ruby/object:Gem::Version
-  version: 7.2.4
+  version: 7.2.5
 platform: ruby
 authors:
 - Peter Bengtson
@@ -224,8 +224,8 @@ files:
 - lib/generators/ocean_setup/ocean_setup_generator.rb
 - lib/generators/ocean_setup/templates/Gemfile
 - lib/generators/ocean_setup/templates/application_controller.rb
-- lib/generators/ocean_setup/templates/aws.yml.example
-- lib/generators/ocean_setup/templates/config.yml.example
+- lib/generators/ocean_setup/templates/aws.yml
+- lib/generators/ocean_setup/templates/config.yml
 - lib/generators/ocean_setup/templates/default_cache_time.rb
 - lib/generators/ocean_setup/templates/gitignore
 - lib/generators/ocean_setup/templates/hyperlinks.rb

data/lib/generators/ocean_setup/templates/config.yml.example

@@ -1,54 +0,0 @@
-##########################################################################################
-# In order for the application to work, a file named config/config.yml must exist.
-# You can use this file as a template: simply copy it, rename it and tailor its
-# contents. All data in this file will be used to define constants in your application
-# namespace. Please note that both config.yml and config.yml.example must exist.
-#
-# Any constants declared here can be overridden by corresponding environment variables
-# starting with OVERRIDE_. Thus, BASE_DOMAIN can be overridden by the environment
-# variable OVERRIDE_BASE_DOMAIN, and so forth. The API_PASSWORD receives special
-# treatment: you can pass both the master and the staging password separated by a comma,
-# and Ocean will choose the appropriate one to use depending on the Ocean environment.
-#
-# NB: The contents of this file will be replaced by an auto-generated file on AWS.
-##########################################################################################
-
-
-# This is the application's name
-APP_NAME:     <%= name %>
-
-# Authentication data to use when the app authenticates with the Auth service.
-# You should substitute your own password. Passwords should not be identical
-# between services. Use a unique password in each case.
-API_USER:     <%= name %>
-API_PASSWORD: xxxxxxxxxx
-
-# This is the base domain used for all Ocean calls.
-BASE_DOMAIN:  example.com
-
-# This enumerates the latest versions of all resources in the system, not just the
-# ones defined by this service. You should keep it updated at all times.
-# The special key _default is used as a fallback.
-API_VERSIONS:
-  _default: v1
-
-# The Ocean environment
-OCEAN_ENV: master
-
-
-##########################################################################################
-# This section allows you to specify values specific for a particular Rails
-# environment. Values defined here will take precedence over the default values.
-# Make sure the declarations in each section are indented properly.
-# NB: these overrides only affect your local development environment (which may run
-#     in any of these three states). In deployment, a generated version of this file
-#     is used.
-##########################################################################################
-
-development:
-
-
-test:
-
-
-production: