refactor config to use compose internally

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/commands/preview.rb

@@ -1,8 +1,6 @@
 module Bashly
   module Commands
     class Preview < Base
-      using ComposeRefinements
-      
       help "Generate the bash script to STDOUT"
 
       usage "bashly preview"
@@ -11,7 +9,7 @@ class Preview < Base
       environment "BASHLY_SOURCE_DIR", "The path containing the bashly configuration and source files [default: src]"
 
       def run
-        config = Config.new("#{Settings.source_dir}/bashly.yml").compose
+        config = Config.new "#{Settings.source_dir}/bashly.yml"
         command = Script::Command.new(config)
         script = Script::Wrapper.new command
         puts script.code

lib/bashly/commands/validate.rb

@@ -1,8 +1,6 @@
 module Bashly
   module Commands
     class Validate < Base
-      using ComposeRefinements
-      
       help "Scan the configuration file for errors"
 
       usage "bashly validate"
@@ -11,7 +9,7 @@ class Validate < Base
       environment "BASHLY_SOURCE_DIR", "The path containing the bashly configuration and source files [default: src]"
 
       def run
-        config = Config.new("#{Settings.source_dir}/bashly.yml").compose
+        config = Config.new "#{Settings.source_dir}/bashly.yml"
         validator = ConfigValidator.new config
         validator.validate
         say "!txtgrn!OK"

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

@@ -1,15 +1,13 @@
 module Bashly
   module Libraries
     class Completions < Base
-    using ComposeRefinements
-
     protected
       def command
         @command ||= Script::Command.new config
       end
 
       def config
-        @config ||= Bashly::Config.new("#{Settings.source_dir}/bashly.yml").compose
+        @config ||= Bashly::Config.new "#{Settings.source_dir}/bashly.yml"
       end
     end
   end