capitate 0.3.4 → 0.3.5

data/History.txt

@@ -1,3 +1,10 @@
+== 0.3.5 2008-05-08
+
+* Adding merb:migrate recipe
+* Fixing merb monitrc
+* Added preview variables prompt
+* Fixed merb logrotate defaults
+
 == 0.3.4 2008-05-05
 
 * Removed upload plugin (obsolete)

data/Manifest.txt

@@ -4,7 +4,6 @@ License.txt
 Manifest.txt
 README.txt
 Rakefile
-bin/capitate
 config/hoe.rb
 config/requirements.rb
 docs/nginx.README
@@ -51,6 +50,7 @@ lib/recipes/logrotate/rails.rb
 lib/recipes/logrotate/sphinx.rb
 lib/recipes/logrotated.rb
 lib/recipes/memcached.rb
+lib/recipes/merb.rb
 lib/recipes/monit.rb
 lib/recipes/monit/backgroundjob.rb
 lib/recipes/monit/backgroundrb.rb

data/lib/capitate/plugins/prompt.rb

@@ -5,8 +5,8 @@ module Capitate::Plugins::Prompt
   # Prompt.
   #
   # ==== Options
-  # +label+:: Label
-  # +options+:: Options (none yet)
+  # :label<String>:: Label
+  # :options<Hash>:: An options hash (see below)
   #
   def ask(label, options = {}, &block)
     Capistrano::CLI.ui.ask(label, &block)
@@ -14,15 +14,15 @@ module Capitate::Plugins::Prompt
   
   # Prompt for password.
   #
-  # ==== Options
-  # +label+:: Label
-  # +options+:: Options (see Password options)
+  # ==== Options (options)
+  # :label<String>:: Label
+  # :options<Hash>:: An options hash (see below)
   #
   # ==== Password options
-  # +verify+:: If true, prompt twice and verify
-  # +lazy+:: If true, returns a Proc. _Defaults to true_
-  # +check_hash+:: If present, checks that md5 is same as password md5
-  # +max_attempts+:: Number of attempts to retry. _Defaults to 3_
+  # :verify<bool>:: If true, prompt twice and verify
+  # :lazy<bool>:: If true, returns a Proc. _Defaults to true_
+  # :check_hash<String>:: If present, checks that md5 is same as password md5
+  # :max_attempts<Integer>:: Number of attempts to retry. _Defaults to 3_
   #
   def password(label, options = {})
     
@@ -73,6 +73,37 @@ module Capitate::Plugins::Prompt
     password_prompt.call
   end  
   
+  # Preview variables, and re-set them if asked to.
+  # Uses highline menus. Is not very intelligent.
+  #
+  # ==== Options
+  # :variables<Array>:: List of variables to show and verify
+  # :header<String>:: Menu header
+  # :prompt<String>:: Menu prompt
+  #
+  def preview_variables(variables, header = "Verify your settings", prompt = "Choose: ")
+    hl = Capistrano::CLI.ui
+    
+    confirmed = false
+    while not confirmed do 
+      hl.choose do |menu|
+        menu.header = header
+        menu.prompt = prompt
+        
+        menu.choice("<Continue>") do
+          confirmed = true
+        end
+        
+        variables.each do |variable|
+          menu.choice("#{variable}: #{fetch(variable)}") do
+            new_setting = ask("Set #{variable}: ") { |q| q.default = fetch(variable) }
+            set variable, new_setting
+          end
+        end        
+      end
+    end
+  end
+  
 end
 
 Capistrano.plugin :prompt, Capitate::Plugins::Prompt

data/lib/capitate/version.rb

@@ -2,7 +2,7 @@ module Capitate #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 3
-    TINY  = 4
+    TINY  = 5
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/recipes/logrotate/merb.rb

@@ -7,12 +7,12 @@ namespace :merb do
     <dl>
     <dt>merb_logrotate_path</dt>
     <dd>Merb logrotate path</dd>
-    <dd class="default">Defaults to @\#{shared_path}/log/merb_*.log@</dd>
+    <dd class="default">Defaults to @\#{shared_path}/log/merb.*.log@</dd>
     </dl>
     "Source":#{link_to_source(__FILE__)}    
     DESC
     task :install do
-      fetch_or_default(:merb_logrotate_path, "#{shared_path}/log/merb_*.log")
+      fetch_or_default(:merb_logrotate_path, "#{shared_path}/log/merb.*.log")
     
       set :logrotate_name, "merb_#{application}"
       set :logrotate_log_path, merb_logrotate_path

data/lib/recipes/merb.rb

