capistrano 2.5.13 → 2.5.18

data/{CHANGELOG.rdoc → CHANGELOG}

@@ -1,3 +1,38 @@
+== 2.5.18 / March 14, 2010
+
+Small fix for rolling back if a shell scripts exits non-zero; enabled a rollback if git (or other) externals fail during the deploy.
+
+  * #151 check return code status of system command to create local copy and rollback if not 0 (David King)
+
+== 2.5.17 / February 27, 2010
+
+Various small bug fixes.
+
+== 2.5.16 / February 14, 2010
+
+Fixed a small regression in 2.5.15
+
+== 2.5.15 / 14 February 2010
+
+Fixes a feature request not to overwrite roles when using the ROLES environmental variable.
+
+  * #126 - The option to not overwriting the roles which are defined in the task definition.
+  * Removed the `upgrade` file as it has been a couple of years since 1.x was in the wild.
+  * Slight internal re-factor of the way we calculate the `version`
+
+== 2.5.14 / 18 January 2010
+
+Fixes a low-value bug, thanks to Chris G for the well submitted patch:
+
+  * #139 - Improves consistency of variable lookup, scm variables with a local_ prefix will be honoured with priority locally (Chris Griego)
+
+== 2.5.13 / 6 January 2010
+
+* Small maintenance release:
+
+  * #118 - Modified CLI test to not load user or system configuration file (Emily Price)
+  * #88  - Re-fixed a problem here, massive apologies to all concerned. (Hangover from 2.5.12)
+
 == 2.5.12 / 5 January 2010
 
 * Tweak the directory version listing (caused a lot of problems, please upgrade immediately)

data/Rakefile

@@ -5,6 +5,7 @@ begin
   Jeweler::Tasks.new do |gem|
     gem.version
     gem.name            = "capistrano"
+    gem.executables     = %W(capify cap)
     gem.summary         = %Q{Capistrano – Welcome to easy deployment with Ruby over SSH}
     gem.description     = %Q{Capistrano is a utility and framework for executing commands in parallel on multiple remote machines, via SSH.}
     gem.homepage        = "http://github.com/capistrano/capistrano"

data/VERSION

@@ -1 +1 @@
-2.5.13
+2.5.18

data/lib/capistrano/cli/execute.rb

@@ -24,6 +24,7 @@ module Capistrano
         config = instantiate_configuration(options)
         config.debug = options[:debug]
         config.dry_run = options[:dry_run]
+        config.preserve_roles = options[:preserve_roles]
         config.logger.level = options[:verbose]
 
         set_pre_vars(config)

data/lib/capistrano/cli/options.rb

@@ -79,6 +79,10 @@ module Capistrano
             "Make the output as quiet as possible."
           ) { options[:verbose] = 0 }
 
+          opts.on("-r", "--preserve-roles",
+            "Preserve task roles"
+          ) { options[:preserve_roles] = true }
+
           opts.on("-S", "--set-before NAME=VALUE",
             "Set a variable before the recipes are loaded."
           ) do |pair|
@@ -112,7 +116,7 @@ module Capistrano
             "Display the Capistrano version, and exit."
           ) do
             require 'capistrano/version'
-            puts "Capistrano v#{Capistrano::Version::STRING}"
+            puts "Capistrano v#{Capistrano::Version}"
             exit
           end
 

data/lib/capistrano/configuration/servers.rb

@@ -48,7 +48,9 @@ module Capistrano
             filter_server_list(hosts.uniq)
           end
         else
-          roles  = role_list_from(ENV['ROLES'] || options[:roles] || self.roles.keys)
+					roles = role_list_from(ENV['ROLES'] || options[:roles] || self.roles.keys)
+					roles = roles & Array(options[:roles]) if preserve_roles && !options[:roles].nil?
+
           only   = options[:only] || {}
           except = options[:except] || {}
           
@@ -93,4 +95,4 @@ module Capistrano
       end
     end
   end
-end
+end

data/lib/capistrano/configuration.rb

@@ -19,11 +19,12 @@ module Capistrano
   # define roles, and set configuration variables.
   class Configuration
     # The logger instance defined for this configuration.
-    attr_accessor :debug, :logger, :dry_run
+    attr_accessor :debug, :logger, :dry_run, :preserve_roles
 
     def initialize(options={}) #:nodoc:
       @debug = false
       @dry_run = false
+      @preserve_roles = false
       @logger = Logger.new(options)
     end
 

