Merge pull request #178 from DannyBen/fix/split-config-validation

Fix validation when using split config

Author: DannyBen

lib/bashly/commands/generate.rb

@@ -1,8 +1,6 @@
 module Bashly
   module Commands
     class Generate < Base
-      using ComposeRefinements
-
       help "Generate the bash script and required files"
 
       usage "bashly generate [--force --quiet --upgrade --wrap FUNCTION]"
@@ -118,7 +116,7 @@ def master_script_path
       end
 
       def config
-        @config ||= Config.new("#{Settings.source_dir}/bashly.yml").compose
+        @config ||= Config.new "#{Settings.source_dir}/bashly.yml"
       end
 
       def command

lib/bashly/config.rb

@@ -4,11 +4,13 @@ module Bashly
   # A convenience class to use either a hash or a filename as a configuration
   # source
   class Config
+    using ComposeRefinements
+
     attr_reader :config
 
     def self.new(config)
       if config.is_a? String
-        YAML.load_file config
+        YAML.load_file(config).compose
       else
         config
       end

lib/bashly/libraries/completions.rb

@@ -7,7 +7,7 @@ def command
       end
 
       def config
-        @config ||= Bashly::Config.new "#{Settings.source_dir}/bashly.yml"
+        @config ||= Config.new "#{Settings.source_dir}/bashly.yml"
       end
     end
   end

spec/bashly/config_spec.rb

@@ -18,8 +18,17 @@
 
   context "with a string argument" do
     let(:config) { "spec/fixtures/config.yml" }
+    
     it "treats the string as a path to YAML and loads it" do
-      expect(subject["loaded"]).to eq "yes indeed"      
+      expect(subject["loaded"]).to eq "yes indeed"
+    end
+
+    context "when the loaded YAML contains import directives" do
+      let(:config) { "spec/fixtures/import.yml" }
+
+      it "evaluates them" do
+        expect(subject["commands"].first['loaded']).to eq "yes indeed"
+      end
     end
   end
 

spec/fixtures/import.yml

@@ -0,0 +1,3 @@
+commands:
+  - import: spec/fixtures/config.yml
+