shoestrap 0.1.1 → 0.2.0

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 #Changelog
 
+## 0.2.0 - 2013-03-09
+
+- Preparations for new servers/workflow:
+  A new generator has been added which is called on app generation.
+  It adds:
+    - unicorn config
+    - database config
+    - deployment task
+
+  The generator can be called on exisiting apps as well in order to migrate
+  to the new server setup:
+
+  `rails generate shoestrap:deployment`
+
 ## 0.1.1 - 2013-02-14
 
 * Fix: Don't use deleted kuhsaft branch

data/lib/generators/shoestrap/app_generator.rb

@@ -16,6 +16,7 @@ module Shoestrap
       build :setup_bdd_env
       build :configure_generators
       build :install_kuhsaft
+      build :setup_deployment
       build :setup_database
       build :outro
     end

data/lib/generators/shoestrap/cms_generator.rb

@@ -4,7 +4,7 @@ require "rails/generators/active_record/model/model_generator"
 
 module Shoestrap
   class CmsGenerator < ActiveRecord::Generators::ModelGenerator
-    source_root File.expand_path('../templates', __FILE__)
+    source_root File.expand_path('../templates/cms', __FILE__)
     # ... and those files are from: activerecord-3.2.11/lib/rails/generators/active_record/model/templates
 
     remove_hook_for :test_framework

data/lib/generators/shoestrap/deployment_generator.rb

@@ -0,0 +1,42 @@
+require 'rails/generators'
+require 'pathname'
+
+module Shoestrap
+  class DeploymentGenerator < Rails::Generators::Base
+    source_root File.expand_path('../templates/deployment', __FILE__)
+
+    def add_unicorn_config
+      copy_file 'unicorn.rb', 'config/unicorn.rb'
+    end
+
+    def add_database_config
+      template 'database.yml.erb', 'config/database.yml', :force => true
+    end
+
+    def add_deployment_task
+      template 'deployment.rake.erb', 'lib/tasks/deployment.rake'
+    end
+
+    protected
+
+    def app_name
+      Pathname.new(Rails.root).basename.to_s
+    end
+
+    def db_credentials_production
+      '<%= begin IO.read("#{ENV[\'HOME\']}/.config/' + app_name + '_production/db") rescue "" end %>'
+    end
+
+    def db_credentials_staging
+      '<%= begin IO.read("#{ENV[\'HOME\']}/.config/' + app_name + '_staging/db") rescue "" end %>'
+    end
+
+    def restart_unicorn_command
+      '#{ENV[\'HOME\']}/unicorn.sh upgrade ' + app_name + '_#{ENV[\'RAILS_ENV\']}'
+    end
+
+    def restart_monit_command
+      'monit -g ' + app_name + '_#{ENV[\'RAILS_ENV\']} monitor'
+    end
+  end
+end

data/lib/generators/shoestrap/templates/deployment/database.yml.erb

@@ -0,0 +1,29 @@
+production:
+  adapter: postgresql
+  database: <%= app_name %>_production
+  username: <%= app_name %>
+  password: <%= db_credentials_production %>
+  encoding: unicode
+  pool: 5
+
+staging:
+  adapter: postgresql
+  database: <%= app_name %>_staging
+  username: <%= app_name %>
+  password: <%= db_credentials_staging %>
+  encoding: unicode
+  pool: 5
+
+development:
+  adapter: postgresql
+  database: <%= app_name %>_development
+  username: screenconcept
+  password:
+  encoding: unicode
+  pool: 5
+
+test:
+  adapter: sqlite3
+  database: db/test.sqlite3
+  pool: 5
+  timeout: 5000

data/lib/generators/shoestrap/templates/deployment/deployment.rake.erb

@@ -0,0 +1,19 @@
+desc 'run post-deployment stuff'
+task :post_deploy do
+
+  # Precompile assets
+  puts 'Precompiling assets'
+  Rake::Task["assets:precompile"].invoke
+
+  # Run migrations
+  puts 'Running migrations if necessary'
+  Rake::Task["db:migrate"].invoke
+
+  # Trigger Unicorn reexec with 0 downtime
+  puts 'restarting unicorns'
+  system "<%= restart_unicorn_command %>"
+
+  # Enable monit monitoring
+  puts 'enable monit'
+  system "<%= restart_monit_command %>"
+end

data/lib/generators/shoestrap/templates/deployment/unicorn.rb

@@ -0,0 +1,38 @@
+APP_ROOT = File.expand_path(File.dirname(File.dirname(__FILE__)))
+
+worker_processes 3
+working_directory APP_ROOT
+preload_app true
+timeout 30
+
+listen APP_ROOT + "/tmp/unicorn.sock", :backlog => 64
+pid APP_ROOT + "/tmp/unicorn.pid"
+
+stderr_path APP_ROOT + "/log/unicorn.stderr.log"
+stdout_path APP_ROOT + "/log/unicorn.stdout.log"
+
+before_fork do |server, worker|
+  if defined?(ActiveRecord::Base)
+    ActiveRecord::Base.connection.disconnect!
+  end
+
+  old_pid = APP_ROOT + '/tmp/unicorn.pid.oldbin'
+  if File.exists?(old_pid) && server.pid != old_pid
+    begin
+      puts "Killing old master"
+      Process.kill("QUIT", File.read(old_pid).to_i)
+    rescue Errno::ENOENT, Errno::ESRCH
+      puts "Old master alerady dead"
+    end
+  end
+end
+
+after_fork do |server, worker|
+  if defined?(ActiveRecord::Base)
+    ActiveRecord::Base.establish_connection
+  end
+
+  child_pid = server.config[:pid].sub('.pid', ".#{worker.nr}.pid")
+  system("echo #{Process.pid} > #{child_pid}")
+end
+

data/lib/shoestrap/app_builder.rb

@@ -1,11 +1,7 @@
 module Shoestrap
   class AppBuilder < Rails::AppBuilder
     def readme
-      config = {
-        app_name:         app_name
-      }
-
-      template 'README.md.erb', 'README.md', config
+      template 'README.md.erb', 'README.md'
     end
 
     def gemfile
@@ -25,9 +21,6 @@ module Shoestrap
     end
 
     def setup_database
-      # TODO: implement
-      # use pg db sample
-      # rake db:create?
       rake 'db:migrate'
       rake 'db:seed'
     end
@@ -94,6 +87,10 @@ module Shoestrap
       template '_main_navigation.html.haml.erb', 'app/views/kuhsaft/cms/admin/_main_navigation.html.haml'
     end
 
+    def setup_deployment
+      generate 'shoestrap:deployment'
+    end
+
     def outro
       say 'Application is ready!'
     end

data/shoestrap.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "shoestrap"
-  s.version     = '0.1.1'
+  s.version     = '0.2.0'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Immanuel Häussermann", "Felipe Kaufmann", "Phil Schilter", "Noëlle Rosenberg"]
   s.email       = "info@screenconcept.ch"

data/templates/Gemfile.erb

@@ -2,11 +2,8 @@ source 'https://rubygems.org'
 
 <%= rails_gemfile_entry -%>
 
-<%= database_gemfile_entry -%>
-
-<%= "gem 'jruby-openssl'\n" if defined?(JRUBY_VERSION) -%>
-
 <%= assets_gemfile_entry %>
+
 <%= javascript_gemfile_entry -%>
 
 gem 'bcrypt-ruby', '~> 3.0.0'
@@ -23,15 +20,17 @@ gem 'mail'
 gem 'fabrication'
 gem 'shoestrap'
 gem 'kuhsaft'
+gem 'pg'
 
 group :development, :test do
   gem 'pry'
   gem 'rspec-rails'
+  gem 'cucumber-rails'
 end
 
 group :test do
   gem 'database_cleaner'
-  gem 'cucumber-rails'
+  gem 'sqlite3'
 end
 
 group :development do

data/templates/README.md.erb

@@ -1,4 +1,4 @@
-# <%= config[:app_name] %>
+# <%= app_name %>
 
 ## IMPORTANT REMARKS
 
@@ -13,7 +13,6 @@ The app runs on the <server> server
 
 * Home:
 * Web:
-* External:
 
 ### Production
 * The app runs on the <server> server

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shoestrap
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-14 00:00:00.000000000 Z
+date: 2013-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -81,10 +81,14 @@ files:
 - bin/shoestrap
 - lib/generators/shoestrap/app_generator.rb
 - lib/generators/shoestrap/cms_generator.rb
-- lib/generators/shoestrap/templates/migration.rb
-- lib/generators/shoestrap/templates/model.rb
-- lib/generators/shoestrap/templates/model.yml.erb
-- lib/generators/shoestrap/templates/view.yml.erb
+- lib/generators/shoestrap/deployment_generator.rb
+- lib/generators/shoestrap/templates/cms/migration.rb
+- lib/generators/shoestrap/templates/cms/model.rb
+- lib/generators/shoestrap/templates/cms/model.yml.erb
+- lib/generators/shoestrap/templates/cms/view.yml.erb
+- lib/generators/shoestrap/templates/deployment/database.yml.erb
+- lib/generators/shoestrap/templates/deployment/deployment.rake.erb
+- lib/generators/shoestrap/templates/deployment/unicorn.rb
 - lib/shoestrap.rb
 - lib/shoestrap/app_builder.rb
 - shoestrap.gemspec