railman 0.6.20 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81b146fe0aebc04081fa6ba60ce66367cc6b081c
-  data.tar.gz: 82d2d9942202dc7c0d7d5a35f8f2f9d7982364bf
+  metadata.gz: 831f6c86324fa45701b49f8f59732166235d869f
+  data.tar.gz: b559cb8e524d8cbd40ae144dbb48087ed5ff2b3a
 SHA512:
-  metadata.gz: 2896ce282db3525998fdbe1a37bc286934c6691eac4e6f21b200e1c2e08fe8ddc9f3a2e24fea4f76dec032c695e35547582138ededc1fcc3b9f6dc2f3113b1d6
-  data.tar.gz: 1b16c8a133f7501d234d1369ba7b5f41f40c5bdc22c6a496e8f62272db9ff75b81f725d0f388ee3e16aeed46e2e86a4c53cddf693147d46720102c33d7043daa
+  metadata.gz: 57f9a7428a8d4f74e40d47b5857f39c2d515e5fd838d37b2bac5e596bd0029d1e98a9805a5d20b10d89821ec54476eabaaed718f31a379bd7a27782d7c2ff460
+  data.tar.gz: 2dcd5ce5f29c26575bacda37c5f9c47138c9cb9bca1d6cbbea7399be9b36507f199a8ff084bbc976f87f9c8f478766903f58f7a6413e654be7a81899fb51a014

data/.ruby-version

@@ -1 +1 @@
-2.3.0
+2.3.3

data/lib/railman/cli.rb

@@ -91,6 +91,13 @@ module Railman
         template "rails_app/.env.example.test.tt", "#{@config.app_name}/.env.example.test"
       else
         directory "rails_app", @config.app_name, exclude_pattern: /home_controller|index\.html\.erb/
+        # delete files that shouldn't exist in the new version
+        remove_file "#{@config.app_name}/config/unicorn.rb"
+        remove_file "#{@config.app_name}/bin/unicorn"
+        remove_file "#{@config.app_name}/bin/unicorn_rails"
+        remove_file "#{@config.app_name}/app/jobs/.keep"
+        remove_file "#{@config.app_name}/app/models/.keep"
+        remove_dir "#{@config.app_name}/vendor/assets"
       end
       save_config(@config)
       Dir.chdir @config.app_name do

data/lib/railman/version.rb

@@ -1,3 +1,3 @@
 module Railman
-  VERSION = '0.6.20'
+  VERSION = '1.0.0'
 end

data/templates/rails_app/.ruby-version

@@ -1 +1 @@
-2.1.5
+2.3.3

data/templates/rails_app/Gemfile

@@ -1,36 +1,45 @@
 source 'https://rubygems.org'
 source 'https://rails-assets.org'
 
+git_source(:github) do |repo_name|
+  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
+  "https://github.com/#{repo_name}.git"
+end
+
 gem 'dotenv-rails', '2.1.1', require: 'dotenv/rails-now' # load ENV from .env
 
-gem 'rails', '4.2.7.1'
+gem 'rails', '~> 5.1.0.beta1'
 gem 'pg', '0.18.2'
 
 gem 'semantic-rails-ui'   # semantic-ui + simple_form + rails helpers
 
+gem 'webpacker', github: 'rails/webpacker'
+
 gem 'hiredis', '0.6.1'
 gem 'redis', '3.3.1', require: %w(redis redis/connection/hiredis)
-gem 'redis-namespace', '1.5.2'
 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', '1.4.6', :require => false    # for sidekiq-web
+gem 'sinatra', '2.0.0.beta2', :require => false    # for sidekiq-web
 
-gem 'unicorn', '4.8.3'  # use unicorn as production server
-gem 'unicorn-rails', '1.1.0'  # use unicorn as local server
+gem 'puma', '~> 3.7'
 
 gem 'railman-deployment', '~> 0.2'   # capistrano deployment
 
-gem 'exception_notification', '4.1.2' # exception notification per email
+gem 'exception_notification', '4.2.1' # exception notification per email
 
 gem 'lograge', '~> 0.4.1'  # one-line-per-request log messages
 
 group :development do
-  gem 'annotate', '~> 2.7.1'   # add comments to models with db column information
   gem 'better_errors'   # better error pages in development
   gem 'binding_of_caller'   # repl on the error page
+  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'
   # gem 'flamegraph'    # mini-profiler flamegraph extension (?pp=flamegraph)
@@ -41,12 +50,11 @@ group :test do
   gem 'minitest-screenshot-reporter', '0.0.2'   # generate screenshots on capybara errors
   gem 'simplecov', require: false     # generate coverage reports
   gem 'simplecov-rcov', '0.2.3', require: false   # generate coverage reports for jenkins
