nswebgen 0.5.6 → 0.5.7

data/lib/nsweb/generators/nsweb/app/app_generator.rb

@@ -30,6 +30,9 @@ class AppBuilder < Rails::AppBuilder
       template 'memcache.yml'
       template 'deploy.rb'
       template 'unicorn.rb'
+      template 'unicorn_init_customer_qa.sh'
+      template 'unicorn_init_production.sh'
+      template 'unicorn_init_shareone_qa.sh'
 
       empty_directory 'environments'
 
@@ -103,6 +106,11 @@ EOB
 
   def test
   end
+
+  def vendor
+    directory('bundler', '.bundle')
+    super
+  end
 end
 
 module Nsweb
@@ -136,15 +144,15 @@ module Nsweb
 
     def run!
       self.destination_root = app_path
+      puts "destination_root: #{self.destination_root}"
 
       validate_options!
 
       generate_rails
 
-      init_bundler
       init_nsweb
       init_database
-      capify!
+      bundle_command 'exec capify .'
       gsub_file 'Capfile', /^# (load 'deploy\/assets.*)/, '\1'
       init_git
 
@@ -214,27 +222,12 @@ module Nsweb
     def generate_rails
       rails_options = options.dup
       rails_options[:skip_test_unit] = true
-      #rails_options[:skip_bundle] = true
       rails_options[:skip_javascript] = true
 
       Rails::Generators::AppGenerator.new([app_path], rails_options).invoke_all
-      add_source "http://gems.nssecuretesting.org/"
-    end
-
-    def init_bundler
-      directory('bundler', '.bundler')
-      run_bundle
     end
 
     def init_nsweb
-      append_file 'Gemfile' do
-        <<-EOF.strip_heredoc
-          ##### NSWEB GEMS #####
-          #gem 'nsweb'
-          gem 'nsweb', :path => '../../nsweb'
-          ### END NSWEB GEMS ###
-        EOF
-      end
       generate(:session_migration)
       rake('nsweb:install:migrations')
       args = []

data/lib/nsweb/generators/nsweb/app/templates/Gemfile

@@ -14,6 +14,6 @@ group :development do
 end
 
 ##### NSWEB GEMS #####
-gem 'nsweb', git: 'gitosis@192.168.126.10:nsweb.git'
-#gem 'nsweb', path: '../../nsweb'
+#gem 'nsweb', git: 'gitosis@192.168.126.10:nsweb.git'
+gem 'nsweb', path: '../../nsweb'
 ### END NSWEB GEMS ###

data/lib/nsweb/generators/nsweb/app/templates/bundler/config.tt

@@ -0,0 +1,3 @@
+---
+BUNDLE_PATH: vendor/bundle
+BUNDLE_DISABLE_SHARED_GEMS: "1"

data/lib/nsweb/generators/nsweb/app/templates/config/unicorn.rb

@@ -1,12 +1,3 @@
-# Sample verbose configuration file for Unicorn (not Rack)
-#
-# This configuration file documents many features of Unicorn
-# that may not be needed for some applications. See
-# http://unicorn.bogomips.org/examples/unicorn.conf.minimal.rb
-# for a much simpler configuration file.
-#
-# See http://unicorn.bogomips.org/Unicorn/Configurator.html for complete
-# documentation.
 rack_env = ENV['RACK_ENV'] || 'development'
 
 # Use at least one worker per core if you're on a dedicated server,
@@ -19,84 +10,14 @@ else
   worker_processes 1
 end
 
-# Since Unicorn is never exposed to outside clients, it does not need to
-# run on the standard HTTP port (80), there is no reason to start Unicorn
-# as root unless it's from system init scripts.
-# If running the master process as root and the workers as an unprivileged
-# user, do this to switch euid/egid in the workers (also chowns logs):
-# user "unprivileged_user", "unprivileged_group"
+APP_PATH = "/var/www/<%= @app_name %>"
+working_directory APP_PATH + "/current"
 
-# Help ensure your application will always spawn in the symlinked
-# "current" directory that Capistrano sets up.
-APP_PATH = "/var/www/<%= @app_name %>" # available in 0.94.0+
-working_directory APP_PATH + "/current" # available in 0.94.0+
+listen "/var/tmp/<%= @app_name %>.sock", backlog: 64
 
-# listen on both a Unix domain socket and a TCP port,
-# we use a shorter backlog for quicker failover when busy
-listen "/var/tmp/<%= @app_name %>.sock", :backlog => 64
-#listen 8080, :tcp_nopush => true
+timeout 60
 
