ocean-rails 7.2.5 → 7.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae94418c6ed9425568ee1da771c64cff6dc5dc25720c451e4d27b5d3bd446c91
-  data.tar.gz: 11b92197a8b0fc5cac8c825fc85ae51d73f216772ccd2abe51cccce98663143c
+  metadata.gz: 65fb8fb628f0daa342b47ba75447cada3b97d1b583feac3c2b1ce6c88e48ceb6
+  data.tar.gz: b7e3d250c457b1b71b1e867a77da6401df1c5be8e41f6ef61b2620024a6a6ca4
 SHA512:
-  metadata.gz: d93655a8e004101667ba7c02c608648ca3e07801a47b556e1459fc055c641e7a9acbee11d452dcade0f23ac3bec238d4460b77676f604c68d432dcae3425cec1
-  data.tar.gz: 29561210bd7dad8ebccc975613e341b2e5e3ef50dda1906521341a9d0dd180de130718c2353d6fc8ac4936da750a1265d9b975d84cb18839ef145dc67fcb6df6
+  metadata.gz: a3cccb9f2f64465228356ee2cb1aa9e683949186581a6a6a83efc755177637a88c9c177948b8e5ec906bc863aaf3994f8f82e393cad51c433b7ebf18e6758b41
+  data.tar.gz: 3b050247ae9c3c20b8808329ce3a75adb2747e31b5e96b3ec2503fa3758b9c48d662839ccffe4f7451a47fd2aff67e3c6f726385670c1bcf058ccd632e22750f

data/lib/generators/ocean_setup/ocean_setup_generator.rb

@@ -76,15 +76,19 @@ class OceanSetupGenerator < Rails::Generators::NamedBase #:nodoc: all
   end
 
   def install_config_yml_files
-    template  "config.yml", "#{Rails.root}/config/config.yml"
+    copy_file "config.yml", "#{Rails.root}/config/config.yml"
   end
 
   def install_aws_yml_files
-    template  "aws.yml", "#{Rails.root}/config/aws.yml"
+    copy_file "aws.yml", "#{Rails.root}/config/aws.yml"
+  end
+
+  def install_puma_config_file
+    copy_file "puma.rb", "#{Rails.root}/config/puma.rb"
   end
 
   def install_default_cache_time_file
-    template  "default_cache_time.rb", "#{Rails.root}/config/initializers/default_cache_time.rb"
+    copy_file "default_cache_time.rb", "#{Rails.root}/config/initializers/default_cache_time.rb"
   end
 
   def replace_gemfile
@@ -97,4 +101,13 @@ class OceanSetupGenerator < Rails::Generators::NamedBase #:nodoc: all
     git :init
   end
 
+  def setup_docker
+    copy_file "Dockerfile", "#{Rails.root}/Dockerfile"
+    copy_file "dockerignore", "#{Rails.root}/.dockerignore"
+  end
+
+  def setup_dotenv_file
+    copy_file "env", "#{Rails.root}.env"
+  end
+
 end

data/lib/generators/ocean_setup/templates/Dockerfile

@@ -0,0 +1,49 @@
+FROM ruby:2.5.1-alpine
+MAINTAINER peter@peterbengtson.com
+
+# Set locale
+ENV LANG=en_US.UTF-8 \
+    LANGUAGE=en_US.UTF-8 \
+    LC_CTYPE=en_US.UTF-8 \
+    LC_ALL=en_US.UTF-8
+
+# Update and upgrade
+RUN apk update && \
+    apk upgrade && \
+    apk add --no-cache --virtual .build-deps \
+            build-base && \
+    apk add --no-cache \
+            mysql-dev && \
+    apk add --no-cache \
+            socat \
+            tzdata \
+            curl \
+            findutils && \
+            ln -fs /usr/share/zoneinfo/GMT /etc/localtime && \
+            gem install bundler
+
+# Create the /srv directory to run the Rails app from
+RUN mkdir -p /srv
+WORKDIR /srv
+
+# Install gems
+COPY Gemfile Gemfile.lock ./
+RUN bundle install --jobs 25 --retry 5
+
+# Delete build dependencies
+RUN apk del .build-deps
+
+# Install the app, except for files excluded in .dockerignore
+COPY . ./
+
+# Create the tmp directory in the app
+RUN mkdir -p tmp
+
+# Expose the service port
+EXPOSE 80
+
+# Set the shell command line prefix
+ENTRYPOINT ["bundle", "exec"]
+
+# Start the web server
+CMD ['puma' '-C' 'config/puma.rb']

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

