popper 0.2.5 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f00b7008ef966d2df6766ef842a17a560cf26b83
-  data.tar.gz: 0ddadcef3b9fa3513866832e99e74686f567e970
+  metadata.gz: f64201dd6c0c81cd7d7b23f2c87af9718ab3d2f5
+  data.tar.gz: 3c5af5b41d7deb61259915fbf9927209bd2fc71e
 SHA512:
-  metadata.gz: cf618186323477f48b7ecf604cb819b7b30f136ab0bd3bef1ddb929a49a1d437c7263e56a1f48f93d2e2f6fc314766cab30d089820ffcef13b0835b09cacf944
-  data.tar.gz: 06fac7bd05a05bd63d843e8f4faf5b4d1812aacfc9b445fc0f0cd262618623a92101c14948670e57969bb44ccdad1bb27047f5316b864e4a2abbec6ddfb95d82
+  metadata.gz: c7e30f24d3988c9198d4df617524dbda7ed85ea03dc3451db2874e7968f907512505f822c07366dac8b4119373e1043699fcfb8b3d5252d3c9454e67c15d743e
+  data.tar.gz: 479d39bb69090f99444153fa55c96c0c5d44a0e4434841a7f95f32f232777f95b165e42af45e3522bee94b277a0cd3088ce5bab4cc93e7499b7de1a5517c1ba1

data/README.md

@@ -29,6 +29,7 @@ systmd service config: https://github.com/pyama86/popper/tree/master/init_script
 # configure(toml)
 ## ~/popper/popper.conf
 ```
+include = ["/etc/popper/*.conf"]
 [global]
 interval = 60         # fetch interbal default:60
 

data/lib/popper/config.rb

@@ -6,8 +6,12 @@ module Popper
     attr_reader :global, :default, :accounts
     def initialize(config_path)
       raise "configure not fond #{config_path}" unless File.exist?(config_path)
-
       config = TOML.load_file(config_path)
+      if config.key?("include")
+        content = config["include"].map {|p| Dir.glob(p).map {|f|File.read(f)}}.join("\n")
+        config.deep_merge!(TOML::Parser.new(content).parsed)
+      end
+
       @global  = AccountAttributes.new(config["global"]) if config["global"]
       @default = AccountAttributes.new(config["default"]) if config["default"]
       @accounts = []
@@ -15,7 +19,7 @@ module Popper
       config.select {|k,v| !%w(default global).include?(k) }.each do |account|
         _account = AccountAttributes.new(account[1])
         _account.name = account[0]
-        @accounts << _account
+        self.accounts << _account
       end
     end
 

data/lib/popper/version.rb

@@ -1,3 +1,3 @@
 module Popper
-  VERSION = "0.2.5"
+  VERSION = "0.2.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: popper
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.7
 platform: ruby
 authors:
 - pyama86