youthtree-capistrano 0.2.2 → 0.3.0

data/lib/youth_tree/capistrano/git_submodule_fix.rb

@@ -0,0 +1,36 @@
+require 'capistrano/recipes/deploy/scm/git'
+
+Capistrano::Deploy::SCM::Git.class_eval do
+  
+  # Performs a clone on the remote machine, then checkout on the branch you want to deploy.
+  # This differs from the normal version in that it adds recursive to the --update command.
+  def checkout(revision, destination)
+    git    = command
+    remote = origin
+
+    args = []
+    args << "-o #{remote}" unless remote == 'origin'
+    if depth = variable(:git_shallow_clone)
+      args << "--depth #{depth}"
+    end
+
+    execute = []
+    if args.empty?
+      execute << "#{git} clone #{verbose} #{variable(:repository)} #{destination}"
+    else
+      execute << "#{git} clone #{verbose} #{args.join(' ')} #{variable(:repository)} #{destination}"
+    end
+
+    # checkout into a local branch rather than a detached HEAD
+    execute << "cd #{destination} && #{git} checkout #{verbose} -b deploy #{revision}"
+    
+    if variable(:git_enable_submodules)
+      execute << "#{git} submodule #{verbose} init"
+      execute << "#{git} submodule #{verbose} sync"
+      execute << "#{git} submodule #{verbose} update --recursive"
+    end
+
+    execute.join(" && ")
+  end
+  
+end

data/lib/youth_tree/capistrano.rb

@@ -1,6 +1,6 @@
 module YouthTree
   module Capistrano
-    VERSION = "0.2.2".freeze
+    VERSION = "0.3.0".freeze
     
     def self.load(&blk)
       ::Capistrano::Configuration.instance(:must_exist).load(&blk)
@@ -15,6 +15,7 @@ module YouthTree
     end
     
     def self.load_all!
+      require 'youth_tree/capistrano/git_submodule_fix'
       load_recipe! %w(base rvm git bundler settings db unicorn compass barista jammit uploads syncing)
       load { load 'deploy' }
       load_recipe! 'deploy_hooks'

data/lib/youth_tree/recipes/deploy_hooks.rb

@@ -1,19 +1,19 @@
 YouthTree::Capistrano.load do
   
   namespace :deploy do
-    desc "Call unicorn.start"
+    desc "Call start on your server"
     task :start, :roles => :app do
-      unicorn.start
+      send(server_name.to_sym).start
     end
     
-    desc "Call unicorn.stop"
+    desc "Call stop on your server"
     task :stop, :roles => :app do
-      unicorn.stop
+      send(server_name.to_sym).stop
     end
     
-    desc "Call unicorn.restart"
+    desc "Call restart on your server"
     task :restart, :roles => :app, :except => { :no_release => true } do
-      unicorn.restart
+      send(server_name.to_sym).restart
     end
   end
   

data/lib/youth_tree/recipes/passenger.rb

@@ -0,0 +1,24 @@
+YouthTree::Capistrano.load_named(:passenger) do
+  
+  yt_cset :passenger_restart_file, 'tmp/restart.txt'
+  yt_cset :server_name,            'passenger'
+  
+  namespace :passenger do
+
+    desc "Starts the passenger app server"
+    task :start, :roles => :app do
+    end
+
+    desc "Stops the passenger app server"
+    task :stop, :roles => :app do
+    end
+
+    desc "Restarts passenger"
+    task :restart, :roles => :app do
+      file = File.join(current_path, passenger_restart_file)
+      run "mkdir -p '#{File.dirname(file)}' && touch '#{file}'"
+    end
+    
+  end
+  
+end

data/lib/youth_tree/recipes/unicorn.rb

@@ -4,6 +4,8 @@ YouthTree::Capistrano.load_named(:unicorn) do
   yt_cset :unicorn_shared_config, 'unicorn.rb'
   yt_cset :unicorn_latest_config, 'config/unicorn.rb'
   yt_cset :unicorn_pid_file,      'tmp/pids'
