Changeset 8905

Timestamp:

02/19/08 23:39:26 (7 months ago)

Author:

minam

Message:

Dynamic roles (closes #11107, thanks for the awesome patch!)

Files:

• tools/capistrano/CHANGELOG (modified) (1 diff)
• tools/capistrano/lib/capistrano/configuration/roles.rb (modified) (3 diffs)
• tools/capistrano/lib/capistrano/role.rb (added)
• tools/capistrano/test/configuration/roles_test.rb (modified) (5 diffs)

tools/capistrano/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Dynamic roles (e.g. role(:app) { "host.name" }) [dmasover]
-
-* Implement Bzr#next_revision so that pending changes can be reported correctly [casret]

tools/capistrano/lib/capistrano/configuration/roles.rb

@@ -1 +1 @@
-require 'capistrano/server_definition'
+require 'capistrano/role'
-
-module Capistrano
@@ -16 +17 @@
-      def initialize_with_roles(*args) #:nodoc:
-        initialize_without_roles(*args)
-[]
+Role.new
-      end
-
@@ -42 +43 @@
-      #
-      #   role :web, "web2", "web3", :user => "www", :port => 2345
-
+, &block
-        options = args.last.is_a?(Hash) ? args.pop : {}
-        which = which.to_sym
+        roles[which].push(block, options) if block_given?
-        args.each { |host| roles[which] << ServerDefinition.new(host, options) }
-      end

tools/capistrano/test/configuration/roles_test.rb

@@ -1 +1 @@
-require "#{File.dirname(__FILE__)}/../utils"
-require 'capistrano/configuration/roles'
+require 'capistrano/server_definition'
-
-class ConfigurationRolesTest < Test::Unit::TestCase
@@ -17 +18 @@
-  end
-
+  def assert_role_equals(list)
+    assert_equal list, @config.roles[:app].map { |s| s.host }
+  end
+
-  def test_initialize_should_initialize_roles_collection
-    assert @config.original_initialize_called
@@ -30 +35 @@
-    @config.role :app, "app1.capistrano.test"
-    assert_equal [:app], @config.roles.keys
-
+
+
+
+
+
+
+
+
-  end
-
@@ -36 +48 @@
-    @config.role :app, "app1.capistrano.test", "app2.capistrano.test"
-    assert_equal [:app], @config.roles.keys
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  end
-
@@ -45 +71 @@
-    end
-  end
+
+  def test_role_with_options_should_apply_options_to_block_results
+    @config.role :app, :extra => :value do
+      ['app1.capistrano.test', 'app2.capistrano.test']
+    end
+    @config.roles[:app].each do |server|
+      assert_equal({:extra => :value}, server.options)
+    end
+  end
+
+  def test_options_should_apply_only_to_this_argument_set
+    @config.role :app, 'app1.capistrano.test', 'app2.capistrano.test' do
+      ['app3.capistrano.test', 'app4.capistrano.test']
+    end
+    @config.role :app, 'app5.capistrano.test', 'app6.capistrano.test', :extra => :value do
+      ['app7.capistrano.test', 'app8.capistrano.test']
+    end
+    @config.role :app, 'app9.capistrano.test'
+
+    option_hosts = ['app5.capistrano.test', 'app6.capistrano.test', 'app7.capistrano.test', 'app8.capistrano.test']
+    @config.roles[:app].each do |server|
+      if (option_hosts.include? server.host)
+        assert_equal({:extra => :value}, server.options)
+      else
+        assert_not_equal({:extra => :value}, server.options)
+      end
+    end
+  end
+
+  # Here, the source should be more readable than the method name
+  def test_role_block_returns_options_hash_is_merged_with_role_options_argument
+    @config.role :app, :first => :one, :second => :two do
+      ['app1.capistrano.test', 'app2.capistrano.test', {:second => :please, :third => :three}]
+    end
+    @config.roles[:app].each do |server|
+      assert_equal({:first => :one, :second => :please, :third => :three}, server.options)
+    end
+  end
+
+  def test_role_block_can_override_role_options_argument
+    @config.role :app, :value => :wrong do
+      Capistrano::ServerDefinition.new('app.capistrano.test')
+    end
+    @config.roles[:app].servers
+    @config.roles[:app].servers.each do |server|
+      assert_not_equal({:value => :wrong}, server.options)
+    end
+  end
+
+  def test_role_block_can_return_nil
+    @config.role :app do
+      nil
+    end
+    assert_role_equals ([])
+  end
+
+  def test_role_block_can_return_empty_array
+    @config.role :app do
+      []
+    end
+    assert_role_equals ([])
+  end
-end