trevi 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dea2496309e928594da9001fc8133204bb3ff3e5
-  data.tar.gz: 6d50c453ec667e1edf1294665f45a5d554446e1f
+  metadata.gz: cce4d771abf3c2665f5284a8d9aea21949dccf5b
+  data.tar.gz: 2751a72c8269428ccc2effbb2b29459afb807c8e
 SHA512:
-  metadata.gz: 9adc60ad54737ade96764fbe66fa95c6ae1534bbdba161efe3052e57b0a6505180bd1793021d695d03790c055144b272682acadf1f4cc1b9d51cc6e142f195d8
-  data.tar.gz: 94dfe0e250a9b5a7365b4f80472c85bca84edc466e040be1ea02a7f56a955cec7a0b5fedee1419db4686859d899bfc4806792a39aa3b376adefcdd57a2b833d2
+  metadata.gz: fc3ceeeea314420cd0baebc3ee75f34965b98a584502ec107f1a4468d4c3f44c3da1b7295c8e56cbbb587d3ec8832ad847e052e5b3622db27c5294556ae11cc2
+  data.tar.gz: b4faa61972c6c487ca5120d9879c082f15c8478198c24e8214828eff668239ac2fb2cf84b02ab1335380b396a92e1b62e45ed31e977dd761f291f835d7c80dcf

data/lib/trevi/version.rb

@@ -1,3 +1,3 @@
 module Trevi
-  VERSION = "0.0.4"
+  VERSION = '0.0.5'
 end

data/templates/app/.gitignore

@@ -1,4 +1,4 @@
 tmp
 .DS_Store
-.env
-mails
+.env*
+mails

data/templates/app/Gemfile

@@ -1,17 +1,17 @@
 source 'https://rubygems.org'
-ruby '2.1.2'
+ruby '2.1.5'
 
-gem 'sinatra', require: 'sinatra/base'
-gem 'sinatra-contrib', github: 'maccman/sinatra-contrib'
-gem 'rack-standards'
-gem 'unicorn'
-gem 'erubis'
-gem 'i18n'
 gem 'activesupport'
-gem 'rake'
 gem 'builder'
-gem 'json', '~> 1.7.7'
 gem 'dotenv'
+gem 'erubis'
+gem 'i18n'
+gem 'json', '~> 1.7.7'
+gem 'puma'
+gem 'rack-standards'
+gem 'rake'
+gem 'sinatra', require: 'sinatra/base'
+gem 'sinatra-contrib', github: 'maccman/sinatra-contrib'
 
 # Assets
 gem 'sprockets'
@@ -32,6 +32,12 @@ gem 'sinatra-sequel'
 gem 'pg'
 
 group :development do
-  gem 'thin'
-  gem 'byebug'
+  gem 'foreman'
+end
+
+group :test do
+  gem 'pry'
+  gem 'rack-test'
+  gem 'rspec'
+  gem 'webmock'
 end

data/templates/app/Procfile

@@ -1 +1 @@
-web: bundle exec unicorn -c ./config/unicorn.rb
+web: bundle exec puma -C config/puma.rb

data/templates/app/Rakefile

@@ -4,6 +4,14 @@ task :app do
   require './app'
 end
 
-Dir[File.dirname(__FILE__) + "/lib/tasks/*.rb"].sort.each do |path|
-  require path
-end
+Dir[File.dirname(__FILE__) + '/lib/tasks/*.rake'].sort.each do |path|
+  load path
+end
+
+begin
+  require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new(:spec)
+  task default: :spec
+rescue LoadError
+  # no rspec available
+end

data/templates/app/app.rb.tt

@@ -1,13 +1,19 @@
 require 'rubygems'
 require 'bundler'
 
+# Set default env
+ENV['RACK_ENV'] ||= 'development'
+
 # Setup load paths
 Bundler.require
 $: << File.expand_path('../', __FILE__)
 $: << File.expand_path('../lib', __FILE__)
 
+# Dotenv load specific vars
 require 'dotenv'
-Dotenv.load
+Dotenv.load(
+  File.expand_path("../.env.#{ENV['RACK_ENV']}", __FILE__),
+  File.expand_path("../.env",  __FILE__))
 
 # Require base
 require 'sinatra/base'
@@ -49,6 +55,8 @@ module <%= @name.camel_case %>
           secret: ENV['SESSION_SECRET']
     end
 
+    Dir['config/initializers/*.rb'].sort.each { |file| require file }
+
     use Rack::Deflater
     use Rack::Standards
 
@@ -63,4 +71,5 @@ module <%= @name.camel_case %>
   end
 end
 
-include <%= @name.camel_case %>::Models
+include <%= @name.camel_case %>
+include <%= @name.camel_case %>::Models

data/templates/app/config/puma.rb

@@ -0,0 +1,9 @@
+workers Integer(ENV['WEB_CONCURRENCY'] || 4)
+threads_count = Integer(ENV['MAX_THREADS'] || 8)
+threads threads_count, threads_count
+
+preload_app!
+
+rackup      DefaultRackup
+port        ENV['PORT']     || 5000
+environment ENV['RACK_ENV'] || 'development'

data/templates/app/spec/models/.gitkeep

@@ -0,0 +1 @@
+.gitkeep

data/templates/app/spec/requests/.gitkeep

@@ -0,0 +1 @@
+.gitkeep

data/templates/app/spec/spec_helper.rb.tt

@@ -0,0 +1,21 @@
+ENV['RACK_ENV'] = 'test'
+
+require File.expand_path('../../app', __FILE__)
+
+require 'pry'
+require 'rspec'
+require 'rack/test'
+require 'webmock/rspec'
+
+RSpec.configure do |config|
+  include Rack::Test::Methods
+  config.order = 'random'
+
+  def app
+    <%= @name.camel_case %>::App
+  end
+
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trevi
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Alex MacCaw
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-30 00:00:00.000000000 Z
+date: 2016-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -89,10 +89,13 @@ files:
 - templates/app/app/routes/static.rb.tt
 - templates/app/app/views/layouts/layout.erb.tt
 - templates/app/config.ru.tt
-- templates/app/config/unicorn.rb
-- templates/app/lib/tasks/assets.rb.tt
-- templates/app/lib/tasks/db.rb.tt
+- templates/app/config/puma.rb
+- templates/app/lib/tasks/assets.rake.tt
+- templates/app/lib/tasks/db.rake.tt
 - templates/app/public/favicon.ico
+- templates/app/spec/models/.gitkeep
+- templates/app/spec/requests/.gitkeep
+- templates/app/spec/spec_helper.rb.tt
 - templates/app/vendor/assets/javascripts/.gitkeep
 - templates/app/vendor/assets/stylesheets/.gitkeep
 - trevi.gemspec

data/templates/app/config/unicorn.rb

@@ -1,21 +0,0 @@
-worker_processes Integer(ENV['UNICORN_WORKERS'] || 4)
-timeout 30
-preload_app true
-listen(ENV['PORT'] || 3000, :backlog => Integer(ENV['UNICORN_BACKLOG'] || 200))
-
-before_fork do |server, worker|
-  Signal.trap 'TERM' do
-    puts 'Unicorn master intercepting TERM and sending myself QUIT instead'
-    Process.kill 'QUIT', Process.pid
-  end
-
-  if defined?(Sequel::Model)
-    Sequel::DATABASES.each{ |db| db.disconnect }
-  end
-end
-
-after_fork do |server, worker|
-  Signal.trap 'TERM' do
-    puts 'Unicorn worker intercepting TERM and doing nothing. Wait for master to sent QUIT'
-  end
-end