-# nuke workers after 30 seconds instead of 60 seconds (the default)
-timeout 30
-
-# feel free to point this anywhere accessible on the filesystem
 pid APP_PATH + "/shared/pids/unicorn.pid"
 
-# By default, the Unicorn logger will write to stderr.
-# Additionally, ome applications/frameworks log to stderr or stdout,
-# so prevent them from going to /dev/null when daemonized here:
 stderr_path APP_PATH + "/shared/log/unicorn.stderr.log"
 stdout_path APP_PATH + "/shared/log/unicorn.stdout.log"
-
-# combine Ruby 2.0.0dev or REE with "preload_app true" for memory savings
-# http://rubyenterpriseedition.com/faq.html#adapt_apps_for_cow
-preload_app true
-GC.respond_to?(:copy_on_write_friendly=) and
-  GC.copy_on_write_friendly = true
-
-before_fork do |server, worker|
-  # the following is highly recomended for Rails + "preload_app true"
-  # as there's no need for the master process to hold a connection
-  defined?(ActiveRecord::Base) and
-    ActiveRecord::Base.connection.disconnect!
-
-  # The following is only recommended for memory/DB-constrained
-  # installations.  It is not needed if your system can house
-  # twice as many worker_processes as you have configured.
-  #
-  # # This allows a new master process to incrementally
-  # # phase out the old master process with SIGTTOU to avoid a
-  # # thundering herd (especially in the "preload_app false" case)
-  # # when doing a transparent upgrade.  The last worker spawned
-  # # will then kill off the old master process with a SIGQUIT.
-  # old_pid = "#{server.config[:pid]}.oldbin"
-  # if old_pid != server.pid
-  #   begin
-  #     sig = (worker.nr + 1) >= server.worker_processes ? :QUIT : :TTOU
-  #     Process.kill(sig, File.read(old_pid).to_i)
-  #   rescue Errno::ENOENT, Errno::ESRCH
-  #   end
-  # end
-  #
-  # Throttle the master from forking too quickly by sleeping.  Due
-  # to the implementation of standard Unix signal handlers, this
-  # helps (but does not completely) prevent identical, repeated signals
-  # from being lost when the receiving process is busy.
-  # sleep 1
-end
-
-after_fork do |server, worker|
-  # per-process listener ports for debugging/admin/migrations
-  # addr = "127.0.0.1:#{9293 + worker.nr}"
-  # server.listen(addr, :tries => -1, :delay => 5, :tcp_nopush => true)
-
-  # the following is *required* for Rails + "preload_app true",
-  defined?(ActiveRecord::Base) and
-    ActiveRecord::Base.establish_connection
-
-  # if preload_app is true, then you may also want to check and
-  # restart any other shared sockets/descriptors such as Memcached,
-  # and Redis.  TokyoCabinet file handles are safe to reuse
-  # between any number of forked children (assuming your kernel
-  # correctly implements pread()/pwrite() system calls)
-end

data/lib/nsweb/generators/nsweb/app/templates/config/unicorn_init_customer_qa.sh

@@ -0,0 +1,85 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          unicorn_<%= @app_name %>
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Manage unicorn server for <%= @app_name %>
+# Description:       Start, stop, restart unicorn server for <%= @app_name %>
+### END INIT INFO
+set -e
+
+# Feel free to change any of the following variables for your app:
+TIMEOUT=${TIMEOUT-60}
+APP_PATH=/var/www/<%= @app_name %>
+PID=$APP_PATH/shared/pids/unicorn.pid
+APP_ROOT=$APP_PATH/current
+CMD="cd $APP_ROOT; bundle exec unicorn -D -c $APP_ROOT/config/unicorn.rb -E customer_qa"
+AS_USER=deployer
+set -u
+
+OLD_PIN="$PID.oldbin"
+
+sig () {
+  test -s "$PID" && kill -$1 `cat $PID`
+}
+
+oldsig () {
+  test -s $OLD_PIN && kill -$1 `cat $OLD_PIN`
+}
+
+run () {
+  if [ "$(id -un)" = "$AS_USER" ]; then
+    eval $1
+  else
+    su -c "$1" - $AS_USER
+  fi
+}
+
+case "$1" in
+start)
+  sig 0 && echo >&2 "Already running" && exit 0
+  run "$CMD"
+  ;;
+stop)
+  sig QUIT && exit 0
+  echo >&2 "Not running"
+  ;;
+force-stop)
+  sig TERM && exit 0
+  echo >&2 "Not running"
+  ;;
+restart|reload)
+  sig HUP && echo reloaded OK && exit 0
+  echo >&2 "Couldn't reload, starting '$CMD' instead"
+  run "$CMD"
+  ;;
+upgrade)
+  if sig USR2 && sleep 2 && sig 0 && oldsig QUIT
+  then
+    n=$TIMEOUT
+    while test -s $OLD_PIN && test $n -ge 0
+    do
+      printf '.' && sleep 1 && n=$(( $n - 1 ))
+    done
+    echo
+
+    if test $n -lt 0 && test -s $OLD_PIN
+    then
+      echo >&2 "$OLD_PIN still exists after $TIMEOUT seconds"
+      exit 1
+    fi
+    exit 0
+  fi
+  echo >&2 "Couldn't upgrade, starting '$CMD' instead"
+  run "$CMD"
+  ;;
+reopen-logs)
+  sig USR1
+  ;;
+*)
+  echo >&2 "Usage: $0 <start|stop|restart|upgrade|force-stop|reopen-logs>"
+  exit 1
+  ;;
+esac

data/lib/nsweb/generators/nsweb/app/templates/config/unicorn_init_production.sh

@@ -0,0 +1,85 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          unicorn_<%= @app_name %>
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Manage unicorn server for <%= @app_name %>
+# Description:       Start, stop, restart unicorn server for <%= @app_name %>
+### END INIT INFO
+set -e
+
+# Feel free to change any of the following variables for your app:
+TIMEOUT=${TIMEOUT-60}
+APP_PATH=/var/www/<%= @app_name %>
+PID=$APP_PATH/shared/pids/unicorn.pid
+APP_ROOT=$APP_PATH/current
+CMD="cd $APP_ROOT; bundle exec unicorn -D -c $APP_ROOT/config/unicorn.rb -E production"
+AS_USER=deployer
+set -u
+
+OLD_PIN="$PID.oldbin"
+
+sig () {
+  test -s "$PID" && kill -$1 `cat $PID`
+}
+
+oldsig () {
+  test -s $OLD_PIN && kill -$1 `cat $OLD_PIN`
+}
+
+run () {
+  if [ "$(id -un)" = "$AS_USER" ]; then
+    eval $1
+  else
+    su -c "$1" - $AS_USER
+  fi
+}
+
+case "$1" in
+start)
+  sig 0 && echo >&2 "Already running" && exit 0
+  run "$CMD"
+  ;;
+stop)
+  sig QUIT && exit 0
+  echo >&2 "Not running"
+  ;;
+force-stop)
+  sig TERM && exit 0
+  echo >&2 "Not running"
+  ;;
+restart|reload)
+  sig HUP && echo reloaded OK && exit 0
+  echo >&2 "Couldn't reload, starting '$CMD' instead"
+  run "$CMD"
+  ;;
+upgrade)
+  if sig USR2 && sleep 2 && sig 0 && oldsig QUIT
+  then
+    n=$TIMEOUT
+    while test -s $OLD_PIN && test $n -ge 0
+    do
+      printf '.' && sleep 1 && n=$(( $n - 1 ))
+    done
+    echo
+
+    if test $n -lt 0 && test -s $OLD_PIN
+    then
+      echo >&2 "$OLD_PIN still exists after $TIMEOUT seconds"
+      exit 1
+    fi
+    exit 0
+  fi
+  echo >&2 "Couldn't upgrade, starting '$CMD' instead"
+  run "$CMD"
+  ;;
+reopen-logs)
+  sig USR1
+  ;;
+*)
+  echo >&2 "Usage: $0 <start|stop|restart|upgrade|force-stop|reopen-logs>"
+  exit 1
+  ;;
+esac

data/lib/nsweb/generators/nsweb/app/templates/config/unicorn_init_shareone_qa.sh

