standup 0.3.7 → 0.3.8

data/README.md

@@ -35,10 +35,12 @@ You can override this behavior by specifying `keypair_file` param.
       instance_type: m1.small
       ssh_user: ubuntu
     webapp:
+      name: superproject
       github_user: supercoder
       github_repo: superproject
 
 Major part of script params can be set here.
+In `webapp` script `name` param is used for database name and application path.
 
 ### Nodes and their script params
 

data/VERSION

@@ -1 +1 @@
-0.3.7
+0.3.8

data/lib/standup/core_ext.rb

@@ -8,4 +8,9 @@ module Kernel
     bright_p message, HighLine::GREEN
     HighLine.new.ask('') {|q| q.echo = echo}
   end
+  
+  def local_exec command
+    bright_p command
+    `#{command}`
+  end
 end

data/lib/standup/remoting.rb

@@ -51,7 +51,7 @@ module Standup
       raise ArgumentError, 'Only absolute paths allowed' unless path[0,1] == '/'
       old_path = @path
       @path = path
-      result = yield
+      result = yield path
       @path = old_path
       result
     end
@@ -71,6 +71,10 @@ module Standup
       exec "sudo #{command}"
     end
       
+    def su_exec user, command
+      sudo "su -c \"#{command.gsub /"/, '\"'}\" #{user}"
+    end
+      
     def in_temp_dir &block
       tmp_dirname = "/tmp/standup_tmp_#{rand 10000}"
       exec "mkdir #{tmp_dirname}"

data/lib/standup/scripts/node.rb

@@ -11,7 +11,7 @@ module Standup
       delegate :instance, :open_port, :open_ports, :remoting, :scripts,
                :to => :@node
     
-      delegate :download, :upload, :remote_update, :exec, :sudo, :in_dir, :in_temp_dir, :file_exists?, :install_package, :install_packages, :install_gem,
+      delegate :download, :upload, :remote_update, :exec, :sudo, :su_exec, :in_dir, :in_temp_dir, :file_exists?, :install_package, :install_packages, :install_gem,
                :to => :remoting
     
       attr_accessor :node

data/scripts/appconsole.rb

@@ -2,6 +2,6 @@ Standup.script :node do
   self.description = 'Run remote Rails application console'
   
   def run
-    scripts.shell.make_shell "cd /opt/webapp && rails console #{scripts.webapp.params.rails_env}"
+    scripts.shell.make_shell "cd #{scripts.webapp.app_path} && rails console #{scripts.webapp.params.rails_env}"
   end
 end

data/scripts/delayed_job.rb

@@ -1,6 +1,8 @@
 Standup.script :node do
   def run
-    scripts.monit.add_watch script_file('delayed_job_monit.conf')
+    with_processed_file script_file('delayed_job_monit.conf') do |file|
+      scripts.monit.add_watch file
+    end
   end
   
   def restart

data/scripts/delayed_job/delayed_job_monit.conf

@@ -1,4 +1,5 @@
+<% env = "/usr/bin/env PATH=$PATH:/usr/local/bin RAILS_ENV=production" %>
 check process delayed_job
-    with pidfile /opt/webapp/tmp/pids/delayed_job.pid
-    start program = "/usr/bin/env PATH=$PATH:/usr/local/bin RAILS_ENV=production /opt/webapp/script/delayed_job start"
-    stop  program = "/usr/bin/env PATH=$PATH:/usr/local/bin RAILS_ENV=production /opt/webapp/script/delayed_job stop"
+    with pidfile <%= scripts.webapp.app_path %>/tmp/pids/delayed_job.pid
+    start program = "<%= env %> <%= scripts.webapp.app_path %>/script/delayed_job start"
+    stop  program = "<%= env %> <%= scripts.webapp.app_path %>/script/delayed_job stop"

data/scripts/download_db.rb

