revelry_generate 0.3.10 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd657d121d5a51ec217bbbc3e909cba65df1c98f
-  data.tar.gz: fb8ce5f5c39820e78a6865830e4b78729aaddc3a
+  metadata.gz: 2e7ec78de327d2790ab466f0e9e5b6dfac291e8a
+  data.tar.gz: e2fc39215f318072c55eff3006d01d414578e64e
 SHA512:
-  metadata.gz: c841ea1129b5df7ad06279193093e9f0f7130e8a96f3649b147b42756e3f178414631fc75c495e8be2e64c3d7d9a4eb60caa2870654dcc889863c9c651e3c914
-  data.tar.gz: be9e97396ea28d57986df876995139063568954f3a1abc5baab066ceb1004299ab5a627ad44869de49e88173ab5c33a1c27f6a1199097a33c43c90763732302a
+  metadata.gz: 3e534677cbfa766d2d8dca769b8cf27d73ae816802e11fe7bbeecbc3b9c988fd1a2f7f909b533a3543ba75c60ada4dfb42cf42184f01aa02953752e6c1b3373c
+  data.tar.gz: c07de3837f37699eb8203338f7c4a4fb6f642a3dd027cd1d69e77983d05422e78163e93e5ece107e5436df0320e53b1e15dbc01add79c0706b247a42fd7b664d

data/README.md

@@ -6,7 +6,7 @@ Revelry 2016 Name TBD stack.
 ## Using
 
 ```
-rails new app_name -m template.rb
+rails new app_name -m template.rb -T -d postgresql
 ```
 
 or
@@ -18,27 +18,18 @@ bin/rake rails:template LOCATION=template.rb
 This will generate an app using the default skeleton. The skeleton will give you
 further instructions from there.
 
-## node-base (default) skeleton
+## slush (default) skeleton
 
-This provides a minimal skeleton for rails with rails-render-service and the
+This provides a skeleton for rails with rails_render_service and the
 revelry framework. After creating a new app with the template (see above), you
 can:
 
-### Start the rails server
+### Start the servers
 
 ```
-rails s
+npm run dev
 ```
 
-### Start the development render server
-
-```
-npm run devserver
-```
-
-(this will run the render server in node, and rebuild client & server-side JS
-and scss)
-
 ### Scaffold a new resource
 
 Just do:

data/lib/rails/generators/revelry_generate/skeleton_generator.rb

@@ -44,7 +44,7 @@ module RevelryGenerate
       end
 
       def try_after_hook
-        hook_path = File.join(gem_root, 'skeletons', 'node-base', '__generators__', 'post_skeleton.rb')
+        hook_path = File.join(gem_root, 'skeletons', ENV['SKELETON'] || 'slush', '__generators__', 'post_skeleton.rb')
 
         return unless File.exist? hook_path
         puts "rake rails:template LOCATION=#{hook_path}"

data/lib/revelry_generate.rb

@@ -1,5 +1,4 @@
 require 'rails'
-require_relative './rails/generators/react_scaffold/react_scaffold_generator'
 require_relative './rails/generators/jbuilder_props/jbuilder_props_generator'
 
 module RevelryGenerate

data/scripts/skeleton.js

@@ -6,7 +6,7 @@ var inquirer = require('inquirer');
 var spawnSync = require('child_process').spawn;
 
 
-var skeletonPath = Path.resolve(__dirname, '../skeletons/node-base');
+var skeletonPath = Path.resolve(__dirname, '../skeletons/' + (process.env.SKELETON || 'slush'));
 
 console.log(__dirname);
 var needsConfirmationItems = [];

data/skeletons/slush/Procfile

@@ -0,0 +1 @@
+web: npm start

data/skeletons/slush/__generators__/post_skeleton.rb

@@ -0,0 +1,181 @@
+# Set the latest installed node version in nodenv as the version
+node_version = `nodenv versions`.split.last
+
+# Bootstrap a render server node app
+x = system(
+  <<-SH
+    nodenv local #{node_version} &&
+    npm install -g slush revelrylabs/slush-revelry &&
+    npm install &&
+    slush &&
+    slush revelry:new render-server &&
+    cd render-server &&
+    npm install &&
+    npm install --save morgan &&
+    cd -
+  SH
+) || fail('slush template installation failed')
+
+# Link the build directory of webpack to public (so we can serve the assets through Rails)
+system('ln -s ../render-server/dist/public/css public/css')
+system('ln -s ../render-server/dist/public/js public/js')
+system('ln -s ../render-server/dist/public/fonts public/fonts')
+
+# Set up a suitable gitignore for the render server directory
+system('curl https://raw.githubusercontent.com/github/gitignore/master/Global/macOS.gitignore >> render-server/.gitignore')
+system('curl https://raw.githubusercontent.com/github/gitignore/master/Node.gitignore > render-server/.gitignore')
+
+# Add the build directory
+append_to_file 'render-server/.gitignore', <<-GITIGNORE
+
+dist/
+GITIGNORE
+
+# Also add Node stuff to the root .gitignore since we have node_modules that live off of the rails root too (for scripts)
+system('curl https://raw.githubusercontent.com/github/gitignore/master/Node.gitignore >> .gitignore')
+system('curl https://raw.githubusercontent.com/github/gitignore/master/Global/macOS.gitignore >> .gitignore')
+
+# Amend the generated server.js to be compatible with rails_render_service
+create_file 'render-server/src/js/server.js', <<-JS
+import http from 'http'
+import express from 'express'
+import fs from 'fs'
+import bodyParser from 'body-parser'
+import cors from 'cors'
+import {renderJson, renderHtml} from 'setup/renderServer'
+import router from 'setup/router'
+import renderServiceRouter from 'setup/renderServiceRouter'
+import {NODE_ENV, PORT} from 'config/server'
+
+import morgan from 'morgan'
+
+const app = express()
+
+// Express configuration and middlewares
+if (NODE_ENV !== 'production') {
+  app.use(cors())
+}
+app.use(express.static('dist/public'))
+app.use(bodyParser.json())
+app.use(bodyParser.urlencoded({extended: true}))
+app.use(morgan('combined'))
+
+app.use(renderHtml)
+app.use('*', renderServiceRouter)
+
+// Turn it into an HTTP server
+const server = http.createServer(app)
+
+server.on('error', (e) => {
+  if (e.code == 'EADDRINUSE') {
+    fs.unlinkSync(PORT);
+    server.listen(PORT);
+  }
+})
+
+server.listen(PORT)
+// eslint-disable-next-line no-console
+console.log(`Server is listening on ${PORT}`)
+JS
+
+# Amend the generated renderServiceRouter.js to be compatible with rails_render_service
+create_file 'render-server/src/js/setup/renderServiceRouter.js', <<-JS
+import {Router} from 'express'
+import {get as getView} from './autoload/views'
+const router = new Router()
+
+router.post('*', (req, res) => {
+  const {name, data} = req.body
+
+  res.render(name, data || {})
+})
+
+router.get('*', (req, res) => {
+  const name = req.originalUrl.slice(1)
+  const data = req.body
+
+  try {
+    const _view = getView(name)
+    res.status(200).send('Ok')
+  } catch(e) {
+    if(e.toString().indexOf('Cannot find module')) {
+      res.status(404).send('Not found')
+    } else {
+      throw e;
+    }
+  }
+})
+
+export default router
+JS
+
+# Change the local asset prefix to work with static assets served out of rails
+create_file 'render-server/gulpfile.js', <<-JS
+const gulp = require('gulp')
+const createTasks = require('our-gulp')
+
+const isProd = process.env.NODE_ENV === 'production'
+
+const CDN_ASSET_PREFIX = ''
+const LOCAL_ASSET_PREFIX = ''
+
+const assetUrlPrefix = isProd ? CDN_ASSET_PREFIX : LOCAL_ASSET_PREFIX
+
+createTasks(gulp, {
+  assetUrlPrefix: assetUrlPrefix,
+  basePath: __dirname + '/',
+  sassIncludePaths: [
+    'src/css',
+    'node_modules/foundation-sites/scss',
+    'node_modules/revelry-components/scss',
+  ]
+})
+JS
+
+inject_into_file 'spec/rails_helper.rb', after: 'RSpec.configure do |config|' do
+  <<-'RUBY'
+
+    config.render_views
+
+    config.before(:suite) do
+      ENV['RENDER_SERVICE_SOCKET'] = 'tmp/testRender.sock'
+      `(cd render-server; npm run build)`
+      @pid = spawn('(cd render-server; npm run servetest)')
+      # Force us to not continue until render wakes up
+      RailsRenderService::Renderer.has_template 'foo'
+    end
+
+    config.after(:suite) do
+      Process.kill("TERM", @pid)
+    end
+  RUBY
+end
+
+inject_into_file 'render-server/package.json', after: '"scripts": {' do
+  <<-'JSON'
+
+    "postinstall": "(cd render-server; npm install && npm run build)",
+  JSON
+end
+
+create_file 'README.md'
+append_to_file 'README.md', <<-MD
+## Starting render server
+
+To start the render server, do:
+
+```
+  npm run dev
+```
+
+## Deploy to Heroku
+
+Update this code block with the correct template url and then un-codify it. That'll
+make you a heroku button to deploy this app:
+
+```
+[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/heroku/node-js-sample)
+```
+MD
+
+system('cat README.md')

data/skeletons/slush/app.json

@@ -0,0 +1,48 @@
+{
+  "addons": [
+    {
+      "plan": "heroku-postgresql:hobby-basic"
+    },
+    {
+      "plan": "papertrail:choklad"
+    },
+    {
+      "plan": "rollbar:free"
+    },
+    {
+      "plan": "scheduler:standard"
+    }
+  ],
+  "buildpacks": [
+    {
+      "url": "heroku/nodejs"
+    },
+    {
+      "url": "heroku/ruby"
+    }
+  ],
+  "env": {
+    "DEVISE_SECRET_KEY": {
+      "generator": "secret"
+    },
+    "GITHUB_TOKEN": {
+      "required": true,
+      "value": "CHANGE ME"
+    },
+    "RAILS_ENV": {
+      "value": "production"
+    },
+    "RAILS_SERVE_STATIC_FILES": {
+      "value": "enabled"
+    },
+    "SECRET_KEY_BASE": {
+      "generator": "secret"
+    }
+  },
+  "formation": {
+    "web": {
+      "quantity": 1,
+      "size": "standard-1x"
+    }
+  }
+}