@@ -0,0 +1,85 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          unicorn_<%= @app_name %>
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Manage unicorn server for <%= @app_name %>
+# Description:       Start, stop, restart unicorn server for <%= @app_name %>
+### END INIT INFO
+set -e
+
+# Feel free to change any of the following variables for your app:
+TIMEOUT=${TIMEOUT-60}
+APP_PATH=/var/www/<%= @app_name %>
+PID=$APP_PATH/shared/pids/unicorn.pid
+APP_ROOT=$APP_PATH/current
+CMD="cd $APP_ROOT; bundle exec unicorn -D -c $APP_ROOT/config/unicorn.rb -E shareone_qa"
+AS_USER=deployer
+set -u
+
+OLD_PIN="$PID.oldbin"
+
+sig () {
+  test -s "$PID" && kill -$1 `cat $PID`
+}
+
+oldsig () {
+  test -s $OLD_PIN && kill -$1 `cat $OLD_PIN`
+}
+
+run () {
+  if [ "$(id -un)" = "$AS_USER" ]; then
+    eval $1
+  else
+    su -c "$1" - $AS_USER
+  fi
+}
+
+case "$1" in
+start)
+  sig 0 && echo >&2 "Already running" && exit 0
+  run "$CMD"
+  ;;
+stop)
+  sig QUIT && exit 0
+  echo >&2 "Not running"
+  ;;
+force-stop)
+  sig TERM && exit 0
+  echo >&2 "Not running"
+  ;;
+restart|reload)
+  sig HUP && echo reloaded OK && exit 0
+  echo >&2 "Couldn't reload, starting '$CMD' instead"
+  run "$CMD"
+  ;;
+upgrade)
+  if sig USR2 && sleep 2 && sig 0 && oldsig QUIT
+  then
+    n=$TIMEOUT
+    while test -s $OLD_PIN && test $n -ge 0
+    do
+      printf '.' && sleep 1 && n=$(( $n - 1 ))
+    done
+    echo
+
+    if test $n -lt 0 && test -s $OLD_PIN
+    then
+      echo >&2 "$OLD_PIN still exists after $TIMEOUT seconds"
+      exit 1
+    fi
+    exit 0
+  fi
+  echo >&2 "Couldn't upgrade, starting '$CMD' instead"
+  run "$CMD"
+  ;;
+reopen-logs)
+  sig USR1
+  ;;
+*)
+  echo >&2 "Usage: $0 <start|stop|restart|upgrade|force-stop|reopen-logs>"
+  exit 1
+  ;;
+esac

data/lib/nsweb/generators/nsweb/app/templates/config/vhosts/customer_qa.vhost.tt

@@ -45,7 +45,7 @@ server {
 		}
 	}
 
-	error_page 500 502 503 504 /500.html;
+	error_page 500 502 504 /500.html;
 	location = /500.html {
 		root /var/www/<%= @app_name %>/current/public;
 	}

data/lib/nsweb/generators/nsweb/app/templates/gitignore

@@ -12,4 +12,4 @@ db/schema.rb
 coverage/
 doc/
 pkg/
-public/**/nsweb
+vendor/bundle

data/lib/nswebgen/version.rb

@@ -3,5 +3,5 @@
 #
 
 module Nswebgen
-  VERSION = '0.5.6' # Current Nswebgen version
+  VERSION = '0.5.7' # Current Nswebgen version
 end

metadata

@@ -2,7 +2,7 @@
 name: nswebgen
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.6
+  version: 0.5.7
 platform: ruby
 authors: 
 - John C. Burr
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-27 00:00:00 Z
+date: 2012-05-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: railties
@@ -64,12 +64,16 @@ files:
 - lib/nsweb/generators/nsweb/app/app_generator.rb
 - lib/nsweb/generators/nsweb/app/templates/Gemfile
 - lib/nsweb/generators/nsweb/app/templates/README
+- lib/nsweb/generators/nsweb/app/templates/bundler/config.tt
 - lib/nsweb/generators/nsweb/app/templates/config/database.yml
 - lib/nsweb/generators/nsweb/app/templates/config/deploy.rb
 - lib/nsweb/generators/nsweb/app/templates/config/initializers/session_store.rb.tt
 - lib/nsweb/generators/nsweb/app/templates/config/memcache.yml
 - lib/nsweb/generators/nsweb/app/templates/config/routes.rb
 - lib/nsweb/generators/nsweb/app/templates/config/unicorn.rb
+- lib/nsweb/generators/nsweb/app/templates/config/unicorn_init_customer_qa.sh
+- lib/nsweb/generators/nsweb/app/templates/config/unicorn_init_production.sh
+- lib/nsweb/generators/nsweb/app/templates/config/unicorn_init_shareone_qa.sh
 - lib/nsweb/generators/nsweb/app/templates/config/vhosts/customer_qa.vhost.tt
 - lib/nsweb/generators/nsweb/app/templates/config/vhosts/production.vhost.tt
 - lib/nsweb/generators/nsweb/app/templates/gitignore
@@ -91,7 +95,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 880395521
+      hash: 260496689
       segments: 
       - 0
       version: "0"