sistero 0.4.7 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f3c64ef854714d344cfd1a2a93b9c20dfea9b66
-  data.tar.gz: 72c5aae40fbcdc4b2ff8ecf7afde30c6cc1cd60e
+  metadata.gz: 8e4048930bcc2a2f632980319e5a83eaf034b50c
+  data.tar.gz: 83230f81639f17f0fb1cff7bc9cb4dc71d53fbdf
 SHA512:
-  metadata.gz: 397837f512444c737374ac89b66f1bb063f2f833f3eba5a85cf53f3008a3f656c94d2d96a770ca7331b0cd60fd70d688da82b79da0c75c2a433bb2678691ce73
-  data.tar.gz: 1eeb95a43cdce98b8533fcc50f1bc8ddce355c2d8d681d25ce5b6f8ce0550afea388c8ecb112ed0fa599e193f31a7039888bbab92852b7e0050e299c8295d3f2
+  metadata.gz: 837b46f87178b4e135db4d75b2264145915d39e34d1e758364ef65fc3017e70b5867e2321eaed8d809bcab039f797eee36ca5772575ab5e25c39f11aa9623da7
+  data.tar.gz: 2eff0e18edd34cedbf42dbbcb4e561496d9fedb089b247a14bf0bf95e6c499261c61bf4fc2000ccb06f0ece362392a1d3e103fb5f815dd97daf202cd8c77a067

data/lib/sistero/config.rb

@@ -35,12 +35,18 @@ module Sistero
 
     def initialize(opts = {})
       # read defaults from config file
-      cfg_file_path = opts[:cfg_file_path] || "#{ENV['HOME']}/.config/#{APP_NAME}"
+      cfg_file_path = opts[:cfg_file_path]
+      unless cfg_file_path
+        cfg_file_path = 'sistero.yaml'
+        cfg_file_path = "#{ENV['HOME']}/.config/#{APP_NAME}" unless File.exists? cfg_file_path
+      end
 
       @defaults = Profile.new
       @profiles = []
 
       cfg = YAML.load_file cfg_file_path
+      postprocess_cfg cfg
+
       cfg['defaults'].each do |key, value|
         @defaults[key] = value
       end
@@ -59,5 +65,20 @@ module Sistero
     def to_s
       @profiles.map(&:to_s).join "\n"
     end
+
+    private
+    def postprocess_cfg config
+      if config.is_a? Array
+        config.map &method(:postprocess_cfg)
+      elsif config.is_a? Hash
+        if config.length == 1 and config.has_key? 'file'
+          File.read(config['file']).strip
+        else
+          config.update(config) { |key, val| postprocess_cfg val }
+        end
+      else
+        config
+      end
+    end
   end
 end

data/lib/sistero/version.rb

@@ -1,3 +1,3 @@
 module Sistero
-  VERSION = '0.4.7'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sistero
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.5.0
 platform: ruby
 authors:
 - James Pike