From 8c379b9312a143be9d4b9599b3fafd26f8a06929 Mon Sep 17 00:00:00 2001
From: Matt Brictson <matt@mattbrictson.com>
Date: Fri, 22 Jan 2016 19:38:39 -0800
Subject: [PATCH] Use def_delegators instead of tedious delegation

---
 lib/capistrano/dsl/env.rb | 47 +++++----------------------------------
 1 file changed, 6 insertions(+), 41 deletions(-)

diff --git a/lib/capistrano/dsl/env.rb b/lib/capistrano/dsl/env.rb
index 08ce1b2b..e7e98f49 100644
--- a/lib/capistrano/dsl/env.rb
+++ b/lib/capistrano/dsl/env.rb
@@ -1,14 +1,12 @@
+require "forwardable"
+
 module Capistrano
   module DSL
     module Env
-
-      def configure_backend
-        env.configure_backend
-      end
-
-      def fetch(key, default=nil, &block)
-        env.fetch(key, default, &block)
-      end
+      extend Forwardable
+      def_delegators :env,
+                     :configure_backend, :fetch, :set, :set_if_empty, :delete,
+                     :ask, :role, :server, :primary, :validate
 
       def any?(key)
         value = fetch(key)
@@ -19,30 +17,6 @@ module Capistrano
         end
       end
 
-      def set(key, value=nil, &block)
-        env.set(key, value, &block)
-      end
-
-      def set_if_empty(key, value=nil, &block)
-        env.set_if_empty(key, value, &block)
-      end
-
-      def delete(key)
-        env.delete(key)
-      end
-
-      def ask(key, value, options={})
-        env.ask(key, value, options)
-      end
-
-      def role(name, servers, options={})
-        env.role(name, servers, options)
-      end
-
-      def server(name, properties={})
-        env.server(name, properties)
-      end
-
       def roles(*names)
         env.roles_for(names.flatten)
       end
@@ -60,14 +34,6 @@ module Capistrano
         roles(*names)
       end
 
-      def primary(role)
-        env.primary(role)
-      end
-
-      def validate(key, &validator)
-        env.validate(key, &validator)
-      end
-
       def env
         Configuration.env
       end
@@ -79,7 +45,6 @@ module Capistrano
       def asset_timestamp
         env.timestamp.strftime("%Y%m%d%H%M.%S")
       end
-
     end
   end
 end