railman 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ad53e4de95bb9ed21f9b56e29ace540fee80e01
-  data.tar.gz: 5498e4f2b9f2641e2e3b63d2814e54eaa6777142
+  metadata.gz: cf99b72362996a494129c8feca23e009e1e13394
+  data.tar.gz: 26fc41bb5d5438fc5182ee9f7b642eabb720c743
 SHA512:
-  metadata.gz: 707029743cf3e7577e453d4ef907cbf2476028d48d5b52532cd087be4532341b8c0a340fac003a14a33f720ada43a0dd8f760d7a19d4663d85b3cf4faa07e606
-  data.tar.gz: 2151fe1ac07acfcf695d4ab8a5bcfea5918b7eb24b72f696d7f4479654e986c4d00d2e98894ea1f0793740d50621ecfc7c45837a0bf3968194c2bfa67cf2649f
+  metadata.gz: 11a4676a4e52562ea77e37a925f545e40bd63b06ec383495da926379c6d55782cb80ac968f43341ea340d3b8b0161efbe1edf86b4e399c0400b5831b2f1d23c4
+  data.tar.gz: 6da0be1cadb3b59b28fe36bc5bddc2cfd0e1d0c03768fa10a06aba4eece536c87308fa265691be6ad223e467615d8bde39e015fc34b394a2c9916317f7293c00

data/lib/railman/version.rb

@@ -1,3 +1,3 @@
 module Railman
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end

data/railman.gemspec

@@ -19,10 +19,8 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest", "~> 5.8"
   spec.add_development_dependency "minitest-reporters", "~> 1.1"
   spec.add_development_dependency "gem-release", "~> 0.7"
-  spec.add_development_dependency "geminabox", "~> 0.13"
   spec.add_development_dependency "coveralls"
 
   spec.add_dependency "thor", "~> 0.19"

data/templates/rails_app/.babelrc

@@ -0,0 +1,5 @@
+{
+  "presets": [
+    ["env", { "modules": false } ]
+  ]
+}

data/templates/rails_app/.gitignore

