Restructure environments some to allow parent environment paths to be…

… relative to the file rather than cwd; add functional examples for environments

examples/environments/child.rb

@@ -0,0 +1,3 @@
+environment 'child', 'simple.rb' do |e|
+  e.bar = 'baz'
+end

examples/environments/simple.rb

@@ -0,0 +1,3 @@
+environment 'simple' do |e|
+  e.foo = "bar"
+end

lib/bedouin/environment.rb

@@ -2,13 +2,28 @@
 module Bedouin
   class Environment < OpenStruct
     def self.parse(filename)
-      DSL.new.instance_eval File.read(filename)
+      DSL.new(filename).evaluate
     end
 
-    def self.resolve_parent(parent)
+    def initialize(n,base={})
+      super(base)
+      name = n
+    end
+
+    class DSL
+      def initialize(filename)
+        @filename=filename
+      end
+
+      def evaluate
+        self.instance_eval(File.read(@filename), @filename)
+      end
+
+      def resolve_parent(parent)
         parent_hash = case parent
-        when String, File
-          Environment.parse(parent)
+        when String
+          parent_path = File.expand_path(parent, File.dirname(@filename))
+          Environment.parse(parent_path)
         when NilClass
           nil
         else
@@ -20,16 +35,10 @@ def self.resolve_parent(parent)
         end
 
         parent_hash
-    end
-
-    def initialize(n,base={})
-      super(base)
-      name = n
-    end
+      end
 
-    class DSL
       def environment(name,parent=nil,&block)
-        parent_hash = Environment.resolve_parent(parent)
+        parent_hash = resolve_parent(parent)
         e = Environment.new(name,parent_hash)
         e.instance_eval &block if block_given?
         return e

spec/bedouin/environment_spec.rb

@@ -7,10 +7,10 @@
     hashlike.define_singleton_method(:to_h) do
       { hashlike: "foo" }
     end
-    expect(Bedouin::Environment.resolve_parent(hashlike).to_h).to eq({ hashlike: "foo" })
+    expect(Bedouin::Environment::DSL.new('foo').resolve_parent(hashlike).to_h).to eq({ hashlike: "foo" })
   end
 
-  it "raises an ArgumentError for parent objects that aren't hash-like or strings/files" do
-    expect { Bedouin::Environment.resolve_parent(Object.new) }.to raise_error(ArgumentError)
+  it "raises an ArgumentError for parent objects that aren't hash-like or path strings that parse to hash-like" do
+    expect { Bedouin::Environment::DSL.new('foo').resolve_parent(Object.new) }.to raise_error(ArgumentError)
   end
 end