startblock 1.3 → 1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47f23987b7c61185a0d0243aa4fdc6cc76a03e15
-  data.tar.gz: fe0e98edfb05b0a5d85a4184f77ad24446fe9286
+  metadata.gz: d4cbd0cf6a715971b53dbfcce768380b9a8d4123
+  data.tar.gz: a0447a54c7c475e68a8088b549f25a1e3018e8f2
 SHA512:
-  metadata.gz: 52ddc325d76ea0e1166dc9191891045a28e090d170b8a0214626fe9d252cd330371564f7bf3e920f40b0c36cb78409ebc3fae14ace9aced5f1f238020a7e7632
-  data.tar.gz: ec18d4f3f1f4140042ad0e4edb7dccdc0e31703f97b2bc47694bfe4c598d8f627b11283a9dcbec09a99b509b7f8d0fbaa12a8893c7155e973de9e802b8bf1961
+  metadata.gz: 393010437012ddcc932f26bfd3807ee32234857d0431daba0fc844dcbdffc504d65f844c45e13c36ce1ba30164c78fccafc8ab9b974911b06a48ffde9a3118c0
+  data.tar.gz: 350e810d96d0727d7d4c9cee0b2d664501a9f13ea818206ce72f5212339847731b9e24374acd459854a1df333358cd321ff8b58454444b0ae78b124102eb11b5

data/.ruby-version

@@ -1 +1 @@
-2.2.3
+2.3.0

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 cache: bundler
 rvm:
-  - 2.2.3
+  - 2.3.0
 sudo: false
 notifications:
   email: true

data/CHANGELOG

@@ -2,6 +2,28 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## V1.5 - Unreleased
+
+### Changed
+### Added
+### Removed
+### Fixed
+
+## V1.4 - Maroon Lead - 2016-01-29
+
+### Changed
+- Updated Ruby to 2.3.0
+- Defaults to Intercity-Next configuration
+
+### Added
+- Puma as app server
+
+### Removed
+- All capistrano related stuff
+
+### Fixed
+- Make sure we import the correct bootstrap-sass scss file
+
 ## V1.3 - Purple Mercury - 2016-01-26
 
 ### Added

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    startblock (1.2)
+    startblock (1.4)
       bundler (~> 1.3)
       rails (~> 4.2)
       thor (~> 0.19)
@@ -9,36 +9,36 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.5)
-      actionpack (= 4.2.5)
-      actionview (= 4.2.5)
-      activejob (= 4.2.5)
+    actionmailer (4.2.5.1)
+      actionpack (= 4.2.5.1)
+      actionview (= 4.2.5.1)
+      activejob (= 4.2.5.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.5)
-      actionview (= 4.2.5)
-      activesupport (= 4.2.5)
+    actionpack (4.2.5.1)
+      actionview (= 4.2.5.1)
+      activesupport (= 4.2.5.1)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.5)
-      activesupport (= 4.2.5)
+    actionview (4.2.5.1)
+      activesupport (= 4.2.5.1)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (4.2.5)
-      activesupport (= 4.2.5)
+    activejob (4.2.5.1)
+      activesupport (= 4.2.5.1)
       globalid (>= 0.3.0)
-    activemodel (4.2.5)
-      activesupport (= 4.2.5)
+    activemodel (4.2.5.1)
+      activesupport (= 4.2.5.1)
       builder (~> 3.1)
-    activerecord (4.2.5)
-      activemodel (= 4.2.5)
-      activesupport (= 4.2.5)
+    activerecord (4.2.5.1)
+      activemodel (= 4.2.5.1)
+      activesupport (= 4.2.5.1)
       arel (~> 6.0)
-    activesupport (4.2.5)
+    activesupport (4.2.5.1)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -59,21 +59,21 @@ GEM
     mime-types (2.99)
     mini_portile2 (2.0.0)
     minitest (5.8.3)
-    nokogiri (1.6.7.1)
+    nokogiri (1.6.7.2)
       mini_portile2 (~> 2.0.0.rc2)
     rack (1.6.4)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.5)
-      actionmailer (= 4.2.5)
-      actionpack (= 4.2.5)
-      actionview (= 4.2.5)
-      activejob (= 4.2.5)
-      activemodel (= 4.2.5)
-      activerecord (= 4.2.5)
-      activesupport (= 4.2.5)
+    rails (4.2.5.1)
+      actionmailer (= 4.2.5.1)
+      actionpack (= 4.2.5.1)
+      actionview (= 4.2.5.1)
+      activejob (= 4.2.5.1)
+      activemodel (= 4.2.5.1)
+      activerecord (= 4.2.5.1)
+      activesupport (= 4.2.5.1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.5)
+      railties (= 4.2.5.1)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
@@ -81,18 +81,18 @@ GEM
       activesupport (>= 4.2.0.beta, < 5.0)
       nokogiri (~> 1.6.0)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.2)
+    rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (4.2.5)
-      actionpack (= 4.2.5)
-      activesupport (= 4.2.5)
+    railties (4.2.5.1)
+      actionpack (= 4.2.5.1)
+      activesupport (= 4.2.5.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.5.0)
     sprockets (3.5.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.0.0)