data/lib/capistrano/recipes/deploy/scm/git.rb

@@ -120,11 +120,11 @@ module Capistrano
         # default, Git's reference of HEAD (the latest changeset in the default
         # branch, usually called "master").
         def head
-          configuration[:branch] || 'HEAD'
+          variable(:branch) || 'HEAD'
         end
 
         def origin
-          configuration[:remote] || 'origin'
+          variable(:remote) || 'origin'
         end
 
         # Performs a clone on the remote machine, then checkout on the branch
@@ -135,21 +135,21 @@ module Capistrano
 
           args = []
           args << "-o #{remote}" unless remote == 'origin'
-          if depth = configuration[:git_shallow_clone]
+          if depth = variable(:git_shallow_clone)
             args << "--depth #{depth}"
           end
 
           execute = []
           if args.empty?
-            execute << "#{git} clone #{verbose} #{configuration[:repository]} #{destination}"
+            execute << "#{git} clone #{verbose} #{variable(:repository)} #{destination}"
           else
-            execute << "#{git} clone #{verbose} #{args.join(' ')} #{configuration[:repository]} #{destination}"
+            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 configuration[:git_enable_submodules]
+          if variable(:git_enable_submodules)
             execute << "#{git} submodule #{verbose} init"
             execute << "#{git} submodule #{verbose} sync"
             execute << "#{git} submodule #{verbose} update"
@@ -180,14 +180,14 @@ module Capistrano
           # changes between calls, but as long as the repositories are all
           # based from each other it should still work fine.
           if remote != 'origin'
-            execute << "#{git} config remote.#{remote}.url #{configuration[:repository]}"
+            execute << "#{git} config remote.#{remote}.url #{variable(:repository)}"
             execute << "#{git} config remote.#{remote}.fetch +refs/heads/*:refs/remotes/#{remote}/*"
           end
 
           # since we're in a local branch already, just reset to specified revision rather than merge
           execute << "#{git} fetch #{verbose} #{remote} && #{git} reset #{verbose} --hard #{revision}"
 
-          if configuration[:git_enable_submodules]
+          if variable(:git_enable_submodules)
             execute << "#{git} submodule #{verbose} init"
             execute << "for mod in `#{git} submodule status | awk '{ print $2 }'`; do #{git} config -f .git/config submodule.${mod}.url `#{git} config -f .gitmodules --get submodule.${mod}.url` && echo Synced $mod; done"
             execute << "#{git} submodule #{verbose} sync"
@@ -234,7 +234,7 @@ module Capistrano
 
         def command
           # For backwards compatibility with 1.x version of this module
-          configuration[:git] || super
+          variable(:git) || super
         end
 
         # Determines what the response should be for a particular bit of text
@@ -246,7 +246,7 @@ module Capistrano
           case text
           when /\bpassword.*:/i
             # git is prompting for a password
-            unless pass = configuration[:scm_password]
+            unless pass = variable(:scm_password)
               pass = Capistrano::CLI.password_prompt
             end
             "#{pass}\n"
@@ -255,7 +255,7 @@ module Capistrano
             "yes\n"
           when /passphrase/i
             # git is asking for the passphrase for the user's key
-            unless pass = configuration[:scm_passphrase]
+            unless pass = variable(:scm_passphrase)
               pass = Capistrano::CLI.password_prompt
             end
             "#{pass}\n"

data/lib/capistrano/recipes/deploy/scm/mercurial.rb

@@ -18,7 +18,7 @@ module Capistrano
         # For mercurial HEAD == tip except that it bases this assumption on what
         # tip is in the current repository (so push before you deploy)
         def head
-          configuration[:branch] || "tip"
+          variable(:branch) || "tip"
         end
 
         # Clone the repository and update to the specified changeset.

data/lib/capistrano/recipes/deploy/strategy/copy.rb

@@ -53,6 +53,11 @@ module Capistrano
               system(source.checkout(revision, copy_cache))
             end
 
+            # Check the return code of last system command and rollback if not 0
+            unless $? == 0
+              raise Capistrano::Error, "shell command failed with return code #{$?}"
+            end
+
             logger.debug "copying cache to deployment staging area #{destination}"
             Dir.chdir(copy_cache) do
               FileUtils.mkdir_p(destination)

data/lib/capistrano/recipes/deploy.rb

@@ -51,8 +51,6 @@ _cset(:shared_path)       { File.join(deploy_to, shared_dir) }
 _cset(:current_path)      { File.join(deploy_to, current_dir) }
 _cset(:release_path)      { File.join(releases_path, release_name) }
 
