From 80f28c3862da72172a55d3e0218faad5cdd46b4b Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Tue, 5 May 2015 14:57:27 -0700
Subject: properly bind 'global.services' and 'global.tags' in the right
 environment in the macros.

---
 lib/leap_cli/config/object.rb | 43 +++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 41 insertions(+), 2 deletions(-)

(limited to 'lib/leap_cli/config/object.rb')

diff --git a/lib/leap_cli/config/object.rb b/lib/leap_cli/config/object.rb
index a0d402b..6f71a08 100644
--- a/lib/leap_cli/config/object.rb
+++ b/lib/leap_cli/config/object.rb
@@ -10,6 +10,34 @@ require 'ya2yaml' # pure ruby yaml
 
 module LeapCli
   module Config
+
+    #
+    # A proxy for Manager that binds to a particular object
+    # (so that we can bind to a particular environment)
+    #
+    class ManagerBinding
+      def initialize(manager, object)
+        @manager = manager
+        @object = object
+      end
+
+      def services
+        @manager.env(@object.environment).services
+      end
+
+      def tags
+        @manager.env(@object.environment).tags
+      end
+
+      def provider
+        @manager.env(@object.environment).provider
+      end
+
+      def method_missing(*args)
+        @manager.send(*args)
+      end
+    end
+
     #
     # This class represents the configuration for a single node, service, or tag.
     # Also, all the nested hashes are also of this type.
@@ -19,8 +47,6 @@ module LeapCli
     class Object < Hash
 
       attr_reader :node
-      attr_reader :manager
-      alias :global :manager
 
       def initialize(manager=nil, node=nil)
         # keep a global pointer around to the config manager. used a lot in the eval strings and templates
@@ -31,6 +57,19 @@ module LeapCli
         @node = node || self
       end
 
+      def manager
+        ManagerBinding.new(@manager, self)
+      end
+      alias :global :manager
+
+      def environment=(e)
+        self.store('environment', e)
+      end
+
+      def environment
+        self['environment']
+      end
+
       #
       # export YAML
       #
-- 
cgit v1.2.3