@@ -19,13 +19,10 @@ 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']) %>
+API_VERSIONS: <%= 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 "," %>
+VARNISH_CACHES: <%= ENV['VARNISH_CACHES'] %>
 
 # The password regex and error message
 PASSWORD_REGEXP: <%= ENV['PASSWORD_REGEXP'] %>

data/lib/generators/ocean_setup/templates/dockerignore

@@ -0,0 +1,9 @@
+.git
+.gitignore
+coverage
+.DS_Store
+/db/*.sqlite3
+/log/*.log
+/tmp
+*.log
+/.bundle

data/lib/generators/ocean_setup/templates/env

@@ -0,0 +1,26 @@
+# config.yml
+OCEAN_ENV=dev
+APP_NAME=yourappname
+API_USER=yourappname
+API_PASSWORD=xxxxxxxxxx
+BASE_DOMAIN=example.com
+OCEAN_API_HOST=dev-api.example.com
+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
+WEB_CONCURRENCY=2
+SQL_DB_ADAPTER=mysql2
+SQL_CONNECTION_POOL_SIZE=20
+SQL_HOST=docker.for.mac.localhost
+SQL_PORT=3306
+SQL_DATABASE=auth
+SQL_USERNAME=root
+SQL_PASSWORD=thepassword
+AWS_REGION=eu-west-1
+AWS_DYNAMODB_ENDPOINT=http://docker.for.mac.localhost:4569

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

@@ -0,0 +1,19 @@
+workers Integer(ENV['WEB_CONCURRENCY'] || 2)
+threads_count = Integer(ENV['RAILS_MAX_THREADS'] || 5)
+threads threads_count, threads_count
+
+preload_app!
+
+rackup      DefaultRackup
+port        ENV['PORT']     || 80
+environment ENV['RACK_ENV'] || 'development'
+
+stdout_redirect(stdout = '/dev/stdout',
+                stderr = '/dev/stderr',
+                append = true)
+
+on_worker_boot do
+  ActiveSupport.on_load(:active_record) do
+    ActiveRecord::Base.establish_connection
+  end
+end

data/lib/ocean/api.rb

@@ -325,7 +325,7 @@ class Api
   #
   def self.purge(*args)
     hydra = Typhoeus::Hydra.hydra
-    LOAD_BALANCERS.each do |host|
+    VARNISH_CACHES.each do |host|
       url = "http://#{host}#{path}"
       request = Typhoeus::Request.new(url, method: :purge, headers: {})
       hydra.queue request
@@ -341,7 +341,7 @@ class Api
   def self.ban(path)
     hydra = Typhoeus::Hydra.hydra
     escaped_path = escape(path)
-    LOAD_BALANCERS.each do |host|
+    VARNISH_CACHES.each do |host|
       url = "http://#{host}#{escaped_path}"
       request = Typhoeus::Request.new(url, method: :ban, headers: {})
       hydra.queue request

data/lib/ocean/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ocean-rails
 version: !ruby/object:Gem::Version
-  version: 7.2.5
+  version: 7.3.0
 platform: ruby
 authors:
 - Peter Bengtson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-23 00:00:00.000000000 Z
+date: 2018-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -222,13 +222,17 @@ files:
 - lib/generators/ocean_scaffold_dynamo/templates/views/_resource.json.jbuilder
 - lib/generators/ocean_setup/USAGE
 - lib/generators/ocean_setup/ocean_setup_generator.rb
+- lib/generators/ocean_setup/templates/Dockerfile
 - lib/generators/ocean_setup/templates/Gemfile
 - lib/generators/ocean_setup/templates/application_controller.rb
 - 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/dockerignore
+- lib/generators/ocean_setup/templates/env
 - lib/generators/ocean_setup/templates/gitignore
 - lib/generators/ocean_setup/templates/hyperlinks.rb
+- lib/generators/ocean_setup/templates/puma.rb
 - lib/generators/ocean_setup/templates/routes.rb
 - lib/generators/ocean_setup/templates/spec_helper.rb
 - lib/ocean-rails.rb