thredded_create_app 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec9303aa617905a4fd69c91b11bc536eb21cc15fcc3fd33352042f5c9cfba2b5
-  data.tar.gz: fdbc72c7b2f699ab230cbe8c948c49e35a40a2fc90d7a1ad2edac258831fcf11
+  metadata.gz: 26fbebb81a909743e9ce897066bfc23ec91e52b40f8c9fff72cdf219ad7a88a3
+  data.tar.gz: 2e37f8a9eb0573f40097c85d0e2c021e9d0ef01a0e8ee31d523f7849a93fb698
 SHA512:
-  metadata.gz: b8d789c432d1d1be4b7e6bd9d4504ae86a18b240f3c1db60c10f8b548c8a1097c752554f59a1570fd036fd8a09fac24cf69fb0e95b6703f494742c1672b33296
-  data.tar.gz: b55ef560baa372181b06ac28016edf68b8666579ec6d1215d5cd815f5a7880c4c6587a7770bd7efda4b95c45fbc2f0a592d912a3e5370ee803e4ff08bcd4926a
+  metadata.gz: 85fc625da0f81bc155d991f88150e87964ef2af53fa77fbb4cbcef4f2e5f48f7c319c8c99d928ce2171fc83d19d4d84d19e939599f1f2ebe669c0b4a1d1071eb
+  data.tar.gz: 34dd959490c9b24e529cb75b2d90b8c58b0949d506602c0eee0f796d725b7c67d55f151ba9ca05387565720bd612a01bc5c6a67a313daf8c1c52ceb99487e688

data/README.md

@@ -107,7 +107,7 @@ a lot of JavaScript libraries do not support it.
 
 A [Dockerfile] and [docker-compose.yml] is generated for development.
 This is so that other engineers can spin up a development environment with
-a single command.
+a single command (`docker-compose up`).
 
 A production configuration file for the [puma] Ruby web server is created.
 A `Procfile` process description file is also created. This file can be used by
@@ -121,7 +121,7 @@ Finally, the tests are run, and the development web server is started at
 <http://localhost:3000>. To start the server yourself afterwards with:
 
 ```bash
-bundle exec rails s
+bin/rails s
 ```
 
 [`async`]: https://developer.mozilla.org/en/docs/Web/HTML/Element/script

data/lib/thredded_create_app/cli.rb

@@ -67,9 +67,12 @@ module ThreddedCreateApp
 
     def start_app_server!(app_path)
       log_info 'Changing directory and starting the app server'
-      ENV['BUNDLE_GEMFILE'] = 'Gemfile'
-      run "cd #{Shellwords.escape(app_path)} && bundle exec rails s",
-          run_method: :exec
+      Dir.chdir app_path do
+        Bundler.with_original_env do
+          ENV['BUNDLE_GEMFILE'] = 'Gemfile'
+          run 'bin/rails', 's', run_method: :exec
+        end
+      end
     end
 
     # rubocop:disable Metrics/AbcSize,Metrics/BlockLength,Metrics/MethodLength

data/lib/thredded_create_app/tasks/add_thredded.rb

@@ -70,6 +70,7 @@ module ThreddedCreateApp
       def add_thredded_javascripts
         if webpack_js?
           run 'bundle exec rails webpacker:install:erb'
+          FileUtils.rm 'app/javascript/packs/hello_erb.js.erb'
           copy 'add_thredded/thredded_imports.js.erb',
                'app/javascript/thredded_imports.js.erb'
           append_to_file 'app/javascript/packs/application.js', <<~JS

data/lib/thredded_create_app/tasks/docker.rb

@@ -14,9 +14,13 @@ module ThreddedCreateApp
                       'Dockerfile'
         copy_template 'docker/docker-compose.yml.erb',
                       'docker-compose.yml'
+        copy 'docker/Procfile.docker.dev',
+             'Procfile.docker.dev'
+        copy 'docker/docker-dev-start-web.sh',
+             'script/docker-dev-start-web.sh'
         copy 'docker/wait-for-tcp',
              'script/wait-for-tcp'
-        run 'chmod +x script/wait-for-tcp'
+        run 'chmod +x script/wait-for-tcp script/docker-dev-start-web.sh'
         git_commit 'Add Docker compose for development'
       end
     end

data/lib/thredded_create_app/tasks/docker/Dockerfile.erb

@@ -1,22 +1,28 @@
 # A Dockerfile for development.
 
-FROM alpine:3.4
+FROM alpine:3.11
 
 RUN apk add --no-cache \
     # Runtime deps
-    ruby ruby-bundler ruby-bigdecimal ruby-io-console tzdata nodejs bash \
+    ruby ruby-bundler ruby-bigdecimal ruby-io-console ruby-json ruby-webrick tzdata nodejs yarn bash \
     # Bundle install deps
     build-base ruby-dev libc-dev linux-headers gmp-dev openssl-dev libxml2-dev \
     libxslt-dev postgresql-dev
 
+RUN gem install foreman
+
 ENV BUNDLE_SILENCE_ROOT_WARNING=1
+ENV BUNDLE_PATH=/bundle
+ENV DOCKER=1
 
 ENV APP_HOME /<%= app_name %>
 WORKDIR $APP_HOME
 RUN mkdir -p $APP_HOME
 
 # Copy Gemfile and run bundle install first to allow for caching
-ADD Gemfile Gemfile.lock $APP_HOME/
-RUN bundle install
+COPY Gemfile Gemfile.lock $APP_HOME/
+RUN bundle --path=$BUNDLE_PATH -j $(nproc)
 
-ADD Rakefile config.ru app/ bin/ config/ db/ lib/ script/ spec/ $APP_HOME/
+# Copy package.json and install dependencies (done here to allow for caching)
+COPY package.json yarn.lock $APP_HOME/
+RUN yarn

data/lib/thredded_create_app/tasks/docker/Procfile.docker.dev

@@ -0,0 +1,2 @@
+web: bin/rails server --port 9292 --binding 0.0.0.0
+webpack-dev-server: bin/webpack-dev-server

data/lib/thredded_create_app/tasks/docker/docker-compose.yml.erb

@@ -1,22 +1,49 @@
-db:
-  image: onjin/alpine-postgres:9.5
-  ports:
-    - "5433:5432"
-  environment:
-    POSTGRES_USER: root
-web:
-  build: .
-  volumes:
-    - .:/<%= app_name %>
-  working_dir: /<%= app_name %>
-  environment:
-    DB: postgresql
-    DB_USERNAME: root
-    DB_PASSWORD:
-  command: >
-    bash -c 'script/wait-for-tcp $<%= app_name.upcase %>_DB_1_PORT_5432_TCP_ADDR $<%= app_name.upcase %>_DB_1_PORT_5432_TCP_PORT &&
-             rails s'
-  ports:
-    - "9292:9292"
-  links:
-    - db
+version: "3.6"
+networks:
+  frontend:
+  backend:
+services:
+  db:
+    image: postgres:12-alpine
+    expose:
+      - "5432"
+    environment:
+      POSTGRES_USER: root
+      POSTGRES_PASSWORD: db-password
+    networks:
+      - backend
+  web:
+    build: .
+    # We want to avoid mapping Gemfile.lock, yarn.lock, etc but there is no way to exclude
+    # files using `volumes`.
+    volumes:
+    - ./.rspec:/<%= app_name %>/.rspec
+    - ./Procfile.docker.dev:/<%= app_name %>/Procfile.docker.dev
+    - ./Rakefile:/<%= app_name %>/Rakefile
+    - ./config.ru:/<%= app_name %>/config.ru
+    - ./app:/<%= app_name %>/app
+    - ./bin:/<%= app_name %>/bin
+    - ./config:/<%= app_name %>/config
+    - ./db:/<%= app_name %>/db
+    - ./lib:/<%= app_name %>/lib
+    - ./script:/<%= app_name %>/script
+    - ./vendor:/<%= app_name %>/vendor
+    - ./spec:/<%= app_name %>/spec
+    working_dir: /<%= app_name %>
+    environment:
+      DB: postgresql
+      DB_HOST: db
+      DB_PORT: 5432
+      DB_USERNAME: root
+      DB_PASSWORD: db-password
+      BUNDLE_GEMFILE: /<%= app_name %>/Gemfile
+      WEBPACKER_DEV_SERVER_HOST: 0.0.0.0
+    command: script/docker-dev-start-web.sh
+    networks:
+      - backend
+      - frontend
+    ports:
+      - "9292:9292"
+      - "3035:3035"
+    depends_on:
+      - db

data/lib/thredded_create_app/tasks/docker/docker-dev-start-web.sh

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+set -xeuo pipefail
+
+script/wait-for-tcp db 5432
+
+if ! [[ -f .db-created ]]; then
+  bin/rails db:drop db:create
+  touch .db-created
+fi
+
+bin/rails db:migrate
+
+if ! [[ -f .db-seeded ]]; then
+  bin/rails db:seed
+  touch .db-seeded
+fi
+
+foreman start -f Procfile.docker.dev

data/lib/thredded_create_app/tasks/setup_app_skeleton.rb

@@ -78,6 +78,12 @@ module ThreddedCreateApp
           copy "setup_app_skeleton/javascript_webpack/app/#{file}.js",
                "app/javascript/app/#{file}.js"
         end
+        append_to_file 'config/initializers/content_security_policy.rb', <<~RUBY
+          Rails.application.config.content_security_policy do |policy|
+            # Allow connections to bin/webpack-dev-server in development
+            policy.connect_src :self, :https, 'http://localhost:3035', 'ws://localhost:3035' if Rails.env.development?
+          end
+        RUBY
         git_commit 'Add app JavaScript'
       end
 
@@ -217,7 +223,8 @@ module ThreddedCreateApp
 
       def add_user_page
         run_generator 'controller users show' \
-                      ' --no-assets --no-helper --skip-routes'
+                      ' --no-assets --no-helper --skip-routes' \
+                      ' --no-test-framework'
         copy 'setup_app_skeleton/spec/controllers/users_controller_spec.rb',
              'spec/controllers/users_controller_spec.rb'
         copy 'setup_app_skeleton/users_show.html.erb',
@@ -237,7 +244,8 @@ module ThreddedCreateApp
 
       def add_home_page
         run_generator 'controller home show' \
-                      ' --no-assets --no-helper --skip-routes'
+                      ' --no-assets --no-helper --skip-routes' \
+                      ' --no-test-framework'
         add_route <<~'RUBY', prepend: true
           root to: 'home#show'
         RUBY

data/lib/thredded_create_app/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ThreddedCreateApp
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thredded_create_app
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Gleb Mazovetskiy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-05 00:00:00.000000000 Z
+date: 2020-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -143,7 +143,9 @@ files:
 - lib/thredded_create_app/tasks/create_rails_app.rb
 - lib/thredded_create_app/tasks/docker.rb
 - lib/thredded_create_app/tasks/docker/Dockerfile.erb
+- lib/thredded_create_app/tasks/docker/Procfile.docker.dev
 - lib/thredded_create_app/tasks/docker/docker-compose.yml.erb
+- lib/thredded_create_app/tasks/docker/docker-dev-start-web.sh
 - lib/thredded_create_app/tasks/docker/wait-for-tcp
 - lib/thredded_create_app/tasks/production_configs.rb
 - lib/thredded_create_app/tasks/production_configs/Procfile