@@ -2,8 +2,9 @@
 .idea
 .bundle
 log/*
+tmp/*
 !/log/.keep
-tmp
+!/tmp/.keep
 .env
 
 coverage
@@ -13,6 +14,11 @@ test/screenshots
 
 .sass-cache
 public/assets
+public/packs
 refile_uploads
 
-brakeman-output.tabs
+/node_modules
+/yarn-error.log
+
+brakeman-output.tabs
+.byebug_history

data/templates/rails_app/.postcssrc.yml

@@ -0,0 +1,4 @@
+plugins:
+  postcss-smart-import: {}
+  precss: {}
+  autoprefixer: {}

data/templates/rails_app/Gemfile

@@ -6,23 +6,26 @@ git_source(:github) do |repo_name|
   "https://github.com/#{repo_name}.git"
 end
 
-gem 'dotenv-rails', '2.1.1', require: 'dotenv/rails-now' # load ENV from .env
+gem 'dotenv-rails', '2.2.1', require: 'dotenv/rails-now' # load ENV from .env
 
-gem 'rails', '~> 5.1.0.beta1'
+gem 'rails', '~> 5.1.0'
 gem 'pg', '0.18.2'
 
-gem 'semantic-rails-ui'   # semantic-ui + simple_form + rails helpers
+gem 'railman-ui'   # bulma css framework + rails helpers
 
-gem 'webpacker', '1.0.0'
+gem 'webpacker', '1.2'
+
+# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
+# gem 'turbolinks', '~> 5'
 
 gem 'hiredis', '0.6.1'
 gem 'redis', '3.3.1', require: %w(redis redis/connection/hiredis)
+gem 'redis-namespace', '1.5.2'    # share same redis instance for multiple applications
 gem 'redis-rails', '5.0.1'
 
 gem 'sidekiq', '4.1.1'    # backgroud jobs
 gem 'sidekiq-scheduler', '2.0.6'  # scheduled background jobs
-gem 'redis-namespace', '1.5.2'    # share same redis instance for multiple applications
-gem 'sinatra', '2.0.0.beta2', :require => false    # for sidekiq-web
+gem 'sinatra', '2.0.0', :require => false    # for sidekiq-web
 
 gem 'puma', '~> 3.7'
 
@@ -30,15 +33,14 @@ gem 'railman-deployment', '~> 0.2'   # capistrano deployment
 
 gem 'exception_notification', '4.2.1' # exception notification per email
 
-gem 'lograge', '~> 0.4.1'  # one-line-per-request log messages
+gem 'lograge', '~> 0.5.0'  # one-line-per-request log messages
 
 group :development do
   gem 'better_errors'   # better error pages in development
   gem 'binding_of_caller'   # repl on the error page
+  # Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
+  gem 'web-console', '>= 3.3.0'
   gem 'listen', '>= 3.0.5', '< 3.2'
-  # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
-  gem 'spring'
-  gem 'spring-watcher-listen', '~> 2.0.0'
   gem 'annotate', '~> 2.7.1'   # add comments to models with db column information
   gem 'letter_opener', '1.4.1'    # for email tests in development
   # gem 'rack-mini-profiler'
@@ -49,9 +51,9 @@ group :test do
   gem 'minitest-reporters', '1.1.7'   # generate xml for jenkins
   gem 'simplecov', require: false     # generate coverage reports
   gem 'simplecov-rcov', '0.2.3', require: false   # generate coverage reports for jenkins
-  gem 'capybara', '2.12.1'   # dsl for browser tests
-  gem 'selenium-webdriver', '3.2.2'      # use real browser for webtests
-  gem 'poltergeist', '1.8.1'      # headless tests with phantom.js
+  gem 'capybara', '2.14.0'   # dsl for browser tests
+  gem 'selenium-webdriver', '3.4.0'      # use real browser for webtests
+  gem 'poltergeist', '1.15.0'      # headless tests with phantom.js
 end
 
 # put additional application-specific gems to Gemfile.local

data/templates/rails_app/Rakefile

@@ -1,6 +1,6 @@
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
-require File.expand_path('../config/application', __FILE__)
+require_relative 'config/application'
 
 Rails.application.load_tasks

data/templates/rails_app/app/assets/javascripts/application.js

@@ -10,5 +10,5 @@
 // Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
 // about supported directives.
 //
-//= require semantic-rails-ui
+//= require railman-ui
 //= require_tree .

data/templates/rails_app/app/assets/stylesheets/application.sass

@@ -1,2 +1,2 @@
-@import "semantic-rails-ui"
+@import "railman-ui"
 @import "main"

data/templates/rails_app/app/assets/stylesheets/main.sass

@@ -1,5 +1,10 @@
+$body-background: #fbf6ef
+$primary: #009DD1
+
 body
-  background-color: #f7f0e9
+  font-size: 15px
+  min-height: 100vh
 
 #content
-  margin: 2em
+  margin: 2em auto 2em auto
+  padding: 0 1em

data/templates/rails_app/app/javascript/packs/app.vue

@@ -0,0 +1,22 @@
+<template>
+  <div id="app">
+    <p>{{ message }}</p>
+  </div>
+</template>
+
+<script>
+export default {
+  data: function () {
+    return {
+      message: "Hello Vue!"
+    }
+  }
+}
+</script>
+
+<style scoped>
+p {
+  font-size: 2em;
+  text-align: center;
+}
+</style>

data/templates/rails_app/app/javascript/packs/application.js

@@ -1,3 +1,4 @@
+/* eslint no-console:0 */
 // This file is automatically compiled by Webpack, along with any other files
 // present in this directory. You're encouraged to place your actual application logic in
 // a relevant structure within app/javascript and only use these pack files to reference
@@ -6,12 +7,4 @@
 // To reference this file, add <%= javascript_pack_tag 'application' %> to the appropriate
 // layout file, like app/views/layouts/application.html.erb
 
