trireme 0.0.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9a8e50b134b60477af20a52ac807788e28701d1
-  data.tar.gz: 7c073f1152a8c2c4d66f27919d602256f045f4ba
+  metadata.gz: 61b2fc070bbe41b72043ad7659dc30e983b51e5a
+  data.tar.gz: e0fd5ff48fd6b38f1101137430628dfef3f0ac50
 SHA512:
-  metadata.gz: b26baa4e8e6d349eccf0482d7b67d30599f039ea27c1a5acb1118bd048c3c80c23c6fc13d064c58e6b2c4d76c4c79f91ecd3714b6b0ad022e8e6159c88be3acf
-  data.tar.gz: 277fb0c6aefcff4e2eeb8a6aa25d78f9fbab19a64d7483bae6bef856d0e37952453452275185326dc0684b8db4d59c8b4f75d43237251c629950ba2aec8461e1
+  metadata.gz: 12bdbb5ac2a2e0a8f2b1dc3be7a92b46f7e8b988d38f667681dabaa0b33d8e439849091668647e7d3d62f0ef70c48680378e38a25fb4a3c655d6ad1bf899993a
+  data.tar.gz: 02df4ff322b341f89be889740b344b98e9ead096b98fcc6a82bd4ab6ea29da052e0ff9f56660f614436e58a6521900af24ab7bd83a44cf70d8373f32be1da5e6

data/lib/trireme/app_builder.rb

@@ -5,7 +5,7 @@ module Trireme
     include Trireme::Actions
 
     def add_additional_gems
-      if yes? "Add carrierwave for file uploading?"
+      if config_settings[:gems].include?('carrierwave') || yes?("Add carrierwave for file uploading?")
         @generator.gem 'carrierwave'
         @generator.gem 'mini_magick'
       end
@@ -126,7 +126,7 @@ module Trireme
         "config.action_mailer_delivery_method = :smtp\n\tconfig.action_mailer.smtp_settings = #{format_config(config_settings[:action_mailer][:smtp_settings])}"
     end
 
-    def setup_capistrano
+    def setup_deploy
       if @domain_base && @server_ip
         opts = { domain_base: @domain_base, server_ip: @server_ip, force: true }
       else
@@ -134,10 +134,20 @@ module Trireme
         opts[:server_ip] = ask("Server IP:")
         opts[:force] = true
       end
-      template "config/deploy.rb.erb", "config/deploy.rb", opts
+      puts @config.to_yaml
+      deploy_opts = opts.merge({config_settings: config_settings})
+      template "config/deploy.rb.erb", "config/deploy.rb", deploy_opts
       directory "config/deploy"
-      copy_file "Capfile", "Capfile"
-      directory "config/recipes"
+      %w[staging.rb production.rb].each { |f| template "config/deploy/#{f}.erb", "config/deploy/#{f}", deploy_opts }
+
+      directory "lib/mina"
+
+      Dir["#{File.expand_path('../../trireme/templates/lib/mina/', __FILE__)}/*.erb"].each do |file|
+        file = file.split('/').last
+        template "lib/mina/#{file}", "lib/mina/#{file.gsub('.erb', '')}", deploy_opts
+        puts "lib/mina/#{file}", "lib/mina/#{file.gsub('.erb', '')}"
+      end
+      run 'rm lib/mina/*.erb'
     end
 
     def setup_console
@@ -146,7 +156,7 @@ module Trireme
 
     def setup_devise
       if config_settings[:devise][:include] || yes?("Add Devise?")
-        devise_model = ask("Devise model (default: #{config_settings[:devise][:model]}):").underscore
+        devise_model = ask("Devise model (default: #{config_settings[:devise][:model]}):").underscore unless config_settings[:devise][:force_model]
         devise_model = config_settings[:devise][:model] if devise_model.blank?
         @generator.gem 'devise'
         run 'bundle install'
@@ -170,7 +180,7 @@ module Trireme
       if config_settings[:exception_notification][:irc]
         config_settings[:exception_notification][:irc][:prefix] = "[#{app_name.titleize} Production]"
         en_config << ",\n\t\t" if en_config[/}\Z/]
-        en_config << ":irc => #{format_config(config_settings[:exception_notification][:irc], 2)}"
+        en_config << ":irc => #{format_config(config_settings[:exception_notification][:irc].merge(config_settings[:irc]), 2)}"
       end
       configure_environment "production", en_config
     end

data/lib/trireme/generators/app_generator.rb

@@ -3,7 +3,6 @@ require 'rails/generators/rails/app/app_generator'
 
 module Trireme
   class AppGenerator < Rails::Generators::AppGenerator
-    class_option :database, type: :string, aliases: '-d', default: 'sqlite3', desc: "Preconfigure for selected database (options: #{DATABASES.join('/')})"
     class_option :config_file, type: :string, aliases: '-c', desc: "Include yaml configuration file"
 
     def finish_template
@@ -147,7 +146,7 @@ module Trireme
       build :get_server_options
 
       # Add deploy configuration and recipes