@@ -0,0 +1,32 @@
+Standup.script :node do
+  self.description = 'Download Rails application database from node to local server'
+  
+  def run
+    in_temp_dir do |dir|
+      exec 'chmod 777 .'
+      su_exec 'postgres', "pg_dump -c #{scripts.webapp.db_name} > dump.sql"
+      local_exec "mkdir -p tmp/db"
+      download "#{dir}/dump.sql",
+               :to => 'tmp/db/dump.sql',
+               :sudo => true
+    end
+    
+    bootstrap_db
+    
+    local_exec "psql #{scripts.webapp.db_name} < tmp/db/dump.sql"
+  end
+  
+  def bootstrap_db
+    unless exec_sql("select * from pg_user where usename = 'webapp'") =~ /1 row/
+      exec_sql "create user webapp with password 'webapp'"
+    end
+    
+    unless exec_sql("select * from pg_database where datname = '#{scripts.webapp.db_name}'") =~ /1 row/
+      exec_sql "create database #{scripts.webapp.db_name} with owner webapp"
+    end
+  end
+  
+  def exec_sql sql, db_name = 'postgres'
+    local_exec "psql #{db_name} -c \"#{sql}\""
+  end
+end

data/scripts/init/standup.yml

@@ -12,6 +12,7 @@ ec2:
   instance_type: m1.small
   ssh_user: ubuntu
 webapp:
+  name: 
   github_user: 
   github_repo: 
 

data/scripts/postgresql.rb

@@ -11,6 +11,12 @@ Standup.script :node do
     sudo 'service postgresql-8.4 restart'
   end
   
+  def exec_sql command
+    su_exec 'postgres', "psql -c \"#{command}\""
+  end
+  
+  protected
+  
   def tune_kernel
     sysctl_params = ['kernel.shmmax=134217728', 'kernel.shmall=2097152']
   

data/scripts/update.rb

@@ -2,13 +2,13 @@ Standup.script :node do
   self.description = 'Update working application'
   
   def run
-    in_dir '/opt/webapp' do
-      sudo 'chown -R ubuntu:ubuntu /opt/webapp'
+    in_dir scripts.webapp.app_path do
+      sudo 'chown -R ubuntu:ubuntu .'
       exec 'git pull'
       sudo 'bundle install'
       sudo "RAILS_ENV=#{scripts.webapp.params.rails_env} rake db:migrate"
       sudo 'mkdir -p tmp'
-      sudo 'chown -R nobody:nogroup /opt/webapp'
+      sudo 'chown -R nobody:nogroup .'
       sudo 'touch tmp/restart.txt'
       scripts.delayed_job.restart if scripts.setup.has_script? 'delayed_job'
     end

data/scripts/upload_db.rb

@@ -0,0 +1,16 @@
+Standup.script :node do
+  self.description = 'Upload Rails application database from local server to node'
+  
+  def run
+    local_exec "mkdir -p tmp/db"
+    local_exec "pg_dump -c #{scripts.webapp.db_name} > tmp/db/dump.sql"
+    
+    in_temp_dir do |dir|
+      upload 'tmp/db/dump.sql',
+             :to => "#{dir}/dump.sql"
+      exec "chmod 777 #{dir}/dump.sql"
+      
+      su_exec 'postgres', "psql #{scripts.webapp.db_name} < #{dir}/dump.sql"
+    end
+  end
+end

data/scripts/watchlog.rb

@@ -2,6 +2,6 @@ Standup.script :node do
   self.description = 'Watch remote Rails application log'
   
   def run
-    scripts.shell.make_shell "tail -n 1000 -f /opt/webapp/log/#{scripts.webapp.params.rails_env}.log"
+    scripts.shell.make_shell "tail -n 1000 -f #{scripts.webapp.app_path}/log/#{scripts.webapp.params.rails_env}.log"
   end
 end

data/scripts/webapp.rb

@@ -1,34 +1,43 @@
 Standup.script :node do
   self.default_params = {
-      :rails_env => 'production'
+      :rails_env => 'production',
+      :name => 'webapp'
   }
   
   def run
     install_package 'git-core'
     install_gem 'bundler'
     
-    unless file_exists? '/opt/webapp'
-      sudo 'mkdir -p /opt/webapp'
+    unless file_exists? scripts.webapp.app_path
+      sudo "mkdir -p #{scripts.webapp.app_path}"
     end
     
-    sudo 'chown -R ubuntu:ubuntu /opt/webapp'
+    sudo "chown -R ubuntu:ubuntu #{scripts.webapp.app_path}"
     
     ensure_github_access
     
-    unless file_exists? '/opt/webapp/.git'
-      exec 'rm -rf /opt/webapp/*'
-      exec "git clone git@github.com:#{params.github_user}/#{params.github_repo}.git /opt/webapp"
+    unless file_exists? "#{scripts.webapp.app_path}/.git"
+      exec "rm -rf #{scripts.webapp.app_path}/*"
+      exec "git clone git@github.com:#{params.github_user}/#{params.github_repo}.git #{scripts.webapp.app_path}"
     end
 
     bootstrap_db
 
-    sudo 'chown -R nobody:nogroup /opt/webapp'
+    sudo "chown -R nobody:nogroup #{scripts.webapp.app_path}"
     
     with_processed_file script_file('webapp.conf') do |file|
-      scripts.passenger.add_server_conf file
+      scripts.passenger.add_server_conf file, "#{params.name}.conf"
     end
   end
   
+  def app_path
+    "/opt/#{params.name}"
+  end
+  
+  def db_name
+    "#{params.name}_#{params.rails_env}"
+  end
+  
   protected
   
   def ensure_github_access
@@ -48,14 +57,14 @@ Standup.script :node do
   end
   
   def bootstrap_db
-    unless run_pg_command("select * from pg_user where usename = 'webapp'") =~ /1 row/
-      run_pg_command "create user webapp with password 'webapp'"
+    unless scripts.postgresql.exec_sql("select * from pg_user where usename = 'webapp'") =~ /1 row/
+      scripts.postgresql.exec_sql "create user webapp with password 'webapp'"
     end
     
-    unless run_pg_command("select * from pg_database where datname = 'webapp'") =~ /1 row/
-      run_pg_command "create database webapp with owner webapp"
+    unless scripts.postgresql.exec_sql("select * from pg_database where datname = '#{db_name}'") =~ /1 row/
+      scripts.postgresql.exec_sql "create database #{db_name} with owner webapp"
       
-      in_dir '/opt/webapp' do
+      in_dir scripts.webapp.app_path do
         sudo 'bundle install'
         exec "RAILS_ENV=#{params.rails_env} rake db:schema:load"
         exec "RAILS_ENV=#{params.rails_env} rake db:seed"
@@ -63,10 +72,6 @@ Standup.script :node do
     end
   end
   
-  def run_pg_command cmd
-    sudo("su -c \"psql -c \\\"#{cmd}\\\"\" postgres")
-  end
-  
   def github_add_deploy_key user, password, repo, title, key
     require 'net/http'
     Net::HTTP.start 'github.com' do |http|

data/scripts/webapp/webapp.conf

@@ -2,7 +2,7 @@ server {
     server_name _;
     listen 80;
     
-    root /opt/webapp/public;
+    root <%= app_path %>/public;
     
     rails_env <%= params.rails_env %>;
     

data/standup.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{standup}
-  s.version = "0.3.7"
+  s.version = "0.3.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ilia Ablamonov", "Cloud Castle Inc."]
-  s.date = %q{2010-11-13}
+  s.date = %q{2010-11-15}
   s.default_executable = %q{standup}
   s.email = %q{ilia@flamefork.ru}
   s.executables = ["standup"]
@@ -43,6 +43,7 @@ Gem::Specification.new do |s|
      "scripts/browse.rb",
      "scripts/delayed_job.rb",
      "scripts/delayed_job/delayed_job_monit.conf",
+     "scripts/download_db.rb",
      "scripts/ec2.rb",
      "scripts/generate.rb",
      "scripts/generate/script.rb",
@@ -65,6 +66,7 @@ Gem::Specification.new do |s|
      "scripts/status.rb",
      "scripts/terminate.rb",
      "scripts/update.rb",
+     "scripts/upload_db.rb",
      "scripts/watchlog.rb",
      "scripts/webapp.rb",
      "scripts/webapp/webapp.conf",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: standup
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 3
   prerelease: false
   segments: 
   - 0
   - 3
-  - 7
-  version: 0.3.7
+  - 8
+  version: 0.3.8
 platform: ruby
 authors: 
 - Ilia Ablamonov
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-13 00:00:00 +03:00
+date: 2010-11-15 00:00:00 +03:00
 default_executable: standup
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -160,6 +160,7 @@ files:
 - scripts/browse.rb
 - scripts/delayed_job.rb
 - scripts/delayed_job/delayed_job_monit.conf
+- scripts/download_db.rb
 - scripts/ec2.rb
 - scripts/generate.rb
 - scripts/generate/script.rb
@@ -182,6 +183,7 @@ files:
 - scripts/status.rb
 - scripts/terminate.rb
 - scripts/update.rb
+- scripts/upload_db.rb
 - scripts/watchlog.rb
 - scripts/webapp.rb
 - scripts/webapp/webapp.conf