-import Vue from 'vue'
-import Hello from './hello.vue'
-
-new Vue({
-  el: '#app',
-  template: '<Hello/>',
-  components: { Hello }
-});
-
+console.log('Hello World from Webpacker')

data/templates/rails_app/app/javascript/packs/hello_vue.js

@@ -0,0 +1,19 @@
+/* eslint no-console: 0 */
+// Run this example by adding <%= javascript_pack_tag 'hello_vue' %>
+// to the head of your layout file,
+// like app/views/layouts/application.html.erb.
+// All it does is render <div>Hello Vue</div> at the bottom of the page.
+
+import Vue from 'vue/dist/vue.esm'
+import App from './app.vue'
+
+document.addEventListener('DOMContentLoaded', () => {
+  document.body.appendChild(document.createElement('hello'))
+  const app = new Vue({
+    el: 'hello',
+    template: '<App/>',
+    components: { App }
+  })
+
+  console.log(app)
+})

data/templates/rails_app/bin/rails

@@ -1,9 +1,4 @@
 #!/usr/bin/env ruby
-begin
-  load File.expand_path('../spring', __FILE__)
-rescue LoadError => e
-  raise unless e.message.include?('spring')
-end
 APP_PATH = File.expand_path('../config/application', __dir__)
 require_relative '../config/boot'
 require 'rails/commands'

data/templates/rails_app/bin/rake

@@ -1,9 +1,4 @@
 #!/usr/bin/env ruby
-begin
-  load File.expand_path('../spring', __FILE__)
-rescue LoadError => e
-  raise unless e.message.include?('spring')
-end
 require_relative '../config/boot'
 require 'rake'
 Rake.application.run

data/templates/rails_app/bin/webpack

@@ -1,19 +1,33 @@
 #!/usr/bin/env ruby
-require 'shellwords'
+$stdout.sync = true
 
-ENV['RAILS_ENV'] ||= 'development'
-RAILS_ENV   = ENV['RAILS_ENV']
+require "shellwords"
+require "yaml"
 
-ENV['NODE_ENV'] ||= RAILS_ENV
-NODE_ENV    = ENV['NODE_ENV']
+ENV["RAILS_ENV"] ||= "development"
+RAILS_ENV   = ENV["RAILS_ENV"]
 
-APP_PATH = File.expand_path('../', __dir__)
-ESCAPED_APP_PATH = APP_PATH.shellescape
+ENV["NODE_ENV"] ||= RAILS_ENV
+NODE_ENV    = ENV["NODE_ENV"]
 
-SET_NODE_PATH  = "NODE_PATH=#{ESCAPED_APP_PATH}/node_modules"
-WEBPACK_BIN    = "./node_modules/webpack/bin/webpack.js"
-WEBPACK_CONFIG = "#{ESCAPED_APP_PATH}/config/webpack/#{NODE_ENV}.js"
+APP_PATH               = File.expand_path("../", __dir__)
+CONFIG_PATH            = File.join(APP_PATH, "config/webpack/paths.yml")
+
+begin
+  paths            = YAML.load(File.read(CONFIG_PATH))[NODE_ENV]
+
+  NODE_MODULES_PATH   = File.join(APP_PATH.shellescape, paths["node_modules"])
+  WEBPACK_CONFIG_PATH = File.join(APP_PATH.shellescape, paths["config"])
+rescue Errno::ENOENT, NoMethodError
+  puts "Configuration not found in config/webpack/paths.yml"
+  puts "Please run bundle exec rails webpacker:install to install webpacker"
+  exit!
+end
+
+WEBPACK_BIN    = "#{NODE_MODULES_PATH}/.bin/webpack"
+WEBPACK_CONFIG = "#{WEBPACK_CONFIG_PATH}/#{NODE_ENV}.js"
 
 Dir.chdir(APP_PATH) do
-  exec "#{SET_NODE_PATH} #{WEBPACK_BIN} --config #{WEBPACK_CONFIG} #{ARGV.join(" ")}"
+  exec "NODE_PATH=#{NODE_MODULES_PATH} #{WEBPACK_BIN} --config #{WEBPACK_CONFIG}" \
+    " #{ARGV.join(" ")}"
 end

data/templates/rails_app/bin/webpack-dev-server

@@ -1,27 +1,33 @@
 #!/usr/bin/env ruby
-require 'shellwords'
+$stdout.sync = true
 
-ENV['RAILS_ENV'] ||= 'development'
-RAILS_ENV   = ENV['RAILS_ENV']
+require "shellwords"
+require "yaml"
 
-ENV['NODE_ENV'] ||= RAILS_ENV
-NODE_ENV    = ENV['NODE_ENV']
+ENV["RAILS_ENV"] ||= "development"
+RAILS_ENV = ENV["RAILS_ENV"]
 
-APP_PATH = File.expand_path('../', __dir__)
-ESCAPED_APP_PATH = APP_PATH.shellescape
+ENV["NODE_ENV"] ||= RAILS_ENV
+NODE_ENV = ENV["NODE_ENV"]
 
-SET_NODE_PATH  = "NODE_PATH=#{ESCAPED_APP_PATH}/node_modules"
-WEBPACKER_BIN  = "./node_modules/.bin/webpack-dev-server"
-WEBPACK_CONFIG = "#{ESCAPED_APP_PATH}/config/webpack/#{NODE_ENV}.js"
+APP_PATH    = File.expand_path("../", __dir__)
+CONFIG_PATH = File.join(APP_PATH, "config/webpack/paths.yml")
 
-# Warn the user if the configuration is not set
-RAILS_ENV_CONFIG = File.join("config", "environments", "#{RAILS_ENV}.rb")
+begin
+  paths = YAML.load(File.read(CONFIG_PATH))[NODE_ENV]
 
-# Look into the environment file for a non-commented variable declaration
-unless File.foreach(File.join(APP_PATH, RAILS_ENV_CONFIG)).detect { |line| line.match(/^\s*[^#]*config\.x\.webpacker\[\:dev_server_host\].*=/) }
-  puts "Warning: if you want to use webpack-dev-server, you need to tell Webpacker to serve asset packs from it. Please set config.x.webpacker[:dev_server_host] in #{RAILS_ENV_CONFIG}.\n\n"
+  NODE_MODULES_PATH   = File.join(APP_PATH.shellescape, paths["node_modules"])
+  WEBPACK_CONFIG_PATH = File.join(APP_PATH.shellescape, paths["config"])
+
+  WEBPACK_BIN       = "#{NODE_MODULES_PATH}/.bin/webpack-dev-server"
+  DEV_SERVER_CONFIG = "#{WEBPACK_CONFIG_PATH}/development.server.js"
+rescue Errno::ENOENT, NoMethodError
+  puts "Configuration not found in config/webpacker/paths.yml."
+  puts "Please run bundle exec rails webpacker:install to install webpacker"
+  exit!
 end
 
 Dir.chdir(APP_PATH) do
-  exec "#{SET_NODE_PATH} #{WEBPACKER_BIN} --config #{WEBPACK_CONFIG} --content-base #{ESCAPED_APP_PATH}/public/packs #{ARGV.join(" ")}"
+  exec "NODE_PATH=#{NODE_MODULES_PATH} #{WEBPACK_BIN} --progress --color " \
+    "--config #{DEV_SERVER_CONFIG} #{ARGV.join(" ")}"
 end

data/templates/rails_app/bin/yarn

@@ -4,7 +4,8 @@ Dir.chdir(VENDOR_PATH) do
   begin
     exec "yarnpkg #{ARGV.join(" ")}"
   rescue Errno::ENOENT
-    puts "Yarn executable was not detected in the system."
-    puts "Download Yarn at https://yarnpkg.com/en/docs/install"
+    $stderr.puts "Yarn executable was not detected in the system."
+    $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install"
+    exit 1
   end
 end

data/templates/rails_app/config.ru

@@ -1,4 +1,4 @@
 # This file is used by Rack-based servers to start the application.
 
-require ::File.expand_path('../config/environment', __FILE__)
+require_relative 'config/environment'
 run Rails.application

data/templates/rails_app/config/application.rb.tt

@@ -8,6 +8,9 @@ Bundler.require(*Rails.groups)
 
 module <%= @config.class_name %>
   class Application < Rails::Application
+    # Initialize configuration defaults for originally generated Rails version.
+    config.load_defaults 5.1
+
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.

data/templates/rails_app/config/database.yml.tt

@@ -3,8 +3,8 @@ default: &default
   encoding: unicode
   host: localhost
   port: 5432
-  username: <%= ENV['DB_USER'] %>
-  password: <%= ENV['DB_PASSWORD'] %>
+  username: <%%= ENV['DB_USER'] %>
+  password: <%%= ENV['DB_PASSWORD'] %>
   pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
   timeout: 5000
 

data/templates/rails_app/config/environments/development.rb

@@ -1,7 +1,4 @@
 Rails.application.configure do
-  # Make javascript_pack_tag load assets from webpack-dev-server.
-  config.x.webpacker[:dev_server_host] = "http://localhost:8080"
-
   # Settings specified here will take precedence over those in config/application.rb.
 
   # In the development environment your application's code is reloaded on

data/templates/rails_app/config/environments/production.rb.tt

@@ -1,7 +1,4 @@
 Rails.application.configure do
-  # Make javascript_pack_tag lookup digest hash to enable long-term caching
-  config.x.webpacker[:digesting] = true
-
   # Settings specified here will take precedence over those in config/application.rb.
 
   # Code is not reloaded between requests.

data/templates/rails_app/config/{puma.rb → puma.rb.tt}

@@ -1,15 +1,14 @@
+APP_ROOT = File.expand_path('../..', __FILE__)
+
+require 'dotenv'
+Dotenv.load
+
 # Puma can serve each request in a thread from an internal thread pool.
 # The `threads` method setting takes two numbers: a minimum and maximum.
 # Any libraries that use thread pools should be configured to match
 # the maximum value specified for Puma. Default is set to 5 threads for minimum
 # and maximum; this matches the default thread size of Active Record.
 #
-
-APP_ROOT = File.expand_path('../..', __FILE__)
-
-require 'dotenv'
-Dotenv.load
-
 threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }
 threads threads_count, threads_count
 

data/templates/rails_app/config/webpack/configuration.js

@@ -0,0 +1,26 @@
+// Common configuration for webpacker loaded from config/webpack/paths.yml
+
+const { join, resolve } = require('path')
+const { env } = require('process')
+const { safeLoad } = require('js-yaml')
+const { readFileSync } = require('fs')
+
+const configPath = resolve('config', 'webpack')
+const loadersDir = join(__dirname, 'loaders')
+const paths = safeLoad(readFileSync(join(configPath, 'paths.yml'), 'utf8'))[env.NODE_ENV]
+const devServer = safeLoad(readFileSync(join(configPath, 'development.server.yml'), 'utf8'))[env.NODE_ENV]
+
+// Compute public path based on environment and ASSET_HOST in production
+const ifHasCDN = env.ASSET_HOST !== undefined && env.NODE_ENV === 'production'
+const devServerUrl = `http://${devServer.host}:${devServer.port}/${paths.entry}/`
+const publicUrl = ifHasCDN ? `${env.ASSET_HOST}/${paths.entry}/` : `/${paths.entry}/`
+const publicPath = env.NODE_ENV !== 'production' ? devServerUrl : publicUrl
+
+module.exports = {
+  devServer,
+  env,
+  paths,
+  loadersDir,
+  publicUrl,
+  publicPath
+}