-      build :setup_capistrano
+      build :setup_deploy
     end
 
     def setup_git

data/lib/trireme/templates/app/helpers/utility_helper.rb

@@ -15,14 +15,16 @@ module UtilityHelper
       html_tag << '<i class="fa fa-circle fa-stack-2x"></i>'
       html_tag << "<i class=\"fa fa-#{name} fa-stack-1x fa-inverse\"></i>"
       html_tag << '</span>'
+      html_tag << '</div>' if opts[:wrapper]
     else
       html_tag << "<i class=\"fa fa-#{name}"
       html_tag << " #{opts[:additional]}" if opts.has_key? :additional
       html_tag << " fa-border" if opts[:border]
       html_tag << " fa-#{opts[:size]}" if opts[:size]
       html_tag << '"></i>'
-      html_tag << '</div>' if opts[:wrapper]
     end
+    html_tag << " #{opts[:text]}" if opts[:text]
+    html_tag << '</div>' if opts[:wrapper]
     html_tag.html_safe
   end
 

data/lib/trireme/templates/config/deploy.rb.erb

@@ -1,41 +1,55 @@
-# Set these values for the particular application
-set :domain_base, "<%= config[:domain_base] %>"
-set :server_ip, "<%= config[:server_ip] %>"
-set :application, "<%= app_name %>"
-
-# Possibly set these values
-set :repository, "git@git.cliftonlabs.com:web/#{application}"
-set :user, "deployer"
-
-set :stages, %w(staging production)
-set :default_stage, "staging"
-
-require "capistrano/ext/multistage"
-require "bundler/capistrano"
-
-load "config/recipes/base"
-load "config/recipes/nginx"
-load "config/recipes/unicorn"
-load "config/recipes/postgresql"
-load "config/recipes/check"
-load "config/recipes/logrotate"
-load "config/recipes/log"
-
-server server_ip, :web, :app, :db, primary: true
-
-set :shared_children, shared_children + %w{public/uploads}
-
-set :deploy_via, :remote_cache
-set :use_sudo, false
-set :deploy_to, defer { "/home/#{user}/#{application}/#{stage}/" }
-
-set :default_environment, {
-  'PATH' => "$HOME/.rbenv/shims:$HOME/.rbenv/bin:$PATH"
-}
-
-set :scm, "git"
-
-default_run_options[:pty] = true
-ssh_options[:forward_agent] = true
-
-after "deploy", "deploy:cleanup" # keep only the last 5 releases
+$:.unshift './lib'
+
+require 'mina/bundler'
+require 'mina/rails'
+require 'mina/git'
+
+require 'mina/defaults'
+require 'mina/utility'
+require 'mina/nginx'
+require 'mina/unicorn'
+require 'mina/postgresql'
+require 'mina/logrotate'
+require 'mina/log'
+require 'mina/check'
+require 'mina/irc'
+require 'mina/db'
+
+# Load environments from config/deploy
+Dir['config/deploy/*.rb'].each { |f| load f }
+
+###########################################################################
+# Common settings for all servers
+###########################################################################
+
+set :application,       "<%= app_name %>"
+set :application_name,  "<%= app_name.titleize %>"
+set :domain_name,       "<%= config[:domain_base] %>"
+set :keep_releases,     5
+set :repository,        "<%= config[:config_settings][:git][:url] %>#{app_name}.git"
+set :default_server,    'staging'
+
+###########################################################################
+
+set :server, ENV['to'] || default_server
+invoke :"env:#{server}"
+
+desc "Deploys the current version to the server."
+task :deploy => :environment do
+  deploy do
+    invoke :'check:revision'
+    invoke :'git:clone'
+    invoke :'deploy:link_shared_paths'
+    invoke :'bundle:install'
+    invoke :'rails:db_migrate'
+    invoke :'rails:assets_precompile'
+
+    to :launch do
+      invoke :'unicorn:stop'
+      queue %{sleep 3}
+      invoke :'unicorn:start'
+    end
+
+    <%= "invoke :'irc:announce_deploy'" if config[:config_settings][:mina][:irc] %>
+  end
+end

data/lib/trireme/templates/config/deploy/production.rb.erb

@@ -0,0 +1,15 @@
+namespace :env do
+  task :production => [:environment] do
+    set :server_ip,       '<%= config[:server_ip] || '123.123.123.123' %>'
+    set :domain,          server_ip
+    set :deploy_server,   'production'
+    set :rails_env,       'production'
+    set :branch,          'master'
+    set :rewrite_www,     true
+    set :include_ssl,     false
+    set :default_host,    true
+    set :unicorn_workers, 1
+
+    invoke :defaults
+  end
+end

data/lib/trireme/templates/config/deploy/staging.rb.erb