+    sprockets-rails (3.0.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
@@ -110,4 +110,4 @@ DEPENDENCIES
   startblock!
 
 BUNDLED WITH
-   1.10.6
+   1.11.2

data/VERSION

@@ -1 +1 @@
-V1.3
+V1.4

data/lib/startblock/app_builder.rb

@@ -122,6 +122,10 @@ end
       copy_file 'startblock_gitignore', '.gitignore'
     end
 
+    def copy_puma_config
+      copy_file 'puma.rb', 'config/puma.rb'
+    end
+
     def init_git
       run 'git init'
     end

data/lib/startblock/generators/app_generator.rb

@@ -28,6 +28,7 @@ module Startblock
       invoke :setup_stylesheets
       invoke :setup_javascripts
       invoke :remove_routes_comment_lines
+      invoke :setup_puma
       invoke :setup_git
       invoke :setup_database
       invoke :setup_mixpanel
@@ -93,6 +94,11 @@ module Startblock
       build :remove_routes_comment_lines
     end
 
+    def setup_puma
+      say 'Setting up puma'
+      build :copy_puma_config
+    end
+
     def setup_git
       say 'Initializing git'
       build :gitignore_files

data/lib/startblock/version.rb

@@ -1,5 +1,5 @@
 module Startblock
   RAILS_VERSION = "~> 4.2"
   RUBY_VERSION = IO.read("#{File.dirname(__FILE__)}/../../.ruby-version").strip
-  VERSION = "1.3"
+  VERSION = "1.4"
 end

data/templates/Gemfile.erb

@@ -16,15 +16,11 @@ gem "redis-namespace", "~> 1.5.1"
 gem "nprogress-rails", "~> 0.1.6"
 gem "font-awesome-sass", "~> 4.5.0"
 gem "bootstrap_form", "~> 2.3.0"
+gem "puma", "~> 2.16"
 
 group :development do
   gem "spring"
   gem "web-console"
-  gem "capistrano"
-  gem "capistrano-rails"
-  gem "capistrano-rails-console"
-  gem "daemon_controller"
-  gem "passenger"
   gem "quiet_assets"
   gem "letter_opener"
 end
@@ -44,6 +40,7 @@ group :test do
 end
 
 group :staging, :production do
+  gem "rails_12factor"
 end
 
 source "https://rails-assets.org" do

data/templates/Procfile

@@ -1,2 +1,2 @@
-web: passenger start
+web: bundle exec puma -C config/puma.rb
 sidekiq: bundle exec sidekiq

data/templates/application.scss

@@ -5,5 +5,5 @@
 @import "nprogress";
 @import "nprogress-bootstrap";
 @import "font-awesome-sprockets";
-@import "font-awesome-sass";
+@import "font-awesome";
 @import "rails_bootstrap_forms";

data/templates/postgresql_database.yml.erb

@@ -10,3 +10,11 @@ development: &default
 test:
   <<: *default
   database: <%= app_name %>_test
+
+staging:
+  <<: *default
+  url: <%= ENV["DATABASE_URL"] %>
+
+production:
+  <<: *default
+  url: <%= ENV["DATABASE_URL"] %>

data/templates/puma.rb

@@ -0,0 +1,15 @@
+workers Integer(ENV['WEB_CONCURRENCY'] || 2)
+threads_count = Integer(ENV['MAX_THREADS'] || 5)
+threads threads_count, threads_count
+
+preload_app!
+
+rackup      DefaultRackup
+port        ENV['PORT']     || 3000
+environment ENV['RACK_ENV'] || 'development'
+
+on_worker_boot do
+  # Worker specific setup for Rails 4.1+
+  # See: https://devcenter.heroku.com/articles/deploying-rails-applications-with-the-puma-web-server#on-worker-boot
+  ActiveRecord::Base.establish_connection
+end

data/test/features/new_project_test.rb

@@ -23,6 +23,10 @@ class NewProjectTest < Minitest::Test
     end
   end
 
+  def test_puma_config_should_exist
+    assert File.exists?("#{project_path}/config/puma.rb"), "config/puma.rb should exist"
+  end
+
   def test_gemfile_should_contain_certain_gems
     gemfile = IO.read("#{project_path}/Gemfile")
 
@@ -31,6 +35,8 @@ class NewProjectTest < Minitest::Test
     assert gemfile.match(/nprogress-rails/), "Gemfile should contain NProgress-rails"
     assert gemfile.match(/font-awesome-sass/), "Gemfile should contain font-awesome-sass"
     assert gemfile.match(/bootstrap_form/), "Gemfile should contain bootstrap_form"
+    assert gemfile.match(/puma/), "Gemfile should contain puma"
+    assert gemfile.match(/rails_12factor/), "Gemfile should contain rails_12factor"
   end
 
   def test_gemfile_should_contain_ruby_version
@@ -38,6 +44,12 @@ class NewProjectTest < Minitest::Test
     assert gemfile.match(/^ruby \".+\"$/), "Gemfile should contain a Ruby version"
   end
 
+  def test_database_yml_should_containt_staging_and_production
+    database_yml = IO.read("#{project_path}/config/database.yml")
+    assert database_yml.match(/staging/), "Database.yml should contain staging"
+    assert database_yml.match(/production/), "Database.yml should contain production"
+  end
+
   def test_application_js_should_b_created
     app_js_file = IO.read("#{project_path}/app/assets/javascripts/application.js")
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: startblock
 version: !ruby/object:Gem::Version
-  version: '1.3'
+  version: '1.4'
 platform: ruby
 authors:
 - Jeroen van Baarsen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-26 00:00:00.000000000 Z
+date: 2016-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -107,6 +107,7 @@ files:
 - templates/application.scss
 - templates/bin_setup.erb
 - templates/postgresql_database.yml.erb
+- templates/puma.rb
 - templates/rubocop.yml
 - templates/sample.env
 - templates/secrets.yml
@@ -130,7 +131,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.3
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -138,7 +139,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: Generate a Rails app using Firmhouse's best practices.
@@ -146,4 +147,3 @@ test_files:
 - test/features/new_project_test.rb
 - test/support/startblock.rb
 - test/test_helper.rb
-has_rdoc: