fuguta 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92905485ce6e06ca93109c369479aacbcc7def95
-  data.tar.gz: 1f647bae465d7c80bdb6f5a432f8ea39f794f314
+  metadata.gz: dcf23c4ee6d9c6af1146a8cb392a5268720c54f3
+  data.tar.gz: bbf9e13a00e1a04e007d8ef2ae0142a4f6566adf
 SHA512:
-  metadata.gz: c02eae631c8525de8dc26a8af4d7c884184818a0a607937f593a2be4571d8b1b95b7e043d2eccf020844eaf087488fd919e3337f4ef94229fcd3f4c0389adcf2
-  data.tar.gz: 84057e454169cd33420b6e740e0a2883432deba7abcb60eb75bb0712697044e37b70fdafdbb80ada8c2a2009e4ef5b9c26e2be7085ad96991090036cdb5d9a93
+  metadata.gz: 7a0c305f4447833807a98f463d6e7843e9c9f854784a5f782209a57bc1bd52e12732daf9c911d6e87fdbef36a63c102913263380628b32d74555ca74c9ba8e36
+  data.tar.gz: 1d13e29e31dfa597f197272b32f4ff3a5716132ac40d1d48628719ac70ed8f582d3de316e7c7366ac7393ebef4ab7bcd51e7b93c54c00b8fb52b4e8d5251eaf6

data/.gitignore

@@ -0,0 +1,3 @@
+pkg/
+.bundle
+Gemfile.lock

data/.travis.yml

@@ -0,0 +1,9 @@
+script: bundle exec rspec
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - ruby-head
+
+matrix:
+  allow_failures:
+    - rvm: ruby-head

data/Gemfile

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+gemspec
+
+group :test do
+  gem 'rspec'
+end

data/README.md

@@ -1,6 +1,8 @@
 Fuguta
 ======
 
-[![Gem Version](https://badge.fury.io/rb/fuguta.png)](http://badge.fury.io/rb/fuguta) [![Code Climate](https://codeclimate.com/github/axsh/fuguta.png)](https://codeclimate.com/github/axsh/fuguta)
+[![Gem Version](https://badge.fury.io/rb/fuguta.png)](http://badge.fury.io/rb/fuguta)
+[![Code Climate](https://codeclimate.com/github/axsh/fuguta.png)](https://codeclimate.com/github/axsh/fuguta)
+[![Build Status](https://travis-ci.org/axsh/fuguta.png?branch=master)](https://travis-ci.org/axsh/fuguta)
 
 Configuration framework for Ruby programs

data/lib/fuguta.rb

@@ -45,7 +45,9 @@ module Fuguta
         end
 
         @conf.parse_dsl do |me|
+          me.instance_variable_set(:@loading_path, path.to_s)
           me.instance_eval(buf, path.to_s)
+          me.instance_variable_set(:@loading_path, nil)
         end
       end
 
@@ -62,11 +64,38 @@ module Fuguta
       def initialize(subject)
         @subject = subject
         @config = subject.config
+        @loading_path = nil
       end
 
       def config
         self
       end
+
+      # Load separate configuration files from the file.
+      #
+      # Load relative path file.
+      # ----------------
+      #   load 'test2.conf'
+      #
+      # Load absolute path file.
+      # ----------------
+      #   load '/etc/test2.conf'
+      def load(*paths)
+        l = Loader.new(@subject)
+        paths.each { |path|
+          if path =~ %r{^/}
+            # Load absolute path
+            l.load(path)
+          else
+            # Load relative path
+            base_conf_dir = (@loading_path.nil? ? Dir.pwd : File.dirname(@loading_path))
+            l.load(File.expand_path(path, base_conf_dir))
+          end
+        }
+        l.validate
+        
+        self
+      end
     end
 
     module ConfigurationMethods
@@ -247,6 +276,21 @@ module Fuguta
         @on_param_create_hooks.clear
       end
 
+      # Load configuration file
+      #
+      # 1. Simply loads single configuration file.
+      #   conf = ConfigurationClass.load('1.conf')
+      #
+      # 2. Loads multiple files and merge.
+      #
+      # file1.conf:
+      #   config.param1 = 1
+      #
+      # file2.conf:
+      #   config.param1 = 2
+      #
+      #   conf = ConfigurationClass.load('file1.conf', 'file2.conf')
+      #   conf.param1 == 2
       def load(*paths)
         c = self.new
 

data/lib/fuguta/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Fuguta
-  VERSION='1.0.1'
+  VERSION='1.0.2'
 end

data/spec/configuration_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe Fuguta::Configuration do
+  class Test1 < Fuguta::Configuration
+    param :param1
+    param :param2
+  end
+  
+  it "loads conf file" do
+    conf = Test1.load(File.expand_path('../test1.conf', __FILE__))
+    expect(conf.param1).to eq(1)
+    expect(conf.param2).to eq(2)
+  end
+
+  it "loads multiple conf files" do
+    conf = Test1.load(File.expand_path('../test1.conf', __FILE__), File.expand_path('../test2.conf', __FILE__))
+    expect(conf.param1).to eq(10)
+    expect(conf.param2).to eq(20)
+  end
+
+  it "allows nested imports/loads" do
+    conf = Test1.load(File.expand_path('../nest-test1.conf', __FILE__))
+    expect(conf.param1).to eq(10)
+    expect(conf.param2).to eq(20)
+  end
+end

data/spec/nest-test1.conf

@@ -0,0 +1,4 @@
+config.param1 = 1
+config.param2 = 2
+
+load 'test2.conf'

data/spec/spec_helper.rb

@@ -0,0 +1,11 @@
+# encoding: utf-8
+
+require 'rubygems'
+require 'bundler/setup'
+$:.unshift File.expand_path('../../lib', __FILE__)
+
+require 'rspec'
+require 'fuguta'
+
+RSpec.configure do |config|
+end

data/spec/test1.conf

@@ -0,0 +1,2 @@
+config.param1 = 1
+config.param2 = 2

data/spec/test2.conf

@@ -0,0 +1,2 @@
+config.param1 = 10
+config.param2 = 20

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fuguta
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Axsh co. LTD
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-05 00:00:00.000000000 Z
+date: 2013-08-22 00:00:00.000000000 Z
 dependencies: []
 description: A configuration framework for Ruby programs
 email: 
@@ -16,11 +16,19 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
+- .travis.yml
+- Gemfile
 - LICENSE
 - README.md
 - fuguta.gemspec
 - lib/fuguta.rb
 - lib/fuguta/version.rb
+- spec/configuration_spec.rb
+- spec/nest-test1.conf
+- spec/spec_helper.rb
+- spec/test1.conf
+- spec/test2.conf
 homepage: https://github.com/axsh/fuguta
 licenses: []
 metadata: {}