-  gem 'capybara', '2.6.0'   # dsl for browser tests
+  gem 'capybara', '2.12.1'   # dsl for browser tests
   gem 'capybara_minitest_spec', '1.0.5'   # capybara rspec-style matchers (must_have...)
-  gem 'selenium-webdriver', '2.49.0'      # use real browser for webtests
+  gem 'selenium-webdriver', '3.2.2'      # use real browser for webtests
   gem 'poltergeist', '1.8.1'      # headless tests with phantom.js
   gem 'database_cleaner', '1.5.2'     # cleanup test database after every integration test
-  gem 'nokogiri', '1.6.8'  # todo problems installing 1.6.8.1 on mac
 end
 
 # put additional application-specific gems to Gemfile.local

data/templates/rails_app/README.md

@@ -1,4 +1,4 @@
-## README
+# README
 
 This README would normally document whatever steps are necessary to get the
 application up and running.
@@ -22,14 +22,3 @@ Things you may want to cover:
 * Deployment instructions
 
 * ...
-
-
-Please feel free to use a different markup language if you do not plan to run
-<tt>rake doc:app</tt>.
-
-
-## How-Tos
- 
-### Add executable to bin
- 
-bundle binstubs some-gem-name

data/templates/rails_app/app/assets/config/manifest.js

@@ -0,0 +1,3 @@
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css

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

@@ -0,0 +1,13 @@
+// Action Cable provides the framework to deal with WebSockets in Rails.
+// You can generate new channels where WebSocket features live using the `rails generate channel` command.
+//
+//= require action_cable
+//= require_self
+//= require_tree ./channels
+
+(function() {
+  this.App || (this.App = {});
+
+  App.cable = ActionCable.createConsumer();
+
+}).call(this);

data/templates/rails_app/app/channels/application_cable/channel.rb

@@ -0,0 +1,4 @@
+module ApplicationCable
+  class Channel < ActionCable::Channel::Base
+  end
+end

data/templates/rails_app/app/channels/application_cable/connection.rb

@@ -0,0 +1,4 @@
+module ApplicationCable
+  class Connection < ActionCable::Connection::Base
+  end
+end

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

@@ -0,0 +1,17 @@
+// 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
+// that code so it'll be compiled.
+//
+// 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 }
+});
+

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

@@ -0,0 +1,11 @@
+<template>
+  <div class="hello">
+    Hello Igor, hier is your Vue.js!
+  </div>
+</template>
+
+<style>
+  .hello {
+    border: 2px solid lightgray;
+  }
+</style>

data/templates/rails_app/app/jobs/application_job.rb

@@ -0,0 +1,2 @@
+class ApplicationJob < ActiveJob::Base
+end

data/templates/rails_app/app/models/application_record.rb

@@ -0,0 +1,3 @@
+class ApplicationRecord < ActiveRecord::Base
+  self.abstract_class = true
+end

data/templates/rails_app/app/views/layouts/application.html.erb.tt

@@ -7,8 +7,10 @@
   <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
 
   <title><%= @config.class_name %></title>
-  <%%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true %>
-  <%%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
+  <%%= csrf_meta_tags %>
+
+  <%%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track': true %>
+  <%%= javascript_include_tag 'application', 'data-turbolinks-track': true %>
 
   <style data-turbolinks-track="true"><%%= yield :stylesheets %></style>
 
@@ -18,14 +20,15 @@
   <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
   <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
   <![endif]-->
-
-  <%%= csrf_meta_tags %>
 </head>
 <body>
   <div id="content">
     <%%= ui_flash_messages %>
     <%%= content_for?(:content) ? yield(:content) : yield %>
+
+    <div id='app'></div>
   </div>
+  <%= javascript_pack_tag 'application' %>
   <script>
     window.current_language = "<%%= I18n.locale %>";
     window.date_format = "<%%= I18n.t('date.formats.datepicker') %>";

data/templates/rails_app/app/views/layouts/mailer.html.erb

@@ -1,8 +1,12 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <meta content='text/html; charset=UTF-8' http-equiv='Content-Type' />
+  <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
+  <style>
+    /* Email styles need to be inline */
+  </style>
 </head>
+
 <body>
 <%= yield %>
 </body>

data/templates/rails_app/bin/rails

@@ -1,4 +1,9 @@
 #!/usr/bin/env ruby
-APP_PATH = File.expand_path('../../config/application', __FILE__)
+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,4 +1,9 @@
 #!/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/setup

@@ -1,29 +1,38 @@
 #!/usr/bin/env ruby
 require 'pathname'
+require 'fileutils'
+include FileUtils
 
 # path to your application root.
-APP_ROOT = Pathname.new File.expand_path('../../',  __FILE__)
+APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
 
-Dir.chdir APP_ROOT do
+def system!(*args)
+  system(*args) || abort("\n== Command #{args} failed ==")
+end
+
+chdir APP_ROOT do
   # This script is a starting point to setup your application.
-  # Add necessary setup steps to this file:
+  # Add necessary setup steps to this file.
+
+  puts '== Installing dependencies =='
+  system! 'gem install bundler --conservative'
+  system('bundle check') || system!('bundle install')
+
+  # Install JavaScript dependencies if using Yarn
+  # system('bin/yarn')
 
-  puts "== Installing dependencies =="
-  system "gem install bundler --conservative"
-  system "bundle check || bundle install"
 
   # puts "\n== Copying sample files =="
-  # unless File.exist?("config/database.yml")
-  #   system "cp config/database.yml.sample config/database.yml"
+  # unless File.exist?('config/database.yml')
+  #   cp 'config/database.yml.sample', 'config/database.yml'
   # end
 
   puts "\n== Preparing database =="
-  system "bin/rake db:setup"
+  system! 'bin/rails db:setup'
 
   puts "\n== Removing old logs and tempfiles =="
-  system "rm -f log/*"
-  system "rm -rf tmp/cache"
+  system! 'bin/rails log:clear tmp:clear'
 
   puts "\n== Restarting application server =="
-  system "touch tmp/restart.txt"
+  system! 'bin/rails restart'
 end

data/templates/rails_app/bin/spring

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+
+# This file loads spring without using Bundler, in order to be fast.
+# It gets overwritten when you run the `spring binstub` command.
+
+unless defined?(Spring)
+  require 'rubygems'
+  require 'bundler'
+
+  lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read)
+  spring = lockfile.specs.detect { |spec| spec.name == "spring" }
+  if spring
+    Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path
+    gem 'spring', spring.version
+    require 'spring/binstub'
+  end
+end

data/templates/rails_app/bin/update

@@ -0,0 +1,28 @@
+#!/usr/bin/env ruby
+require 'pathname'
+require 'fileutils'
+include FileUtils
+
+# path to your application root.
+APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
+
+def system!(*args)
+  system(*args) || abort("\n== Command #{args} failed ==")
+end
+
+chdir APP_ROOT do
+  # This script is a way to update your development environment automatically.
+  # Add necessary update steps to this file.
+
+  puts '== Installing dependencies =='
+  system! 'gem install bundler --conservative'
+  system('bundle check') || system!('bundle install')
+  puts "\n== Updating database =="
+  system! 'bin/rails db:migrate'
+
+  puts "\n== Removing old logs and tempfiles =="
+  system! 'bin/rails log:clear tmp:clear'
+
+  puts "\n== Restarting application server =="
+  system! 'bin/rails restart'
+end

data/templates/rails_app/bin/webpack

@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+require 'shellwords'
+
+ENV['RAILS_ENV'] ||= 'development'
+RAILS_ENV   = ENV['RAILS_ENV']
+
+ENV['NODE_ENV'] ||= RAILS_ENV
+NODE_ENV    = ENV['NODE_ENV']
+
+APP_PATH = File.expand_path('../', __dir__)
+ESCAPED_APP_PATH = APP_PATH.shellescape
+
+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"
+
+Dir.chdir(APP_PATH) do
+  exec "#{SET_NODE_PATH} #{WEBPACK_BIN} --config #{WEBPACK_CONFIG} #{ARGV.join(" ")}"
+end

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

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+require 'shellwords'
+
+ENV['RAILS_ENV'] ||= 'development'
+RAILS_ENV   = ENV['RAILS_ENV']
+
+ENV['NODE_ENV'] ||= RAILS_ENV
+NODE_ENV    = ENV['NODE_ENV']
+
+APP_PATH = File.expand_path('../', __dir__)
+ESCAPED_APP_PATH = APP_PATH.shellescape
+
+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"
+
+# Warn the user if the configuration is not set
+RAILS_ENV_CONFIG = File.join("config", "environments", "#{RAILS_ENV}.rb")
+
+# 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"
+end
+
+Dir.chdir(APP_PATH) do
+  exec "#{SET_NODE_PATH} #{WEBPACKER_BIN} --config #{WEBPACK_CONFIG} --content-base #{ESCAPED_APP_PATH}/public/packs #{ARGV.join(" ")}"
+end