-# re: https://capistrano.lighthouseapp.com/projects/8716/tickets/88-getting-the-newest-directory
-# remove system inconsistencies with ls and let ruby sort the releases
 _cset(:releases)          { capture("ls -x #{releases_path}").split.sort }
 _cset(:current_release)   { File.join(releases_path, releases.last) }
 _cset(:previous_release)  { releases.length > 1 ? File.join(releases_path, releases[-2]) : nil }

data/lib/capistrano/version.rb

@@ -1,18 +1,18 @@
-require 'net/ssh/version'
-
+require 'scanf'
 module Capistrano
 
-  # Describes the current version of Capistrano.
-  class Version < Net::SSH::Version
-    MAJOR = 2
-    MINOR = 5
-    TINY  = 13
+  class Version
+
+    CURRENT = File.read(File.dirname(__FILE__) + '/../../VERSION')
+
+    MAJOR, MINOR, TINY = CURRENT.scanf('%d.%d.%d')
 
-    # The current version, as a Version instance
-    CURRENT = new(MAJOR, MINOR, TINY)
+    STRING = CURRENT.to_s
 
-    # The current version, as a String instance
-    STRING  = CURRENT.to_s
+    def self.to_s
+      CURRENT
+    end
+    
   end
 
 end

data/test/cli/execute_test.rb

@@ -15,7 +15,7 @@ class CLIExecuteTest < Test::Unit::TestCase
   def setup
     @cli = MockCLI.new
     @logger = stub_everything
-    @config = stub(:logger => @logger, :debug= => nil, :dry_run= => nil)
+    @config = stub(:logger => @logger, :debug= => nil, :dry_run= => nil, :preserve_roles= => nil)
     @config.stubs(:set)
     @config.stubs(:load)
     @config.stubs(:trigger)
@@ -129,4 +129,4 @@ class CLIExecuteTest < Test::Unit::TestCase
     MockCLI.expects(:parse).with(ARGV).returns(cli)
     MockCLI.execute
   end
-end
+end

data/test/cli/options_test.rb

@@ -93,6 +93,18 @@ class CLIOptionsTest < Test::Unit::TestCase
     assert_equal 0, @cli.options[:verbose]
   end
 
+  def test_parse_options_with_r_should_set_preserve_roles_option
+    @cli.args << "-r"
+    @cli.parse_options!
+    assert @cli.options[:preserve_roles]
+  end
+
+  def test_parse_options_with_preserve_roles_should_set_preserve_roles_option
+    @cli.args << "--preserve-roles"
+    @cli.parse_options!
+    assert @cli.options[:preserve_roles]
+  end
+
   def test_parse_options_with_S_should_set_pre_vars
     @cli.args << "-S" << "foo=bar"
     @cli.parse_options!

data/test/configuration/actions/invocation_test.rb

@@ -6,6 +6,7 @@ class ConfigurationActionsInvocationTest < Test::Unit::TestCase
     attr_reader :options
     attr_accessor :debug
     attr_accessor :dry_run
+		attr_accessor :preserve_roles
 
     def initialize
       @options = {}

data/test/configuration/servers_test.rb

@@ -5,9 +5,11 @@ require 'capistrano/configuration/servers'
 class ConfigurationServersTest < Test::Unit::TestCase
   class MockConfig
     attr_reader :roles
+		attr_accessor :preserve_roles
 
     def initialize
       @roles = {}
+			@preserve_roles = false
     end
 
     include Capistrano::Configuration::Servers
@@ -62,6 +64,33 @@ class ConfigurationServersTest < Test::Unit::TestCase
     ENV.delete('ROLES')
   end
 