+  yt_cset :server_name,           'unicorn'
+  
   
   namespace :unicorn do
     

data/youthtree-capistrano.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{youthtree-capistrano}
-  s.version = "0.2.2"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Darcy Laycock"]
-  s.date = %q{2010-09-18}
+  s.date = %q{2011-01-03}
   s.description = %q{Capistrano tasks used for common Youth Tree deployments.}
   s.email = %q{sutto@sutto.net}
   s.extra_rdoc_files = [
@@ -17,26 +17,27 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     "README.md",
-     "Rakefile",
-     "lib/youth_tree/capistrano.rb",
-     "lib/youth_tree/recipes/barista.rb",
-     "lib/youth_tree/recipes/base.rb",
-     "lib/youth_tree/recipes/bundler.rb",
-     "lib/youth_tree/recipes/compass.rb",
-     "lib/youth_tree/recipes/db.rb",
-     "lib/youth_tree/recipes/deploy_hooks.rb",
-     "lib/youth_tree/recipes/git.rb",
-     "lib/youth_tree/recipes/jammit.rb",
-     "lib/youth_tree/recipes/rvm.rb",
-     "lib/youth_tree/recipes/settings.rb",
-     "lib/youth_tree/recipes/syncing.rb",
-     "lib/youth_tree/recipes/unicorn.rb",
-     "lib/youth_tree/recipes/uploads.rb",
-     "lib/youthtree-capistrano.rb",
-     "youthtree-capistrano.gemspec"
+    "Rakefile",
+    "lib/youth_tree/capistrano.rb",
+    "lib/youth_tree/capistrano/git_submodule_fix.rb",
+    "lib/youth_tree/recipes/barista.rb",
+    "lib/youth_tree/recipes/base.rb",
+    "lib/youth_tree/recipes/bundler.rb",
+    "lib/youth_tree/recipes/compass.rb",
+    "lib/youth_tree/recipes/db.rb",
+    "lib/youth_tree/recipes/deploy_hooks.rb",
+    "lib/youth_tree/recipes/git.rb",
+    "lib/youth_tree/recipes/jammit.rb",
+    "lib/youth_tree/recipes/passenger.rb",
+    "lib/youth_tree/recipes/rvm.rb",
+    "lib/youth_tree/recipes/settings.rb",
+    "lib/youth_tree/recipes/syncing.rb",
+    "lib/youth_tree/recipes/unicorn.rb",
+    "lib/youth_tree/recipes/uploads.rb",
+    "lib/youthtree-capistrano.rb",
+    "youthtree-capistrano.gemspec"
   ]
   s.homepage = %q{http://github.com/YouthTree/youthtree-capistrano}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Capistrano tasks used for common Youth Tree deployments.}

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 2
-  version: 0.2.2
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Darcy Laycock
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-18 00:00:00 +08:00
+date: 2011-01-03 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -88,6 +88,7 @@ files:
 - README.md
 - Rakefile
 - lib/youth_tree/capistrano.rb
+- lib/youth_tree/capistrano/git_submodule_fix.rb
 - lib/youth_tree/recipes/barista.rb
 - lib/youth_tree/recipes/base.rb
 - lib/youth_tree/recipes/bundler.rb
@@ -96,6 +97,7 @@ files:
 - lib/youth_tree/recipes/deploy_hooks.rb
 - lib/youth_tree/recipes/git.rb
 - lib/youth_tree/recipes/jammit.rb
+- lib/youth_tree/recipes/passenger.rb
 - lib/youth_tree/recipes/rvm.rb
 - lib/youth_tree/recipes/settings.rb
 - lib/youth_tree/recipes/syncing.rb
@@ -108,8 +110,8 @@ homepage: http://github.com/YouthTree/youthtree-capistrano
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement