capper 0.1.0 → 0.2.0

data/.gitignore

@@ -0,0 +1,48 @@
+# rcov generated
+coverage
+
+# rdoc generated
+rdoc
+
+# yard generated
+doc
+.yardoc
+
+# bundler
+.bundle
+
+# jeweler generated
+pkg
+
+# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore: 
+#
+# * Create a file at ~/.gitignore
+# * Include files you want ignored
+# * Run: git config --global core.excludesfile ~/.gitignore
+#
+# After doing this, these files will be ignored in all your git projects,
+# saving you from having to 'pollute' every project you touch with them
+#
+# Not sure what to needs to be ignored for particular editors/OSes? Here's some ideas to get you started. (Remember, remove the leading # of the line)
+#
+# For MacOS:
+#
+#.DS_Store
+
+# For TextMate
+#*.tmproj
+#tmtags
+
+# For emacs:
+#*~
+#\#*
+#.\#*
+
+# For vim:
+#*.swp
+
+# For redcar:
+#.redcar
+
+# For rubinius:
+#*.rbc

data/Gemfile

@@ -1,10 +1,3 @@
 source :rubygems
 
-gem 'erubis'
-
-group :development do
-  gem "shoulda", ">= 0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.6.4"
-  gem "rcov", ">= 0"
-end
+gemspec

data/Gemfile.lock

@@ -1,22 +1,34 @@
+PATH
+  remote: .
+  specs:
+    capper (0.1.0)
+      capistrano
+      capistrano_colors
+      erubis
+
 GEM
   remote: http://rubygems.org/
   specs:
+    capistrano (2.6.0)
+      highline
+      net-scp (>= 1.0.0)
+      net-sftp (>= 2.0.0)
+      net-ssh (>= 2.0.14)
+      net-ssh-gateway (>= 1.1.0)
+    capistrano_colors (0.5.4)
     erubis (2.7.0)
-    git (1.2.5)
-    jeweler (1.6.4)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-    rake (0.9.2)
-    rcov (0.9.9)
-    shoulda (2.11.3)
+    highline (1.6.2)
+    net-scp (1.0.4)
+      net-ssh (>= 1.99.1)
+    net-sftp (2.0.5)
+      net-ssh (>= 2.0.9)
+    net-ssh (2.1.4)
+    net-ssh-gateway (1.1.0)
+      net-ssh (>= 1.99.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (~> 1.0.0)
-  erubis
-  jeweler (~> 1.6.4)
-  rcov
-  shoulda
+  capper!

data/{README.rdoc → README.md}

@@ -1,8 +1,8 @@
-= capper
+# capper
 
 Capper is a collection of opinionated Capistrano recipes
 
-== Contributing to capper
+## Contributing to capper
 
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
 * Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
@@ -10,8 +10,7 @@ Capper is a collection of opinionated Capistrano recipes
 * Start a feature/bugfix branch
 * Commit and push until you are happy with your contribution
 
-== Copyright
+## Copyright
 
 Copyright (c) 2011 Benedikt Böhm. See LICENSE.txt for
 further details.
-

data/Rakefile

@@ -1,28 +1,10 @@
 # encoding: utf-8
 
 require 'rubygems'
-require 'bundler'
 
 begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
+  require 'bundler'
+  Bundler::GemHelper.install_tasks
+rescue LoadError
+  $stderr.puts "Bundler not installed. You should install it with: gem install bundler"
 end
-
-require 'rake'
-require 'jeweler'
-
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "capper"
-  gem.homepage = "http://github.com/hollow/capper"
-  gem.license = "MIT"
-  gem.summary = %Q{Capistrano extensions for easy deployment}
-  gem.description = %Q{Capistrano extensions for easy deployment}
-  gem.email = "bb@xnull.de"
-  gem.authors = ["Benedikt Böhm"]
-end
-
-Jeweler::RubygemsDotOrgTasks.new

data/capper.gemspec

@@ -1,70 +1,23 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
 Gem::Specification.new do |s|
-  s.name = %q{capper}
-  s.version = "0.1.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Benedikt Böhm"]
-  s.date = %q{2011-07-12}
-  s.description = %q{Capistrano extensions for easy deployment}
-  s.email = %q{bb@xnull.de}
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-    ".rvmrc",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.txt",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "capper.gemspec",
-    "lib/capper.rb",
-    "lib/capper/bundler.rb",
-    "lib/capper/git.rb",
-    "lib/capper/rails.rb",
-    "lib/capper/rvm.rb",
-    "lib/capper/templates/unicorn.rb.erb",
-    "lib/capper/templates/unicorn.sh.erb",
-    "lib/capper/unicorn.rb",
-    "lib/capper/utils/templates.rb",
-    "lib/capper/whenever.rb"
-  ]
-  s.homepage = %q{http://github.com/hollow/capper}
+  s.name = "capper"
+  s.version = "0.2.0"
+  s.platform = Gem::Platform::RUBY
   s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{Capistrano extensions for easy deployment}
+  s.authors = ["Benedikt Böhm"]
+  s.email = ["bb@xnull.de"]
+  s.homepage = "http://github.com/hollow/capper"
+  s.summary = %q{Capistrano is a collection of opinionated Capistrano recipes}
+  s.description = %q{Capistrano is a collection of opinionated Capistrano recipes}
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  s.add_dependency "erubis"
+  s.add_dependency "capistrano"
+  s.add_dependency "capistrano_colors"
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<erubis>, [">= 0"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
-    else
-      s.add_dependency(%q<erubis>, [">= 0"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<rcov>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<erubis>, [">= 0"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<rcov>, [">= 0"])
-  end
-end
+  s.add_development_dependency "bundler", "~> 1.0.0"
 
+  s.files            = `git ls-files`.split("\n")
+  s.test_files       = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables      = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths    = ["lib"]
+  s.extra_rdoc_files = ["LICENSE", "README.md"]
+end

data/lib/capper/base.rb

@@ -0,0 +1,54 @@
+require 'capistrano'
+
+unless Capistrano::Configuration.respond_to?(:instance)
+  abort "capper requires Capistrano 2"
+end
+
+# add some nice colors
+require "capistrano_colors"
+
+# mixin various helpers
+require 'capper/utils/load'
+
+require 'capper/utils/templates'
+include Capper::Utils::Templates
+
+require 'capper/utils/multistage'
+include Capper::Utils::Multistage
+
+# define a bunch of defaults that make sense
+Capper.load do
+  # apps should not require root access
+  set(:use_sudo, false)
+  set(:group_writable, false)
+
+  # default app layout
+  _cset(:user) { application }
+  _cset(:bin_path) { File.join(deploy_to, "bin") }
+  _cset(:base_path) { "/var/app" }
+  _cset(:config_path) { "#{shared_path}/config" }
+  set(:deploy_to) { "#{base_path}/#{application}" }
+
+  # cleanup by default
+  after "deploy:update", "deploy:cleanup"
+
+  namespace :deploy do
+    desc <<-DESC
+      Prepares one or more servers for deployment. Before you can use any \
+      of the Capistrano deployment tasks with your project, you will need to \
+      make sure all of your servers have been prepared with `cap deploy:setup'. When \
+      you add a new server to your cluster, you can easily run the setup task \
+      on just that server by specifying the HOSTS environment variable:
+
+        $ cap HOSTS=new.server.com deploy:setup
+
+      It is safe to run this task on servers that have already been set up; it \
+      will not destroy any deployed revisions or data.
+    DESC
+    task :setup, :except => { :no_release => true } do
+      dirs = [releases_path, shared_path]
+      dirs += shared_children.map { |d| File.join(shared_path, d) }
+      run "mkdir -p #{dirs.join(' ')}"
+    end
+  end
+end

data/lib/capper/bundler.rb

@@ -1,11 +1,19 @@
-require File.dirname(__FILE__) + '/../capper' unless defined?(Capper)
+require File.dirname(__FILE__) + '/base' unless defined?(Capper)
 require 'bundler/capistrano'
 
+# bundler requires rvm
+require "capper/rvm"
+
 Capper.load do
+  # do not install a global bundle
+  # instead, use the gemset selected by rvm_ruby_string
+  set(:bundle_dir) { File.join(shared_path, 'bundle', rvm_ruby_string) }
+
   namespace :bundle do
     desc "Setup bundler"
     task :setup, :except => {:no_release => true} do
       run "if ! gem query -i -n ^bundler$ >/dev/null; then gem install bundler; fi"
+      run "mkdir -p #{bundle_dir}"
     end
   end
 

data/lib/capper/config.rb

@@ -0,0 +1,13 @@
+require File.dirname(__FILE__) + '/base' unless defined?(Capper)
+
+Capper.load do
+  _cset(:config_repo) { abort "Please specify the config repository, set :config_repo, 'foo'" }
+
+  after "deploy:setup" do
+    run "rm -rf #{config_path} && git clone #{config_repo} #{config_path}"
+  end
+
+  after "deploy:update_code" do
+    run "cd #{config_path} && git pull"
+  end
+end

data/lib/capper/git.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../capper' unless defined?(Capper)
+require File.dirname(__FILE__) + '/base' unless defined?(Capper)
 
 Capper.load do
   set(:scm, :git)

data/lib/capper/multistage.rb

@@ -0,0 +1,20 @@
+require File.dirname(__FILE__) + '/base' unless defined?(Capper)
+
+Capper.load do
+  # execute the specified stage so that recipes required in stage can contribute to task list
+  on :load do
+    if stages.include?(ARGV.first)
+      find_and_execute_task(ARGV.first) if ARGV.any?{ |option| option =~ /-T|--tasks|-e|--explain/ }
+    end
+  end
+
+  namespace :multistage do
+    task :ensure do
+      unless exists?(:current_stage)
+        abort "No stage specified. Please specify one of: #{stages.join(', ')} (e.g. `cap #{stages.first} #{ARGV.last}')"
+      end
+    end
+  end
+
+  on :start, "multistage:ensure", :except => stages
+end

data/lib/capper/rails.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../capper' unless defined?(Capper)
+require File.dirname(__FILE__) + '/base' unless defined?(Capper)
 
 # rails uses rvm and bundler
 require 'capper/rvm'

data/lib/capper/rvm.rb

@@ -1,30 +1,33 @@
-require File.dirname(__FILE__) + '/../capper' unless defined?(Capper)
+require File.dirname(__FILE__) + '/base' unless defined?(Capper)
 
 $:.unshift(File.expand_path('./lib', ENV['rvm_path']))
 require 'rvm/capistrano'
 
 Capper.load do
   set(:rvm_type, :user)
-  set(:rvm_ruby_string, File.read(".rvmrc").gsub(/^rvm use --create (.*)@.*/, '\1').strip)
+  set(:rvm_ruby_string, File.read(".rvmrc").gsub(/^rvm use --create (.*)/, '\1').strip)
 
   namespace :rvm do
     # install the requested ruby if missing
     desc "Install the selected ruby version using RVM."
     task :setup, :except => {:no_release => true} do
-      run("if ! rvm list rubies | grep -q #{rvm_ruby_string}; then " +
-          "rvm install #{rvm_ruby_string}; fi",
+      wo_gemset = rvm_ruby_string.gsub(/@.*/, '')
+      run("if ! rvm list rubies | grep -q #{wo_gemset}; then " +
+          "rvm install #{rvm_ruby_string}; fi && " +
+          "rvm use --create #{rvm_ruby_string}",
           :shell => "/bin/bash -l")
 
       # this ensures that Gentoos declare -x RUBYOPT="-rauto_gem" is ignored.
-      run "touch ~/.rvm/rubies/#{rvm_ruby_string}/lib/ruby/site_ruby/auto_gem.rb"
+      run "touch ~/.rvm/rubies/#{wo_gemset}/lib/ruby/site_ruby/auto_gem.rb"
     end
 
     # prevents interactive rvm dialog
-    task :untrust_rvmrc, :except => {:no_release => true} do
-      run "rvm rvmrc untrust #{current_path}"
+    task :trust_rvmrc, :except => {:no_release => true} do
+      run "rvm rvmrc trust #{release_path} >/dev/null"
+      run "rvm rvmrc trust #{current_path} >/dev/null"
     end
   end
 
-  on :start, "rvm:setup"
-  after "deploy:update_code", "rvm:untrust_rvmrc"
+  before "deploy:setup", "rvm:setup"
+  after "deploy:symlink", "rvm:trust_rvmrc"
 end

data/lib/capper/unicorn.rb

@@ -1,8 +1,11 @@
-require File.dirname(__FILE__) + '/../capper' unless defined?(Capper)
+require File.dirname(__FILE__) + '/base' unless defined?(Capper)
 
 # Unicorn capistrano controls.
 # See http://unicorn.bogomips.org/SIGNALS.html for signals that can be sent to unicorn.
 
+# unicorn requires bundler
+require 'capper/bundler'
+
 Capper.load do
   # unicorn configuration variables
   _cset(:unicorn_worker_processes, 4)
@@ -10,7 +13,7 @@ Capper.load do
 
   # these cannot be overriden
   set(:unicorn_script) { "#{bin_path}/unicorn" }
-  set(:unicorn_config) { "#{shared_path}/config/unicorn.rb" }
+  set(:unicorn_config) { "#{config_path}/unicorn.rb" }
   set(:unicorn_pidfile) { "#{shared_path}/pids/unicorn.pid" }
 
   namespace :deploy do

data/lib/capper/utils/load.rb

@@ -0,0 +1,6 @@
+# helper method to load a block into the capistrano namespace
+class Capper
+  def self.load(&block)
+    Capistrano::Configuration.instance(true).load(&block)
+  end
+end

data/lib/capper/utils/multistage.rb

@@ -0,0 +1,27 @@
+class Capper
+  module Utils
+    module Multistage
+
+      def stage(name, &block)
+        stages = fetch(:stages, [])
+
+        if stages.include?(name)
+          abort "Multiple stages with the same name are not allowed"
+        end
+
+        namespace :multistage do
+          task(name, {}, &block)
+        end
+
+        desc "Set the target stage to `#{name}'."
+        task(name) do
+          set(:current_stage, name.to_sym)
+          find_and_execute_task("multistage:#{name}")
+        end
+
+        set(:stages, [stages, name].flatten.sort)
+      end
+
+    end
+  end
+end

data/lib/capper/whenever.rb

@@ -1,4 +1,4 @@
-require 'capper' unless defined?(Capper)
+require File.dirname(__FILE__) + '/base' unless defined?(Capper)
 
 # whenever requires bundler
 require 'capper/bundler'
@@ -33,13 +33,13 @@ Capper.load do
     task :update_crontab do
       on_rollback do
         if previous_release
-          run "cd #{previous_release} && #{whenever_command} #{whenever_update_flags}", options
+          run "cd #{previous_release} && #{whenever_command} #{whenever_update_flags}"
         else
-          run "cd #{release_path} && #{whenever_command} #{whenever_clear_flags}", options
+          run "cd #{release_path} && #{whenever_command} #{whenever_clear_flags}"
         end
       end
 
-      run "cd #{current_path} && #{whenever_command} #{whenever_update_flags}", options
+      run "cd #{current_path} && #{whenever_command} #{whenever_update_flags}"
     end
 
     desc <<-DESC

metadata

@@ -2,7 +2,7 @@
 name: capper
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - "Benedikt B\xC3\xB6hm"
@@ -10,11 +10,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-12 00:00:00 +02:00
+date: 2011-07-26 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: erubis
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -22,79 +23,72 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :runtime
-  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: shoulda
+  name: capistrano
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
-  type: :development
-  prerelease: false
+  type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: capistrano_colors
+  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.0
-  type: :development
-  prerelease: false
+        version: "0"
+  type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: bundler
+  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.6.4
+        version: 1.0.0
   type: :development
-  prerelease: false
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rcov
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  prerelease: false
-  version_requirements: *id005
-description: Capistrano extensions for easy deployment
-email: bb@xnull.de
+description: Capistrano is a collection of opinionated Capistrano recipes
+email: 
+- bb@xnull.de
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- LICENSE.txt
-- README.rdoc
+- LICENSE
+- README.md
 files: 
 - .document
+- .gitignore
 - .rvmrc
 - Gemfile
 - Gemfile.lock
-- LICENSE.txt
-- README.rdoc
+- LICENSE
+- README.md
 - Rakefile
-- VERSION
 - capper.gemspec
-- lib/capper.rb
+- lib/capper/base.rb
 - lib/capper/bundler.rb
+- lib/capper/config.rb
 - lib/capper/git.rb
+- lib/capper/multistage.rb
 - lib/capper/rails.rb
 - lib/capper/rvm.rb
 - lib/capper/templates/unicorn.rb.erb
 - lib/capper/templates/unicorn.sh.erb
 - lib/capper/unicorn.rb
+- lib/capper/utils/load.rb
+- lib/capper/utils/multistage.rb
 - lib/capper/utils/templates.rb
 - lib/capper/whenever.rb
 has_rdoc: true
@@ -111,9 +105,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2356379123392142359
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
@@ -127,6 +118,6 @@ rubyforge_project:
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: Capistrano extensions for easy deployment
+summary: Capistrano is a collection of opinionated Capistrano recipes
 test_files: []
 

data/VERSION

@@ -1 +0,0 @@
-0.1.0

data/lib/capper.rb

@@ -1,32 +0,0 @@
-require 'capistrano'
-
-unless Capistrano::Configuration.respond_to?(:instance)
-  abort "capper requires Capistrano 2"
-end
-
-require 'capper/utils/templates'
-
-# mixin various helpers
-include Capper::Utils::Templates
-
-# define a bunch of defaults that make sense
-Capistrano::Configuration.instance(true).load do
-  # apps should not require root access
-  _cset(:use_sudo, false)
-  _cset(:group_writable, false)
-
-  # default app layout
-  _cset(:user) { application }
-  _cset(:bin_path) { File.join(deploy_to, "bin") }
-  _cset(:base_path) { "/var/app" }
-  set(:deploy_to) { "#{base_path}/#{application}" }
-
-  # cleanup by default
-  after "deploy:update", "deploy:cleanup"
-end
-
-class Capper
-  def self.load(&block)
-    Capistrano::Configuration.instance(true).load(&block)
-  end
-end