ocean-rails 7.3.0 → 7.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65fb8fb628f0daa342b47ba75447cada3b97d1b583feac3c2b1ce6c88e48ceb6
-  data.tar.gz: b7e3d250c457b1b71b1e867a77da6401df1c5be8e41f6ef61b2620024a6a6ca4
+  metadata.gz: 7ee546b0b0c2b9c6a04425b1ac672389b82fd08fcf55a667b677864513ed514f
+  data.tar.gz: ae8d95eaccc0f63a052b1805e84563677f22bf47614e595a48b3f03b6f68351b
 SHA512:
-  metadata.gz: a3cccb9f2f64465228356ee2cb1aa9e683949186581a6a6a83efc755177637a88c9c177948b8e5ec906bc863aaf3994f8f82e393cad51c433b7ebf18e6758b41
-  data.tar.gz: 3b050247ae9c3c20b8808329ce3a75adb2747e31b5e96b3ec2503fa3758b9c48d662839ccffe4f7451a47fd2aff67e3c6f726385670c1bcf058ccd632e22750f
+  metadata.gz: e6a34a0c53ae708c5c383d8c8467fc018f822f2076fea6d2f2740533ed7e9b5c6b5aa60cfb149b6ac829ff1131279e69b3bf1555ad2036c3f28b31db24ca00ca
+  data.tar.gz: 37ea558d5140a78c66e9adabda5a52537874ee43289765e606afe76eb7a62fb96190c4090cce35630f7dc4746208352efa2d6ff2b669167823dfd0a99daa0ecd

data/lib/generators/ocean_setup/ocean_setup_generator.rb

@@ -9,7 +9,6 @@ class OceanSetupGenerator < Rails::Generators::NamedBase #:nodoc: all
     remove_file "#{Rails.root}/config/locales"
     remove_file "#{Rails.root}/public"
     remove_file "#{Rails.root}/config/initializers/session_store.rb"
-    #remove_file "#{Rails.root}/config/initializers/secret_token.rb"
     remove_file "#{Rails.root}/test"
     remove_file "#{Rails.root}/vendor/assets"
     remove_file "#{Rails.root}/vendor/plugins"
@@ -75,6 +74,16 @@ class OceanSetupGenerator < Rails::Generators::NamedBase #:nodoc: all
     "
   end
 
+  def setup_console_logging
+    application "# We want to set up a custom logger which logs to STDOUT.
+    # Docker expects your application to log to STDOUT/STDERR and to be run
+    # in the foreground.
+    config.log_level = ENV.fetch('LOG_LEVEL', :debug)
+    config.log_tags  = [:uuid]
+    config.logger    = ActiveSupport::TaggedLogging.new(Logger.new(STDOUT))
+    "
+  end
+
   def install_config_yml_files
     copy_file "config.yml", "#{Rails.root}/config/config.yml"
   end
@@ -102,12 +111,12 @@ class OceanSetupGenerator < Rails::Generators::NamedBase #:nodoc: all
   end
 
   def setup_docker
-    copy_file "Dockerfile", "#{Rails.root}/Dockerfile"
+    template "Dockerfile", "#{Rails.root}/Dockerfile"
     copy_file "dockerignore", "#{Rails.root}/.dockerignore"
   end
 
   def setup_dotenv_file
-    copy_file "env", "#{Rails.root}.env"
+    template "env", "#{Rails.root}.env"
   end
 
 end

data/lib/generators/ocean_setup/templates/Dockerfile

@@ -1,5 +1,7 @@
 FROM ruby:2.5.1-alpine
-MAINTAINER peter@peterbengtson.com
+LABEL net.oceanframework.project="ocean" \
+      net.oceanframework.service="<%= class_name.underscore %>" \
+      maintainer="yourname@youremail.com"
 
 # Set locale
 ENV LANG=en_US.UTF-8 \

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

@@ -23,7 +23,3 @@ API_VERSIONS: <%= ENV['API_VERSIONS'] %>
 
 # This is the list of IP numbers for the Varnish instances. (For PURGE and BAN.)
 VARNISH_CACHES: <%= ENV['VARNISH_CACHES'] %>
-
-# The password regex and error message
-PASSWORD_REGEXP: <%= ENV['PASSWORD_REGEXP'] %>
-PASSWORD_MSG: <%= ENV['PASSWORD_MSG'] %>

data/lib/generators/ocean_setup/templates/env

@@ -1,7 +1,7 @@
 # config.yml
 OCEAN_ENV=dev
-APP_NAME=yourappname
-API_USER=yourappname
+APP_NAME=<%= class_name.underscore %>
+API_USER=<%= class_name.underscore %>
 API_PASSWORD=xxxxxxxxxx
 BASE_DOMAIN=example.com
 OCEAN_API_HOST=dev-api.example.com
@@ -9,8 +9,6 @@ OCEAN_API_URL=http://dev-api.example.com
 INTERNAL_OCEAN_API_URL=http://dev-api.example.com
 API_VERSIONS={"_default":"v1"}
 VARNISH_CACHES=[]
-PASSWORD_REGEXP="\A[A-zA-z0-9_!\?*%&/-]{6,}\z"
-PASSWORD_MSG="should be at least 6 characters long and contain only the characters A-Z, a-z, 0-9, and _!?/*%&-"
 
 # DB and AWS services
 RAILS_MAX_THREADS=5
@@ -19,7 +17,7 @@ SQL_DB_ADAPTER=mysql2
 SQL_CONNECTION_POOL_SIZE=20
 SQL_HOST=docker.for.mac.localhost
 SQL_PORT=3306
-SQL_DATABASE=auth
+SQL_DATABASE=<%= class_name.underscore %>
 SQL_USERNAME=root
 SQL_PASSWORD=thepassword
 AWS_REGION=eu-west-1

data/lib/generators/ocean_setup/templates/puma.rb

@@ -1,5 +1,5 @@
 workers Integer(ENV['WEB_CONCURRENCY'] || 2)
-threads_count = Integer(ENV['RAILS_MAX_THREADS'] || 5)
+threads_count = Integer(ENV['RAILS_MAX_THREADS'] || 10)
 threads threads_count, threads_count
 
 preload_app!

data/lib/ocean/api.rb

@@ -43,10 +43,10 @@ class Api
   def self.adorn_basename(basename, ocean_env: "dev", rails_env: "development",
                           suffix_only: false)
     fullname = suffix_only ? "_#{ocean_env}" : "#{basename}_#{ocean_env}"
-    if rails_env != 'production' || ocean_env == 'dev' || ocean_env == 'ci'
-      local_ip = UDPSocket.open {|s| s.connect("64.233.187.99", 1); s.addr.last}.gsub('.', '-')
-      fullname += "_#{local_ip}_#{rails_env}"
-    end
+    # if rails_env != 'production' || ocean_env == 'dev' || ocean_env == 'ci'
+    #   local_ip = UDPSocket.open {|s| s.connect("64.233.187.99", 1); s.addr.last}.gsub('.', '-')
+    #   fullname += "_#{local_ip}_#{rails_env}"
+    # end
     fullname
   end
 

data/lib/ocean/version.rb

@@ -1,3 +1,3 @@
 module Ocean
-  VERSION = "7.3.0"
+  VERSION = "7.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ocean-rails
 version: !ruby/object:Gem::Version
-  version: 7.3.0
+  version: 7.4.0
 platform: ruby
 authors:
 - Peter Bengtson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-24 00:00:00.000000000 Z
+date: 2018-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus