buff-config 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59ca4b29daeba44f9f01e9fe35a4af3f5bf581ae
-  data.tar.gz: 1aef7ba41b927028a6f905392864db21439ab587
+  metadata.gz: 1a66d7f7a16bcd62f2884b59fd2349aaca08f4f0
+  data.tar.gz: e2cc963b2f0cb10683667276b5bdc8109bdd6993
 SHA512:
-  metadata.gz: 0b9d110f280832d85d71d474b284a4145eb0d55f8928b6e2e54d0ed9b31caeb815f21401c7c314183af77ed37fff4b3a42f6004bd0e3400a3188a66f128b54d4
-  data.tar.gz: f452c2678758fa962a8de4eb828669668e3875b523f664f7e4524f99f98eef705bb94581a778e0a378bb362f0a01e788e6826f59a8bebe911757805bbc2aeead
+  metadata.gz: 2ac38fb86f8601394d17a474c23f54565cbace252555db22df59259bca49bbc564e1531aacd85abe042a1343ce57940b5324c60cd6e80060c4817b5f5ad85d2d
+  data.tar.gz: a80b37ee7c68da0df03c8717e905d41fe3db6bacfa37cd49253344440b95230027e87ab541f832bf9db6300f955fc35669a80318c68a094b2c18c90a88cdb7d9

data/lib/buff/config/ruby.rb

@@ -8,17 +8,24 @@ module Buff
           # Parse the contents of the Ruby file into a Hash.
           #
           # @param [String] contents
+          # @param [String] path file that should be used as __FILE__
+          #   during eval
+          # @param [Object] context the parent Config object
           #
           # @return [Hash]
-          def parse(contents)
-            self.new(contents).send(:attributes)
+          def parse(contents, path=nil, context=nil)
+            self.new(contents, path, context).send(:attributes)
           end
         end
 
         # @param [String] contents
-        def initialize(contents)
+        # @param [String] path
+        # @param [Object] context
+        def initialize(contents, path=nil, context=nil)
+          path ||= "(buff-config)"
+          @context = context
           @attributes = Hash.new
-          instance_eval(contents)
+          instance_eval(contents, path)
         rescue Exception => ex
           raise Errors::InvalidConfig, ex
         end
@@ -31,6 +38,8 @@ module Buff
         def method_missing(m, *args, &block)
           if args.size > 0
             attributes[m.to_sym] = (args.length == 1) ? args[0] : args
+          elsif @context && @context.respond_to?(m)
+            @context.send(m, *args, &block)
           else
             super
           end
@@ -42,11 +51,12 @@ module Buff
       end
 
       class << self
-        # @param [String] data
+        # @param [String] contents
+        # @param [String] path
         #
         # @return [Buff::Config::Ruby]
-        def from_ruby(contents)
-          new.from_ruby(contents)
+        def from_ruby(contents, path=nil)
+          new.from_ruby(contents, path)
         end
 
         # @param [String] path
@@ -57,7 +67,7 @@ module Buff
         def from_file(path)
           path = File.expand_path(path)
           contents = File.read(path)
-          new(path).from_ruby(contents)
+          new(path).from_ruby(contents, path)
         rescue TypeError, Errno::ENOENT, Errno::EISDIR
           raise Errors::ConfigNotFound, "No configuration found at: '#{path}'"
         end
@@ -93,14 +103,14 @@ module Buff
 
       def initialize(path = nil, options = {})
         super
-        from_ruby(File.read(path)) if path && File.exists?(path)
+        from_ruby(File.read(path), path) if path && File.exists?(path)
       end
 
       # @raise [Buff::Errors::InvalidConfig]
       #
       # @return [Buff::Config::Ruby]
-      def from_ruby(contents)
-        hash = Buff::Config::Ruby::Evaluator.parse(contents)
+      def from_ruby(contents, path=nil)
+        hash = Buff::Config::Ruby::Evaluator.parse(contents, path, self)
         mass_assign(hash)
         self
       end

data/lib/buff/config/version.rb

@@ -1,5 +1,5 @@
 module Buff
   module Config
-    VERSION = "0.3.0"
+    VERSION = "0.4.0"
   end
 end

data/spec/buff/config/ruby_spec.rb

@@ -4,9 +4,12 @@ require 'buff/config/ruby'
 describe Buff::Config::Ruby do
   let(:ruby) do
     %(
+      current_dir = File.dirname(__FILE__)
       log_level       :info
       log_location    STDOUT
       cookbook_path   ['cookbooks']
+      knife[:foo] = 'bar'
+      knife[:key] = "\#{current_dir}/key.pem"
     )
   end
 
@@ -16,6 +19,7 @@ describe Buff::Config::Ruby do
       attribute :log_location
       attribute :node_name, default: 'bacon'
       attribute :cookbook_path
+      attribute :knife, default: {}
     end
   end
 
@@ -34,6 +38,13 @@ describe Buff::Config::Ruby do
         expect(config[:log_location]).to eq(STDOUT)
         expect(config[:node_name]).to eq('bacon')
         expect(config[:cookbook_path]).to eq(['cookbooks'])
+        expect(config[:knife][:foo]).to eq('bar')
+      end
+
+      it 'properly sets the calling file' do
+        config = subject.from_ruby(ruby, '/home/annie/.chef/knife.rb')
+
+        expect(config[:knife][:key]).to eq ('/home/annie/.chef/key.pem')
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: buff-config
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Jamie Winsor
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-29 00:00:00.000000000 Z
+date: 2013-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: varia_model