@@ -0,0 +1,16 @@
+namespace :env do
+  task :staging => [:environment] do
+    set :server_ip,       '<%= config[:server_ip] || '123.123.123.123' %>'
+    set :domain,          server_ip
+    set :deploy_server,   'staging'
+    set :rails_env,       'staging'
+    set :branch,          'staging'
+    set :rewrite_www,     false
+    set :include_ssl,     false
+    set :default_host,    false
+    set :unicorn_workers, 1
+
+    invoke :defaults
+    set :domain_name,     "demo.#{domain_name}"
+  end
+end

data/lib/trireme/templates/{config/recipes → lib/mina}/check.rb

@@ -1,6 +1,6 @@
 namespace :check do
   desc "Make sure local git is in sync with remote."
-  task :revision, roles: :web do
+  task :revision do
     current_repository = "origin"
     unless (`git rev-parse HEAD` == `git rev-parse #{current_repository}/#{branch}`)
       puts "WARNING: HEAD is not the same as #{current_repository}/#{branch}"
@@ -8,7 +8,4 @@ namespace :check do
       exit
     end
   end
-  before "deploy", "check:revision"
-  before "deploy:migrations", "check:revision"
-  before "deploy:cold", "check:revision"
 end

data/lib/trireme/templates/lib/mina/db.rb.erb