+  def test_task_with_roles_as_environment_variable_and_preserve_roles_should_apply_only_to_existant_task_role
+    ENV['ROLES'] = "app,file"
+		@config.preserve_roles = true
+    task = new_task(:testing,@config, :roles => :app)
+    assert_equal %w(app1 app2 app3).sort, @config.find_servers_for_task(task).map { |s| s.host }.sort
+  ensure
+    ENV.delete('ROLES')
+	end
+
+  def test_task_with_roles_as_environment_variable_and_preserve_roles_should_apply_only_to_existant_task_roles
+    ENV['ROLES'] = "app,file,web"
+		@config.preserve_roles = true
+    task = new_task(:testing,@config, :roles => [ :app,:file ])
+    assert_equal %w(app1 app2 app3 file).sort, @config.find_servers_for_task(task).map { |s| s.host }.sort
+  ensure
+    ENV.delete('ROLES')
+	end
+
+  def test_task_with_roles_as_environment_variable_and_preserve_roles_should_not_apply_if_not_exists_those_task_roles
+    ENV['ROLES'] = "file,web"
+		@config.preserve_roles = true
+    task = new_task(:testing,@config, :roles => [ :app ])
+    assert_equal [], @config.find_servers_for_task(task).map { |s| s.host }.sort
+  ensure
+    ENV.delete('ROLES')
+	end
+	
   def test_task_with_hosts_as_environment_variable_should_apply_only_to_those_hosts
     ENV['HOSTS'] = "foo,bar"
     task = new_task(:testing)
@@ -126,4 +155,4 @@ class ConfigurationServersTest < Test::Unit::TestCase
     assert_equal %w(app1 app2 app3), @config.find_servers(:roles => lambda { :app }).map { |s| s.host }.sort
     assert_equal %w(app2 file), @config.find_servers(:roles => lambda { [:report, :file] }).map { |s| s.host }.sort
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: capistrano
 version: !ruby/object:Gem::Version 
-  version: 2.5.13
+  version: 2.5.18
 platform: ruby
 authors: 
 - Jamis Buck
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-06 00:00:00 +00:00
+date: 2010-03-14 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -78,18 +78,17 @@ email:
 - jamis@jamisbuck.org
 - lee.hambley@gmail.com
 executables: 
-- cap
 - capify
+- cap
 extensions: []
 
 extra_rdoc_files: 
-- README.rdoc
+- README
 files: 
 - .gitignore
-- CHANGELOG.rdoc
-- README.rdoc
+- CHANGELOG
+- README
 - Rakefile
-- TESTING.md
 - VERSION
 - bin/cap
 - bin/capify
@@ -144,7 +143,6 @@ files:
 - lib/capistrano/recipes/deploy/templates/maintenance.rhtml
 - lib/capistrano/recipes/standard.rb
 - lib/capistrano/recipes/templates/maintenance.rhtml
-- lib/capistrano/recipes/upgrade.rb
 - lib/capistrano/role.rb
 - lib/capistrano/server_definition.rb
 - lib/capistrano/shell.rb
@@ -152,7 +150,6 @@ files:
 - lib/capistrano/task_definition.rb
 - lib/capistrano/transfer.rb
 - lib/capistrano/version.rb
-- setup.rb
 - test/cli/execute_test.rb
 - test/cli/help_test.rb
 - test/cli/options_test.rb

data/TESTING.md

@@ -1,16 +0,0 @@
-Testing Capistrano
-==================
-
- 1. Install the Following Gem Dependencies
- 
-    `# gem install mocha echoe`
-
- 2. Run the following
-    
-    `$ rake test`
-    
- 3. Output Should Resemble
- 
-    `Finished in 0.859017 seconds.`
-    `523 tests, 1271 assertions, 0 failures, 0 errors`
-  

data/lib/capistrano/recipes/upgrade.rb

@@ -1,33 +0,0 @@
-# Tasks to aid the migration of an established Capistrano 1.x installation to
-# Capistrano 2.x.
-
-namespace :upgrade do
-  desc <<-DESC
-    Migrate from the revisions log to REVISION. Capistrano 1.x recorded each \
-    deployment to a revisions.log file. Capistrano 2.x is cleaner, and just \
-    puts a REVISION file in the root of the deployed revision. This task \
-    migrates from the revisions.log used in Capistrano 1.x, to the REVISION \
-    tag file used in Capistrano 2.x. It is non-destructive and may be safely \
-    run any number of times.
-  DESC
-  task :revisions, :except => { :no_release => true } do
-    revisions = capture("cat #{deploy_to}/revisions.log")
-
-    mapping = {}
-    revisions.each do |line|
-      revision, directory = line.chomp.split[-2,2]
-      mapping[directory] = revision
-    end
-
-    commands = mapping.keys.map do |directory|
-      "echo '.'; test -d #{directory} && echo '#{mapping[directory]}' > #{directory}/REVISION"
-    end
-
-    command = commands.join(";")
-
-    run "cd #{releases_path}; #{command}; true" do |ch, stream, out|
-      STDOUT.print(".")
-      STDOUT.flush
-    end
-  end
-end