data/templates/rails_app/bin/webpack-watcher

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+
+ENV['RAILS_ENV'] ||= 'development'
+ENV['NODE_ENV'] ||= ENV['RAILS_ENV']
+
+BIN_PATH = File.expand_path('.', __dir__)
+
+Dir.chdir(BIN_PATH) do
+  exec "./webpack --watch --progress --color #{ARGV.join(" ")}"
+end

data/templates/rails_app/bin/yarn

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+VENDOR_PATH = File.expand_path('..', __dir__)
+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"
+  end
+end

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

@@ -1,4 +1,4 @@
-require File.expand_path('../boot', __FILE__)
+require_relative 'boot'
 
 require 'rails/all'
 
@@ -11,16 +11,5 @@ module <%= @config.class_name %>
     # 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.
-
-    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
-    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
-    # config.time_zone = 'Central Time (US & Canada)'
-
-    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-    # config.i18n.default_locale = :de
-
-    # Do not swallow errors in after_commit/after_rollback callbacks.
-    config.active_record.raise_in_transactional_callbacks = true
   end
 end

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

@@ -0,0 +1,10 @@
+development:
+  adapter: async
+
+test:
+  adapter: async
+
+production:
+  adapter: redis
+  url: redis://<%= ENV.fetch('REDIS_SERVER') %>
+  channel_prefix: <%= @config.app_name %>_production

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

@@ -1,32 +1,21 @@
-development:
+default: &default
   adapter: postgresql
   encoding: unicode
-  port: 5432
   host: localhost
-  database: <%= @config.app_name %>_development
-  username: <%%= ENV['DB_USER'] %>
-  password: <%%= ENV['DB_PASSWORD'] %>
-  pool: 5
+  port: 5432
+  username: <%= ENV['DB_USER'] %>
+  password: <%= ENV['DB_PASSWORD'] %>
+  pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
   timeout: 5000
 
+development:
+  <<: *default
+  database: <%= @config.app_name %>_development
+
 test:
-  adapter: postgresql
-  encoding: unicode
-  port: 5432
-  host: localhost
+  <<: *default
   database: <%= @config.app_name %>_test
-  username: <%%= ENV['DB_USER'] %>
-  password: <%%= ENV['DB_PASSWORD'] %>
-  pool: 5
-  timeout: 5000
 
 production:
-  adapter: postgresql
-  encoding: unicode
-  port: 5432
-  host: localhost
+  <<: *default
   database: <%= @config.app_name %>_production
-  username: <%%= ENV['DB_USER'] %>
-  password: <%%= ENV['DB_PASSWORD'] %>
-  pool: 15
-  timeout: 5000

data/templates/rails_app/config/environment.rb

@@ -1,5 +1,5 @@
 # Load the Rails application.
-require File.expand_path('../application', __FILE__)
+require_relative 'application'
 
 # Initialize the Rails application.
 Rails.application.initialize!

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

@@ -1,4 +1,7 @@
 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
@@ -9,13 +12,28 @@ Rails.application.configure do
   # Do not eager load code on boot.
   config.eager_load = false
 
-  # Show full error reports and disable caching.
-  config.consider_all_requests_local       = true
-  config.action_controller.perform_caching = false
+  # Show full error reports.
+  config.consider_all_requests_local = true
+
+  # Enable/disable caching. By default caching is disabled.
+  if Rails.root.join('tmp/caching-dev.txt').exist?
+    config.action_controller.perform_caching = true
+
+    config.cache_store = :memory_store
+    config.public_file_server.headers = {
+        'Cache-Control' => "public, max-age=#{2.days.seconds.to_i}"
+    }
+  else
+    config.action_controller.perform_caching = false
+
+    config.cache_store = :null_store
+  end
 
   # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
 
+  config.action_mailer.perform_caching = false
+
   # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
 
@@ -27,18 +45,9 @@ Rails.application.configure do
   # number of complex assets.
   config.assets.debug = true
 
-  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
-  # yet still be able to expire them through the digest params.
-  config.assets.digest = true
-
-  # Less asset logs in development
+  # Suppress logger output for asset requests.
   config.assets.quiet = true
 
-  # Adds additional error checking when serving assets at runtime.
-  # Checks for improperly declared sprockets dependencies.
-  # Raises helpful error messages.
-  config.assets.raise_runtime_errors = true
-
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
 
@@ -48,4 +57,8 @@ Rails.application.configure do
   # config.active_job.queue_adapter = :sidekiq
 
   config.action_mailer.default_url_options = { host: 'http://localhost:3000' }
+
+  # Use an evented file watcher to asynchronously detect changes in source code,
+  # routes, locales, etc. This feature depends on the listen gem.
+  config.file_watcher = ActiveSupport::EventedFileUpdateChecker
 end