@@ -0,0 +1,33 @@
+namespace :merb do
+  
+  desc <<-DESC
+    Run the migrate rake task. By default, it runs this in most recently \
+    deployed version of the app. However, you can specify a different release \
+    via the migrate_target variable, which must be one of :latest (for the \
+    default behavior), or :current (for the release indicated by the \
+    `current' symlink). Strings will work for those values instead of symbols, \
+    too. You can also specify additional environment variables to pass to rake \
+    via the migrate_env variable. Finally, you can specify the full path to the \
+    rake executable by setting the rake variable. The defaults are:
+
+      set :rake,           "rake"
+      set :merb_env,      "production"
+      set :migrate_env,    ""
+      set :migrate_target, :latest
+  DESC
+  task :migrate, :roles => :db, :only => { :primary => true } do
+    rake = fetch(:rake, "rake")
+    merb_env = fetch(:merb_env, "production")
+    migrate_env = fetch(:migrate_env, "")
+    migrate_target = fetch(:migrate_target, :latest)
+
+    current_directory = case migrate_target.to_sym
+      when :current then current_path
+      when :latest  then current_release
+      else raise ArgumentError, "unknown migration target #{migrate_target.inspect}"
+      end
+
+    run "cd #{current_directory}; #{rake} MERB_ENV=#{merb_env} #{migrate_env} db:migrate"
+  end
+  
+end

data/lib/recipes/monit/merb.rb

@@ -1,7 +1,7 @@
 
 namespace :merb do
 
-    namespace :monit do
+  namespace :monit do
     
     desc <<-DESC
     Create monit configuration for merb.
@@ -23,7 +23,7 @@ namespace :merb do
       ports = (0...merb_nodes).collect { |i| merb_port + i }
       ports.each do |port|
         
-        pid_path = "#{merb_pid_dir}/#{merb_application}.#{port}.pid"
+        pid_path = "#{merb_pid_dir}/merb.#{port}.pid"
         
         start = "/etc/init.d/#{merb_initscript_name} start_only #{port}"
         stop = "/etc/init.d/#{merb_initscript_name} stop_only #{port}"

data/website/index.html

@@ -35,7 +35,7 @@
 
     <div id="version" class="clickable box" onclick='document.location = "http://rubyforge.org/projects/capitate"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/capitate" class="numbers">0.3.4</a>
+      <a href="http://rubyforge.org/projects/capitate" class="numbers">0.3.5</a>
     </div>
     
     <div id="recipes">
@@ -77,7 +77,7 @@
 
 
 	<ul>
-	<li>Plugins to help install applications, via yum or manually unpacking, and building. Also to help upload files sanely, prompt for input, install gems, run shell scripts, etc.</li>
+	<li>Plugins to help install applications, via yum or manually unpacking, and building. Also to prompt for input, install gems, run shell scripts, etc.</li>
 		<li>Templates for init scripts and application configuration</li>
 		<li>Templates and recipes for common apps like monit, nginx, sphinx, mongrel, ruby and mysql</li>
 		<li>Common deployment setup and update_code tasks, such as symlinking in database.yml and more advanced recipes such as sphinx configuration.</li>
@@ -135,7 +135,7 @@
 	<p>Comments are welcome. Send an email to <a href="mailto:gabrielh@gmail.com">Gabriel Handford</a> via the <a href="http://groups.google.com/group/capitate">forum</a></p>
     </div>
     <p class="coda">
-      <a href="http://ducktyper.com">ducktyper.com</a>, 13th March 2008<br>
+      <a href="http://ducktyper.com">ducktyper.com</a>, 8th May 2008<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

data/website/index.txt

@@ -23,7 +23,7 @@ h2. The basics
 
 Capitate has:
 
-* Plugins to help install applications, via yum or manually unpacking, and building. Also to help upload files sanely, prompt for input, install gems, run shell scripts, etc.
+* Plugins to help install applications, via yum or manually unpacking, and building. Also to prompt for input, install gems, run shell scripts, etc.
 * Templates for init scripts and application configuration
 * Templates and recipes for common apps like monit, nginx, sphinx, mongrel, ruby and mysql
 * Common deployment setup and update_code tasks, such as symlinking in database.yml and more advanced recipes such as sphinx configuration.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: capitate
 version: !ruby/object:Gem::Version 
-  version: 0.3.4
+  version: 0.3.5
 platform: ""
 authors: 
 - Gabriel Handford
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-05 00:00:00 -04:00
+date: 2008-05-08 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,8 +24,8 @@ dependencies:
 description: Capistrano recipes, plugins and templates.
 email: 
 - gabrielh@gmail.com
-executables: 
-- capitate
+executables: []
+
 extensions: []
 
 extra_rdoc_files: 
@@ -41,7 +41,6 @@ files:
 - Manifest.txt
 - README.txt
 - Rakefile
-- bin/capitate
 - config/hoe.rb
 - config/requirements.rb
 - docs/nginx.README
@@ -88,6 +87,7 @@ files:
 - lib/recipes/logrotate/sphinx.rb
 - lib/recipes/logrotated.rb
 - lib/recipes/memcached.rb
+- lib/recipes/merb.rb
 - lib/recipes/monit.rb
 - lib/recipes/monit/backgroundjob.rb
 - lib/recipes/monit/backgroundrb.rb

data/bin/capitate

@@ -1,30 +0,0 @@
-#!/usr/bin/env ruby
-
-begin
-  require 'capitate'
-rescue LoadError
-  require 'rubygems'
-  require 'capitate'  
-end
-
-require 'capistrano/cli'
-
-cli = Capistrano::CLI.new(ARGV)
-cli.parse_options!
-
-config = cli.instantiate_configuration
-config.logger.level = cli.options[:verbose]
-
-cli.set_pre_vars(config)
-cli.load_recipes(config)
-
-config.load do 
-  require 'capitate/recipes'
-end
-
-config.trigger(:load)
-cli.execute_requested_actions(config)
-config.trigger(:exit)
-
-
-