data/skeletons/slush/config/initializers/scaffold.rb

@@ -0,0 +1,17 @@
+require 'rails/generators'
+require 'rails/generators/erb/scaffold/scaffold_generator'
+
+module Rails
+  module Generators
+    class ReactScaffoldGenerator < Erb::Generators::ScaffoldGenerator
+       def copy_view_files
+        Dir.chdir('render-server') do
+          system "slush revelry:module #{controller_class_name.pluralize.dasherize.downcase}"
+        end
+      end
+
+      hook_for :form_builder, :as => :scaffold
+      hook_for :jbuilder_props, default: true
+    end
+  end
+end

data/skeletons/slush/package.json

@@ -0,0 +1,27 @@
+{
+  "name": "railsrenderexample",
+  "version": "1.0.0",
+  "description": "== README",
+  "main": "build/server.js",
+  "directories": {
+    "test": "test"
+  },
+  "scripts": {
+    "heroku-prebuild": "npm i heroku-private-modules && heroku-private-modules && (cd render-server && heroku-private-modules)",
+    "start": "NODE_ENV=$RAILS_ENV concurrently -p \"{command}\" -l 20 \"npm run rails\" \"npm run node\"",
+    "rails": "RENDER_SERVICE_SOCKET=./tmp/render.sock bundle exec puma -t 5:5 -p ${PORT:-3000} -e ${RACK_ENV:-development}",
+    "node": "(cd render-server; PORT=../tmp/render.sock node_modules/.bin/nodemon dist/server.js)",
+    "nodedev": "(cd render-server; PORT=../tmp/render.sock npm run dev)",
+    "dev": "NODE_ENV=$RAILS_ENV concurrently -p \"{command}\" -l 20 \"npm run rails\" \"npm run nodedev\""
+  },
+  "author": "",
+  "license": "UNLICENSED",
+  "devDependencies": {
+    "nodemon": "^1.9.1"
+  },
+  "dependencies": {
+    "concurrently": "^3.4.0",
+    "slush": "^1.1.1",
+    "slush-revelry": "github:revelrylabs/slush-revelry"
+  }
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: revelry_generate
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.4.0
 platform: ruby
 authors:
 - Robert Prehn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-27 00:00:00.000000000 Z
+date: 2017-03-24 00:00:00.000000000 Z
 dependencies: []
 description: ''
 email:
@@ -24,12 +24,6 @@ files:
 - lib/rails/generators/jbuilder_props/templates/index.json.jbuilder
 - lib/rails/generators/jbuilder_props/templates/new.json.jbuilder
 - lib/rails/generators/jbuilder_props/templates/show.json.jbuilder
-- lib/rails/generators/react_scaffold/react_scaffold_generator.rb
-- lib/rails/generators/react_scaffold/templates/edit.js.erb
-- lib/rails/generators/react_scaffold/templates/form.js.erb
-- lib/rails/generators/react_scaffold/templates/index.js.erb
-- lib/rails/generators/react_scaffold/templates/new.js.erb
-- lib/rails/generators/react_scaffold/templates/show.js.erb
 - lib/rails/generators/revelry_generate/skeleton_generator.rb
 - lib/revelry_generate.rb
 - package.json
@@ -41,6 +35,12 @@ files:
 - skeletons/node-base/__generators__/post_scaffold.js
 - skeletons/node-base/__generators__/post_skeleton.rb
 - skeletons/node-base/build/keep
+- skeletons/node-base/config/initializers/scaffold.rb
+- skeletons/node-base/config/initializers/templates/edit.js.erb
+- skeletons/node-base/config/initializers/templates/form.js.erb
+- skeletons/node-base/config/initializers/templates/index.js.erb
+- skeletons/node-base/config/initializers/templates/new.js.erb
+- skeletons/node-base/config/initializers/templates/show.js.erb
 - skeletons/node-base/package.json
 - skeletons/node-base/scripts/dev-server.sh
 - skeletons/node-base/scripts/js-builder.js
@@ -54,6 +54,11 @@ files:
 - skeletons/node-base/src/components/base.js
 - skeletons/node-base/src/server.js
 - skeletons/node-base/src/views.js
+- skeletons/slush/Procfile
+- skeletons/slush/__generators__/post_skeleton.rb
+- skeletons/slush/app.json
+- skeletons/slush/config/initializers/scaffold.rb
+- skeletons/slush/package.json
 homepage: https://github.com/revelrylabs/generate.git
 licenses:
 - MIT
@@ -74,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: ''