Changeset 8926

Timestamp:

02/23/08 04:15:16 (4 months ago)

Author:

minam

Message:

Add alternative server-centric role definition method

Files:

• tools/capistrano/CHANGELOG (modified) (1 diff)
• tools/capistrano/lib/capistrano/configuration/roles.rb (modified) (1 diff)
• tools/capistrano/test/configuration/roles_test.rb (modified) (2 diffs)

tools/capistrano/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Add alternative server-centric role definition method [James Duncan Davidson]
-
-* Add support for password prompts from the Mercurial SCM [ches]

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

@@ -49 +49 @@
-        args.each { |host| roles[which] << ServerDefinition.new(host, options) }
-      end
+
+      # An alternative way to associate servers with roles. If you have a server
+      # that participates in multiple roles, this can be a DRYer way to describe
+      # the relationships. Pass the host definition as the first parameter, and
+      # the roles as the remaining parameters:
+      #
+      #   server "master.example.com", :web, :app
+      def server(host, *roles)
+        options = roles.last.is_a?(Hash) ? roles.pop : {}
+        raise ArgumentError, "you must associate a server with at least one role" if roles.empty?
+        roles.each { |name| role(name, host, options) }
+      end
-    end
-  end

tools/capistrano/test/configuration/roles_test.rb

@@ -16 +16 @@
-  def setup
-    @config = MockConfig.new
-  end
-
-  def assert_role_equals(list)
-    assert_equal list, @config.roles[:app].map { |s| s.host }
-  end
-
@@ -133 +129 @@
-    assert_role_equals ([])
-  end
+
+  def test_role_definitions_via_server_should_associate_server_with_roles
+    @config.server "www.capistrano.test", :web, :app
+    assert_equal %w(www.capistrano.test), @config.roles[:app].map { |s| s.host }
+    assert_equal %w(www.capistrano.test), @config.roles[:web].map { |s| s.host }
+  end
+
+  private
+
+    def assert_role_equals(list)
+      assert_equal list, @config.roles[:app].map { |s| s.host }
+    end
-end