ricodigo-capistrano-recipes 0.1.5 → 0.1.6

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/bin/ricodigo-install-server

@@ -21,7 +21,7 @@ def setup_repos(ssh)
   ssh.exec! 'sudo apt-key adv --keyserver keyserver.ubuntu.com --recv 7F0CEB10' do |c,s,d|
     puts d
   end
-  
+
   ssh.exec! "sudo apt-get update" do |c,s,d|
     puts d
   end
@@ -30,8 +30,8 @@ end
 def install_packages(ssh)
   puts ">> Installing packages..."
   packages = %w[
-    bind9 build-essential ufw libreadline6-dev git-core 
-    libxslt1-dev libxml2-dev libssl-dev nginx mongodb-10gen curl 
+    bind9 build-essential ufw libreadline6-dev git-core
+    libxslt1-dev libxml2-dev libssl-dev nginx mongodb-10gen curl
     libcurl4-openssl-dev graphicsmagick openjdk-6-jre-headless libsasl2-dev
   ]
 
@@ -71,7 +71,7 @@ end
 
 def setup_firewall(ssh)
   puts ">> Setup firewall..."
-  
+
   ssh.exec! "sudo ufw disable" do |channel, stream, data|
     puts data
   end
@@ -84,9 +84,9 @@ def setup_firewall(ssh)
   commands << "sudo ufw allow to any port 25"
   commands << "sudo ufw allow to any port 587"
   commands << "sudo ufw default deny"
-  
+
   ssh.exec!(commands.join(" && ")) {|c,s,d| puts d }
-  ssh.exec!("sudo ufw enable") {|c,s,d| puts d }
+  ssh.exec!("sudo ufw enable") {|c,s,d| puts d; d.send_data("yes") }
 
   ssh.exec! "iptables -A INPUT -m state --state ESTABLISHED,RELATED -j ACCEPT"
   ssh.exec! "iptables -A INPUT -i lo -j ACCEPT"
@@ -116,17 +116,17 @@ end
 
 def install_gems(ssh)
   puts ">> Installing required gems..."
-  
+
   command = %@
 echo "gem: --no-ri --no-rdoc" >> /etc/gemrc
 echo "update: --no-ri --no-rdoc" >> /etc/gemrc
 echo "install: --no-ri --no-rdoc" >> /etc/gemrc
 @
   ssh.exec!("sudo bash -c '#{command}'") {|c,s,d| puts d }
-  
+
   gems = %w[
-    rails mongoid whenever capistrano unicorn mongoid_ext magent 
-    bson_ext sanitize uuidtools ruby-stemmer mini_magick magic 
+    rails mongoid whenever capistrano unicorn mongoid_ext magent
+    bson_ext sanitize uuidtools ruby-stemmer mini_magick magic
     haml sass compass mechanize nokogiri rdiscount
   ]
 
@@ -136,10 +136,10 @@ echo "install: --no-ri --no-rdoc" >> /etc/gemrc
 end
 
 Net::SSH.start(host, user) do |ssh|
-#   setup_repos(ssh)
-#   install_packages(ssh)
-#   install_postfix(ssh)
-#   setup_firewall(ssh) unless host =~ /amazonaws\.com$/
-#   install_rvm(ssh)
+  setup_repos(ssh)
+  install_packages(ssh)
+  install_postfix(ssh)
+  setup_firewall(ssh) unless host =~ /amazonaws\.com$/
+  install_rvm(ssh)
   install_gems(ssh)
 end

data/generators/unicorn.rb.erb

@@ -29,9 +29,8 @@ before_fork do |server, worker|
   if File.exists?(old_pid) && server.pid != old_pid
     pid = File.read(old_pid).to_i
     begin
+      puts ">> Killing old unicorn process"
       Process.kill("QUIT", pid)
-      Process.kill(0, pid)
-      Process.wait
     rescue Errno::ECHILD, Errno::ESRCH => e
       $stderr.puts ">> Process #{pid} has stopped"
     rescue Errno::ENOENT => e

data/lib/recipes/push_deploy.rb

@@ -0,0 +1,45 @@
+Capistrano::Configuration.instance.load do
+  namespace :push_deploy do
+    set(:push_deploy_repo) { "/home/#{user}/code/#{application}"}
+    desc "setup everything to deploy via push"
+    task :setup, :roles => :app  do
+      server = roles[:app].servers.first
+
+      run "rm -rf #{push_deploy_repo}"
+      run "mkdir -p ~/code"
+      run "git clone --depth=1 #{repository} #{push_deploy_repo}"
+      run "cd #{push_deploy_repo} && git config receive.denyCurrentBranch ignore"
+
+      hook = %@#!/bin/bash
+cd ..
+GIT_DIR=$(pwd)/.git
+git reset --hard master
+git update-server-info
+unset GIT_DIR
+
+bundle install
+cap #{environment} deploy
+@
+      hook_path = "#{push_deploy_repo}/.git/hooks/post-receive"
+      put hook, hook_path
+      run "chmod 755 #{hook_path}"
+
+      puts %@
+
+== Instructions
+
+add deploy repository to your remotes
+
+  git remote add deploy #{user}\@#{server}:#{push_deploy_repo}
+
+add this to your deploy.rb
+
+  set :repository, "#{user}\@#{server}:#{push_deploy_repo}"
+
+to deploy a branch just type:
+
+  git push deploy your_branch:master -f
+@
+    end
+  end
+end

data/ricodigo-capistrano-recipes.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ricodigo-capistrano-recipes}
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David A. Cuadrado"]
-  s.date = %q{2011-05-26}
+  s.date = %q{2011-05-28}
   s.default_executable = %q{ricodigo-install-server}
   s.description = %q{our capistrano recipes. forked from capistrano-recipes}
   s.email = %q{krawek@gmail.com}
@@ -43,6 +43,7 @@ Gem::Specification.new do |s|
     "lib/recipes/log.rb",
     "lib/recipes/magent.rb",
     "lib/recipes/nginx.rb",
+    "lib/recipes/push_deploy.rb",
     "lib/recipes/symlinks.rb",
     "lib/recipes/unicorn.rb",
     "lib/ricodigo_capistrano_recipes.rb",

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - David A. Cuadrado
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-26 00:00:00 -05:00
+date: 2011-05-28 00:00:00 -05:00
 default_executable: ricodigo-install-server
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -189,6 +189,7 @@ files:
 - lib/recipes/log.rb
 - lib/recipes/magent.rb
 - lib/recipes/nginx.rb
+- lib/recipes/push_deploy.rb
 - lib/recipes/symlinks.rb
 - lib/recipes/unicorn.rb
 - lib/ricodigo_capistrano_recipes.rb
@@ -207,7 +208,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2507973693654577722
+      hash: 2802268916006337518
       segments: 
       - 0
       version: "0"