@@ -0,0 +1,10 @@
+namespace :db do
+  desc "Run db:seed"
+  task :seed do
+    queue %{cd #{deploy_to}/#{current_path}}
+    queue %{bundle exec rake RAILS_ENV=#{rails_env} db:seed}
+    <% if config[:config_settings][:mina][:irc] %>
+      invoke :'irc:announce_seed'
+    <% end -%>
+  end
+end

data/lib/trireme/templates/lib/mina/defaults.rb

@@ -0,0 +1,35 @@
+task :defaults do
+  set_default :user,            'deployer'
+  set_default :group,           user
+  set_default :port,            '22'
+  set_default :ssh_options,     '-t'
+  set_default :forward_agent,   true
+  set_default :term_mode,       :nil
+  set_default :rails_env,       'staging'
+  set_default :shared_paths,    ['tmp', 'log', 'public/uploads', 'config/database.yml']
+  set_default :branch,          'staging'
+  set_default :deploy_to,       "/home/#{user}/#{application}/#{deploy_server}"
+
+  set_default :sockets_path,    "#{deploy_to}/#{shared_path}/tmp/sockets"
+  set_default :pids_path,       "#{deploy_to}/#{shared_path}/tmp/pids"
+  set_default :logs_path,       "#{deploy_to}/#{shared_path}/log"
+  set_default :templates_path,  "lib/mina/templates"
+  set_default :config_path,     "#{deploy_to}/#{shared_path}/config"
+
+  set_default :unicorn_socket,  "#{sockets_path}/unicorn.sock"
+  set_default :unicorn_pid,     "#{pids_path}/unicorn.pid"
+  set_default :unicorn_config,  "#{config_path}/unicorn.rb"
+  set_default :unicorn_workers, 1
+  set_default :unicorn_log,     "#{logs_path}/unicorn.log"
+  set_default :unicorn_user,    user
+  set_default :unicorn_script,  "/etc/init.d/unicorn_#{application}_#{deploy_server}"
+
+  set_default :nginx_config,    "#{nginx_path}/sites-enabled/#{application}_#{deploy_server}"
+  set_default :nginx_log_path,  "#{deploy_to}/#{shared_path}/log/nginx"
+  set_default :nginx_server_name, domain || server_ip
+
+  set_default :postgresql_host, "localhost"
+  set_default :postgresql_user, application
+  set_default :postgresql_database, "#{application}_#{deploy_server}"
+  set_default :postgresql_pid,  "/var/run/postgresql/9.1-main.pid"
+end

data/lib/trireme/templates/lib/mina/irc.rb.erb

@@ -0,0 +1,22 @@
+<% if config[:config_settings][:mina][:irc] %>
+require 'carrier-pigeon'
+
+namespace :irc do
+  desc "Announce deploy to irc"
+  task :announce_deploy do
+    send_irc_message "#{ENV['USER'].capitalize} is deploying #{application_name || application} to #{server}"
+  end
+
+  task :announce_seed do
+    send_irc_message "#{ENV['USER'].capitalize} is seeding the database for #{application_name || application} #{server}"
+  end
+end
+
+def send_irc_message(message)
+  CarrierPigeon.send(
+    :uri => "irc://<%= config[:config_settings][:mina][:irc][:nick] %><%= ":#{config[:config_settings][:irc][:password] if config[:config_settings][:irc][:password]}" %>@<%= config[:config_settings][:irc][:domain] %>:<%= config[:config_settings][:irc][:port] %>/<%= config[:config_settings][:irc][:channel] %>",
+    :message => message,
+    :ssl => <%= config[:config_settings][:irc][:ssl] %>
+  )
+end
+<% end -%>

data/lib/trireme/templates/lib/mina/log.rb.erb

@@ -0,0 +1,21 @@
+namespace :log do
+  desc "View tail of rails log"
+  task :rails do
+    queue "tail #{logs_path}/#{rails_env}.log -n <%= config[:config_settings][:mina][:log][:tail_length] %>"
+  end
+
+  desc "View tail of unicorn log"
+  task :unicorn do
+    queue "tail #{unicorn_log} -n <%= config[:config_settings][:mina][:log][:tail_length] %>"
+  end
+
+  desc "View tail of nginx error log"
+  task :nginx do
+    queue "tail /var/log/nginx/error.log -n <%= config[:config_settings][:mina][:log][:tail_length] %>"
+  end
+
+  desc "View tail of nginx access log"
+  task :nginx_access do
+    queue "tail /var/log/nginx/access.log -n <%= config[:config_settings][:mina][:log][:tail_length] %>"
+  end
+end

data/lib/trireme/templates/lib/mina/logrotate.rb

@@ -0,0 +1,7 @@
+namespace :logrotate do
+  desc "Setup logrotate for all log files in log directory"
+  task :setup do
+    template "logrotate.erb", "/etc/logrotate.d/#{application}_#{stage}", :tee, :sudo
+  end
+  after "deploy:setup", "logrotate:setup"
+end

data/lib/trireme/templates/lib/mina/nginx.rb

@@ -0,0 +1,23 @@
+namespace :nginx do
+  desc "Setup nginx configuration for this application"
+  task :setup do
+    queue 'echo "-----> Creating nginx config"'
+    template "nginx_unicorn.erb", "/etc/nginx/sites-enabled/#{application}_#{deploy_server}", :tee, :sudo
+    queue 'echo "-----> Deleting nginx default site"' if verbose_mode?
+    queue echo_cmd "sudo rm -f /etc/nginx/sites-enabled/default"
+    invoke :'nginx:restart'
+  end
+
+  task :remove do
+    queue 'echo "-----> Deleting nginx config"'
+    queue "sudo rm -f /etc/nginx/sites-enabled/#{application}_#{deploy_server}"
+    invoke :'nginx:restart'
+  end
+
+  %w[start stop restart].each do |command|
+    desc "#{command} nginx"
+    task command do
+      queue echo_cmd "sudo service nginx #{command}"
+    end
+  end
+end

data/lib/trireme/templates/lib/mina/postgresql.rb

@@ -0,0 +1,37 @@
+require 'highline/import'
+
+namespace :postgresql do
+  desc "Generate the database.yml configuration file"
+  task :setup do
+    get_postgresql_password
+    invoke :'postgresql:create_user'
+    invoke :'postgresql:create_database'
+    template "postgresql.yml.erb", "#{config_path}/database.yml"
+  end
+
+  desc "Create a user for this application."
+  task :create_user do
+    get_postgresql_password
+    queue %{sudo -u postgres psql -c "create user \\"#{postgresql_user}\\" with password '#{postgresql_password}';"; true}
+  end
+
+  desc "Create a database for this application."
+  task :create_database do
+    queue %Q{sudo -u postgres psql -c "create database \\"#{postgresql_database}\\" owner \\"#{postgresql_user}\\";"; true}
+  end
+
+  desc "Symlink the database.yml file into latest release"
+  task :symlink do
+    run "ln -nfs #{shared_path}/config/database.yml #{release_path}/config/database.yml"
+  end
+  after "deploy:finalize_update", "postgresql:symlink"
+end
+
+def get_postgresql_password
+  if !postgresql_password
+    pw = ask "Postgresql password: " do |p|
+      p.echo = '*'
+    end
+    set :postgresql_password, pw
+  end
+end

data/lib/trireme/templates/{config/recipes → lib/mina}/templates/logrotate.erb

@@ -1,4 +1,4 @@
-/home/<%= user %>/<%= application %>/<%= stage %>/shared/log/*.log {
+/home/<%= user %>/<%= application %>/<%= deploy_server %>/shared/log/*.log {
     weekly
     missingok
     rotate 52

data/lib/trireme/templates/{config/recipes → lib/mina}/templates/nginx_unicorn.erb

@@ -1,5 +1,5 @@
-upstream unicorn_<%= "#{application}_#{rails_env}" %> {
-  server unix:/tmp/unicorn.<%= "#{application}_#{rails_env}" %>.sock fail_timeout=0;
+upstream unicorn_<%= "#{application}_#{deploy_server}" %> {
+  server unix:/tmp/unicorn.<%= "#{application}_#{deploy_server}" %>.sock fail_timeout=0;
 }
 
 <% if rewrite_www %>
@@ -16,9 +16,9 @@ server {
 # Server configuration     #
 ############################
 server {
-  listen 80<%= " default_server" if (defined? default_host) && default_host %>;
-  server_name <%= domain_name %>;
-  root /home/<%= user %>/<%= application %>/<%= stage %>/current/public;
+  listen 80<%= " default_server" if default_host %>;
+  server_name <%= domain_name %><%= " #{server_ip}" if default_host %>;
+  root /home/<%= user %>/<%= application %>/<%= deploy_server %>/current/public;
 
   location ^~ /assets/ {
     gzip_static on;
@@ -31,7 +31,7 @@ server {
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_set_header Host $http_host;
     proxy_redirect off;
-    proxy_pass http://unicorn_<%= application %>_<%= stage %>;
+    proxy_pass http://unicorn_<%= application %>_<%= deploy_server %>;
   }
 
   error_page 500 502 503 504 /500.html;
@@ -46,7 +46,7 @@ server {
   ssl on;
   ssl_certificate /path/to/certificate/certificate.combined.crt;
   ssl_certificate_key /path/to/key/server.key;
-  root /home/<%= user %>/apps/<%= application %>/<%= stage %>/current/public;
+  root /home/<%= user %>/apps/<%= application %>/<%= deploy_server %>/current/public;
 
   location ^~ /assets/ {
     gzip_static on;
@@ -59,7 +59,7 @@ server {
     proxy_set_header X-Forwarded-Proto $scheme;
     proxy_set_header Host $http_host;
     proxy_redirect off;
-    proxy_pass http://unicorn_<%= application %>_<%= stage %>;
+    proxy_pass http://unicorn_<%= application %>_<%= deploy_server %>;
   }
 
   error_page 500 502 503 504 /500.html;

data/lib/trireme/templates/{config/recipes → lib/mina}/templates/unicorn.rb.erb

@@ -1,10 +1,10 @@
-working_directory "<%= current_path %>"
+working_directory "<%= deploy_to %>/<%= current_path %>"
 pid "<%= unicorn_pid %>"
 stderr_path "<%= unicorn_log %>"
 stdout_path "<%= unicorn_log %>"
 preload_app true
 
-listen "/tmp/unicorn.<%= "#{application}_#{stage}" %>.sock"
+listen "/tmp/unicorn.<%= "#{application}_#{deploy_server}" %>.sock"
 worker_processes <%= unicorn_workers %>
 timeout 30
 

data/lib/trireme/templates/{config/recipes → lib/mina}/templates/unicorn_init.erb

@@ -12,9 +12,9 @@ set -e
 
 # Feel free to change any of the following variables for your app:
 TIMEOUT=${TIMEOUT-60}
-APP_ROOT=<%= current_path %>
+APP_ROOT=<%= deploy_to %>/current
 PID=<%= unicorn_pid %>
-CMD="cd <%= current_path %>; bundle exec unicorn -D -c <%= unicorn_config %> -E <%= rails_env %>"
+CMD="cd $APP_ROOT; bundle exec unicorn -D -c <%= unicorn_config %> -E <%= rails_env %>"
 AS_USER=<%= unicorn_user %>
 set -u
 

data/lib/trireme/templates/lib/mina/unicorn.rb

@@ -0,0 +1,21 @@
+namespace :unicorn do
+  desc "Setup Unicorn initializer and app configuration"
+  task :setup do
+    queue 'echo "-----> Creating unicorn configuration file"'
+    queue "mkdir -p #{shared_path}/config"
+    template "unicorn.rb.erb", unicorn_config
+
+    queue 'echo "-----> Creating unicorn init script"'
+    template "unicorn_init.erb", unicorn_script, :tee, :sudo
+    queue echo_cmd "sudo chmod +x #{unicorn_script}"
+    queue echo_cmd "sudo update-rc.d -f unicorn_#{application}_#{deploy_server} defaults"
+  end
+
+  %w[start stop restart].each do |command|
+    desc "#{command.capitalize} unicorn"
+    task command do
+      queue %{echo "-----> #{command.capitalize} Unicorn"}
+      queue echo_cmd "/etc/init.d/unicorn_#{application}_#{deploy_server} #{command}"
+    end
+  end
+end

data/lib/trireme/templates/lib/mina/utility.rb

@@ -0,0 +1,44 @@
+task :setup do
+  invoke :create_extra_paths
+  invoke :'postgresql:setup'
+  invoke :'nginx:setup'
+  invoke :'unicorn:setup'
+  invoke :'logrotate:setup'
+end
+
+task :echo_config do
+  queue %{echo #{rails_env}}
+  queue %{echo #{deploy_to}}
+  queue %{echo #{shared_path}}
+  queue %{echo #{shared_paths.first}}
+end
+
+task :create_extra_paths do
+  queue 'echo "-----> Create configs path"'
+  queue echo_cmd "mkdir -p #{config_path}"
+
+  queue 'echo "-----> Create shared paths"'
+  shared_dirs = shared_paths.map { |file| "#{deploy_to}/#{shared_path}/#{file}" }.uniq
+  cmds = shared_dirs.map do |dir|
+    queue echo_cmd %{mkdir -p "#{dir}"}
+  end
+
+  queue 'echo "-----> Create PID and Sockets paths"'
+  cmds = [pids_path, sockets_path].map do |path|
+    queue echo_cmd %{mkdir -p #{path}}
+  end
+end
+
+def template(from, to, *opts)
+  queue %{echo "-----> Creating file at #{to} using template #{from}"}
+  if opts.include? :tee
+    command = ''
+    command << 'sudo ' if opts.include? :sudo
+    command << %{tee #{to} <<'zzENDOFFILEzz' > /dev/null\n}
+    command << %{#{erb("#{templates_path}/#{from}")}}
+    command << %{\nzzENDOFFILEzz}
+  else
+    command = %{echo '#{erb("#{templates_path}/#{from}")}' > #{to}}
+  end
+  queue echo_cmd command
+end

data/lib/trireme/templates/lib/templates/erb/scaffold/edit.html.erb

@@ -1,6 +1,6 @@
-<h1>Editing <%= singular_table_name %></h1>
+<h1>Editing <%= human_name %></h1>
 
 <%%= render 'form' %>
 
-<%%= link_to "Show", @<%= singular_table_name %>, class: 'btn btn-primary' %> |
-<%%= link_to "Back to <%= plural_table_name %>", <%= index_helper %>_path, class: 'btn btn-default' %>
+<%%= link_to icon(:info, text: 'Show'), @<%= singular_table_name %>, class: 'btn btn-primary' %> |
+<%%= link_to icon(:arrow_left, text: 'Back to <%= plural_table_name.titleize %>'), <%= index_helper %>_path, class: 'btn btn-default' %>

data/lib/trireme/templates/lib/templates/erb/scaffold/index.html.erb

@@ -1,4 +1,4 @@
-<h1><%= plural_table_name %></h1>
+<h1><%= plural_table_name.titleize %></h1>
 
 <table class="table">
   <thead>
@@ -16,7 +16,11 @@
       <td><%%= <%= singular_table_name %>.<%= attribute.name %> %></td>
   <% end -%>
       <td>
-        <td><%%= render 'shared/admin_actions', obj: category %></td>
+        <td>
+          <%%= link_to icon(:info), <%= singular_table_name %>, class: 'btn btn-primary' %>
+          <%%= link_to icon(:edit), edit_<%= singular_table_name %>_path(<%= singular_table_name %>), class: 'btn btn-warning' %>
+          <%%= link_to icon(:trash_o), <%= singular_table_name %>, method: :delete, data: { confirm: "Are you sure you want to delete the #{human_name} '#{<%= singular_table_name %>}'?" }, class: 'btn btn-danger' %>
+        </td>
       </td>
     <%% end %>
   </tbody>
@@ -24,4 +28,4 @@
 
 <br />
 
-<%%= link_to 'New <%= human_name %>', new_<%= singular_table_name %>_path, class: 'btn btn-default' %>
+<%%= link_to icon(:plus, text: 'New <%= human_name %>'), new_<%= singular_table_name %>_path, class: 'btn btn-success' %>

data/lib/trireme/templates/lib/templates/erb/scaffold/new.html.erb

@@ -1,5 +1,5 @@
-<h1>New <%= singular_table_name %></h1>
+<h1>New <%= human_name %></h1>
 
 <%%= render 'form' %>
 
-<%%= link_to 'Back to <%= plural_table_name %>', <%= index_helper %>_path, class: 'btn btn-default' %>
+<%%= link_to icon(:arrow_left, text: 'Back to <%= plural_table_name.titleize %>'), <%= index_helper %>_path, class: 'btn btn-default' %>

data/lib/trireme/templates/lib/templates/erb/scaffold/show.html.erb

@@ -6,5 +6,5 @@
 
 <% end -%>
 
-<%%= link_to 'Edit', edit_<%= singular_table_name %>_path(@<%= singular_table_name %>), class: 'btn btn-default' %>
-<%%= link_to 'Back to <%= plural_table_name %>', <%= index_helper %>_path, class: 'btn btn-default' %>
+<%%= link_to icon(:edit, text: 'Edit'), edit_<%= singular_table_name %>_path(@<%= singular_table_name %>), class: 'btn btn-default' %>
+<%%= link_to icon(:arrow_left, text: 'Back to <%= plural_table_name.titleize %>'), <%= index_helper %>_path, class: 'btn btn-default' %>

data/lib/trireme/version.rb

@@ -1,3 +1,3 @@
 module Trireme
-  VERSION = "0.0.1"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trireme
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Nathan Sharpe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-01 00:00:00.000000000 Z
+date: 2014-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -57,7 +57,6 @@ files:
 - lib/trireme/app_builder.rb
 - lib/trireme/generators/app_generator.rb
 - lib/trireme/templates/.rspec
-- lib/trireme/templates/Capfile
 - lib/trireme/templates/Guardfile
 - lib/trireme/templates/README.md.erb
 - lib/trireme/templates/additional_gems
@@ -69,28 +68,30 @@ files:
 - lib/trireme/templates/app/views/shared/_flashes.html.erb
 - lib/trireme/templates/app/views/shared/_form_errors.html.erb
 - lib/trireme/templates/config/deploy.rb.erb
-- lib/trireme/templates/config/deploy/production.rb
-- lib/trireme/templates/config/deploy/staging.rb
+- lib/trireme/templates/config/deploy/production.rb.erb
+- lib/trireme/templates/config/deploy/staging.rb.erb
 - lib/trireme/templates/config/environments/development.rb
 - lib/trireme/templates/config/environments/production.rb
 - lib/trireme/templates/config/environments/staging.rb
 - lib/trireme/templates/config/environments/test.rb
 - lib/trireme/templates/config/initializers/better_errors.rb
 - lib/trireme/templates/config/initializers/jazz_hands.rb
-- lib/trireme/templates/config/recipes/base.rb
-- lib/trireme/templates/config/recipes/check.rb
-- lib/trireme/templates/config/recipes/log.rb
-- lib/trireme/templates/config/recipes/logrotate.rb
-- lib/trireme/templates/config/recipes/nginx.rb
-- lib/trireme/templates/config/recipes/postgresql.rb
-- lib/trireme/templates/config/recipes/scripts/sql_functions.sql
-- lib/trireme/templates/config/recipes/templates/logrotate.erb
-- lib/trireme/templates/config/recipes/templates/nginx_unicorn.erb
-- lib/trireme/templates/config/recipes/templates/postgresql.yml.erb
-- lib/trireme/templates/config/recipes/templates/unicorn.rb.erb
-- lib/trireme/templates/config/recipes/templates/unicorn_init.erb
-- lib/trireme/templates/config/recipes/unicorn.rb
 - lib/trireme/templates/gitignore_additions
+- lib/trireme/templates/lib/mina/check.rb
+- lib/trireme/templates/lib/mina/db.rb.erb
+- lib/trireme/templates/lib/mina/defaults.rb
+- lib/trireme/templates/lib/mina/irc.rb.erb
+- lib/trireme/templates/lib/mina/log.rb.erb
+- lib/trireme/templates/lib/mina/logrotate.rb
+- lib/trireme/templates/lib/mina/nginx.rb
+- lib/trireme/templates/lib/mina/postgresql.rb
+- lib/trireme/templates/lib/mina/templates/logrotate.erb
+- lib/trireme/templates/lib/mina/templates/nginx_unicorn.erb
+- lib/trireme/templates/lib/mina/templates/postgresql.yml.erb
+- lib/trireme/templates/lib/mina/templates/unicorn.rb.erb
+- lib/trireme/templates/lib/mina/templates/unicorn_init.erb
+- lib/trireme/templates/lib/mina/unicorn.rb
+- lib/trireme/templates/lib/mina/utility.rb
 - lib/trireme/templates/lib/templates/erb/scaffold/_form.html.erb
 - lib/trireme/templates/lib/templates/erb/scaffold/edit.html.erb
 - lib/trireme/templates/lib/templates/erb/scaffold/index.html.erb

data/lib/trireme/templates/Capfile

@@ -1,4 +0,0 @@
-load 'deploy'
-# Uncomment if you are using Rails' asset pipeline
-load 'deploy/assets'
-load 'config/deploy' # remove this line to skip loading any of the default tasks

data/lib/trireme/templates/config/deploy/production.rb

@@ -1,17 +0,0 @@
-# Domain name for nginx config
-set :domain_name, domain_base
-
-# Remove www from incoming requests
-set :rewrite_www, true
-
-# Include ssl information for nginx
-set :include_ssl, false
-
-# Default, requires setting server_ip
-set :default_host, true
-set :server_ip, "#{server_ip}"
-
-set :unicorn_workers, 1
-
-set :rails_env, "production"
-set :branch, "master"

data/lib/trireme/templates/config/deploy/staging.rb

@@ -1,8 +0,0 @@
-set :domain_name, "demo.#{domain_base}"
-set :rewrite_www, false
-set :include_ssl, false
-set :unicorn_workers, 1
-set :default_host, false
-
-set :rails_env, "staging"
-set :branch, "staging"

data/lib/trireme/templates/config/recipes/base.rb

@@ -1,8 +0,0 @@
-def template(from, to)
-  erb = File.read(File.expand_path("../templates/#{from}", __FILE__))
-  put ERB.new(erb).result(binding), to
-end
-
-def set_default(name, *args, &block)
-  set(name, *args, &block) unless exists?(name)
-end

data/lib/trireme/templates/config/recipes/log.rb

@@ -1,6 +0,0 @@
-namespace :log do
-  desc "View log tail"
-  task :tail, roles: :app do
-    run "tail #{shared_path}/log/#{rails_env}.log -n 50"
-  end
-end

data/lib/trireme/templates/config/recipes/logrotate.rb

@@ -1,8 +0,0 @@
-namespace :logrotate do
-  desc "Setup logrotate for all log files in log directory"
-  task :setup, roles: :app do
-    template "logrotate.erb", "/tmp/logrotate"
-    run "#{sudo} mv /tmp/logrotate /etc/logrotate.d/#{application}_#{stage}"
-  end
-  after "deploy:setup", "logrotate:setup"
-end

data/lib/trireme/templates/config/recipes/nginx.rb

@@ -1,17 +0,0 @@
-namespace :nginx do
-  desc "Setup nginx configuration for this application"
-  task :setup, roles: :web do
-    template "nginx_unicorn.erb", "/tmp/nginx_conf"
-    run "#{sudo} mv /tmp/nginx_conf /etc/nginx/sites-enabled/#{application}_#{stage}"
-    run "#{sudo} rm -f /etc/nginx/sites-enabled/default"
-    restart
-  end
-  after "deploy:setup", "nginx:setup"
-  
-  %w[start stop restart].each do |command|
-    desc "#{command} nginx"
-    task command, roles: :web do
-      run "#{sudo} service nginx #{command}"
-    end
-  end
-end

data/lib/trireme/templates/config/recipes/postgresql.rb

@@ -1,32 +0,0 @@
-set_default(:postgresql_host, "localhost")
-set_default(:postgresql_user) { application }
-set_default(:postgresql_password) { Capistrano::CLI.password_prompt "PostgreSQL Password: " }
-set_default(:postgresql_database) { "#{application}_#{rails_env}" }
-set_default(:postgresql_pid) { "/var/run/postgresql/9.1-main.pid" }
-
-namespace :postgresql do
-  desc "Create a user for this application."
-  task :create_user, roles: :db, only: {primary: true} do
-    run %Q{#{sudo} -u postgres psql -c "create user \"#{postgresql_user}\" with password '#{postgresql_password}';"; true}
-  end
-  after "deploy:setup", "postgresql:create_user"
-
-  desc "Create a database for this application."
-  task :create_database, roles: :db, only: {primary: true} do
-    run %Q{#{sudo} -u postgres psql -c "create database \"#{postgresql_database}\" owner \"#{postgresql_user}\";"; true}
-  end
-  after "deploy:setup", "postgresql:create_database"
-
-  desc "Generate the database.yml configuration file."
-  task :setup, roles: :app do
-    run "mkdir -p #{shared_path}/config"
-    template "postgresql.yml.erb", "#{shared_path}/config/database.yml"
-  end
-  after "deploy:setup", "postgresql:setup"
-
-  desc "Symlink the database.yml file into latest release"
-  task :symlink, roles: :app do
-    run "ln -nfs #{shared_path}/config/database.yml #{release_path}/config/database.yml"
-  end
-  after "deploy:finalize_update", "postgresql:symlink"
-end

data/lib/trireme/templates/config/recipes/scripts/sql_functions.sql

@@ -1,23 +0,0 @@
-CREATE OR REPLACE FUNCTION create_role_if_not_exists(r_name TEXT, r_pass TEXT)
-RETURNS void AS $$
-BEGIN
-	IF NOT EXISTS (
-		SELECT *
-		FROM pg_catalog.pg_user
-		WHERE usename = $1) THEN
-		EXECUTE format('CREATE ROLE %s LOGIN PASSWORD ''%s'' CREATEDB', $1, $2);
-	END IF;
-END;
-$$ LANGUAGE plpgsql;
-
-CREATE OR REPLACE FUNCTION create_database_if_not_exists(db_name TEXT, db_owner TEXT)
-RETURNS void AS $$
-BEGIN
-	IF NOT EXISTS (
-		SELECT *
-		FROM pg_catalog.pg_database
-		WHERE datname = $1) THEN
-		EXECUTE format('CREATE DATABASE %s OWNER %s', $1, $2);
-	END IF;
-END;
-$$ LANGUAGE plpgsql;

data/lib/trireme/templates/config/recipes/unicorn.rb

@@ -1,26 +0,0 @@
-set_default(:unicorn_user) { user }
-set_default(:unicorn_pid) { "#{current_path}/tmp/pids/unicorn.pid" }
-set_default(:unicorn_config) { "#{shared_path}/config/unicorn.rb" }
-set_default(:unicorn_log) { "#{shared_path}/log/unicorn.log" }
-set_default(:unicorn_workers, 2)
-
-namespace :unicorn do
-  desc "Setup Unicorn initializer and app configuration"
-  task :setup, roles: :app do
-    run "mkdir -p #{shared_path}/config"
-    template "unicorn.rb.erb", unicorn_config
-    template "unicorn_init.erb", "/tmp/unicorn_init"
-    run "chmod +x /tmp/unicorn_init"
-    run "#{sudo} mv /tmp/unicorn_init /etc/init.d/unicorn_#{application}_#{rails_env}"
-    run "#{sudo} update-rc.d -f unicorn_#{application}_#{rails_env} defaults"
-  end
-  after "deploy:setup", "unicorn:setup"
-
-  %w[start stop restart].each do |command|
-    desc "#{command.capitalize} unicorn"
-    task command, roles: :app do
-      run "/etc/init.d/unicorn_#{application}_#{stage} #{command}"
-    end
-    after "deploy:#{command}", "unicorn:#{command}"
-  end
-end