solr_wrapper 0.13.2 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 144bd1cb3f82253c8f8087f4eacf2d28eead0dc2
-  data.tar.gz: 12c08521281d856eea0bdb2bcc0facda073313b1
+  metadata.gz: 5211f8f7af81378325cf44e24cb8f93f06662e53
+  data.tar.gz: 0251f3cdb0be7e96b17873f50671a73f3bd60214
 SHA512:
-  metadata.gz: f8f0b4e93e6a5f5c5dcbc3fee67ce1875d3c5a36fd0c4dea4c9fa80f3c1c39ebcebb920c24ad31b3c5ea471b139b9dabf81bba4195aada4098e4c3d45e0d2eaa
-  data.tar.gz: e2eb48930e2e95ad2f3e1d045ccf6490dcd0f13c800161b316daffd2e02f656e9a33326f47ab47b8d871ded04ea1772340db9690201ca00e45f0a1fbfe4606cf
+  metadata.gz: fc74ab3b9c410159b831eebbfbc289ffbd0bd33d83d241c4c8d7ee907cab31f81e869eb7f0cd96db830de8ab6a6cf4944490b22afdfc83218c0b1b26864ecbba
+  data.tar.gz: 7c1e5a503b6834218d6621f6a95a4abd744f74b5f68e26846f472cad50ee6276ad588235a91c80209c51ae43bc59d4ba648582f342f13d485a320a48e0845d8d

data/lib/solr_wrapper/configuration.rb

@@ -2,9 +2,11 @@ module SolrWrapper
   class Configuration
     attr_reader :options
 
-    def initialize(options)
-      @options = read_config(options[:config], options[:verbose])
-             .merge options
+    def initialize(options = {})
+      @config = options[:config]
+      @verbose = options[:verbose]
+
+      @options = load_configs(Array(options[:config])).merge(options)
     end
 
     def solr_xml
@@ -87,7 +89,7 @@ module SolrWrapper
     end
 
     def verbose?
-      !!options.fetch(:verbose, false)
+      @verbose || (options && !!options.fetch(:verbose, false))
     end
 
     def version_file
@@ -114,21 +116,23 @@ module SolrWrapper
         keys.each_with_object({}) { |k, hash| hash[k] = source[k] if source.has_key?(k) }
       end
 
-      def read_config(config_file, verbose)
-        default_configuration_paths.each do |p|
+      def load_configs(config_files)
+        config = {}
+
+        (default_configuration_paths + config_files.compact).each do |p|
           path = File.expand_path(p)
-          config_file ||= path if File.exist? path
+          next unless File.exist? path
+          config.merge!(read_config(path))
         end
 
-        unless config_file
-          $stdout.puts "No config specified" if verbose
-          return {}
-        end
+        config
+      end
 
-        $stdout.puts "Loading configuration from #{config_file}" if verbose
+      def read_config(config_file)
+        $stdout.puts "Loading configuration from #{config_file}" if verbose?
         config = YAML.load(ERB.new(IO.read(config_file)).result(binding))
         unless config
-          $stderr.puts "Unable to parse config #{config_file}" if verbose
+          $stderr.puts "Unable to parse config #{config_file}" if verbose?
           return {}
         end
         convert_keys(config)
@@ -139,7 +143,7 @@ module SolrWrapper
       end
 
       def default_configuration_paths
-        ['.solr_wrapper', '~/.solr_wrapper']
+        ['~/.solr_wrapper.yml', '~/.solr_wrapper', '.solr_wrapper.yml', '.solr_wrapper']
       end
   end
 end

data/lib/solr_wrapper/version.rb

@@ -1,3 +1,3 @@
 module SolrWrapper
-  VERSION = '0.13.2'
+  VERSION = '0.14.0'
 end

data/spec/fixtures/another_sample_config.yml

@@ -0,0 +1,2 @@
+port: 9998
+verbose: true

data/spec/lib/solr_wrapper/configuration_spec.rb

@@ -22,13 +22,22 @@ describe SolrWrapper::Configuration do
     end
   end
 
-  describe "#read_config" do
+  describe "#load_configs" do
     before do
       allow(config).to receive(:default_configuration_paths).and_return([])
     end
-    let(:options) { { config: 'spec/fixtures/sample_config.yml' } }
-    it "uses values from the config file" do
-      expect(config.port).to eq '9999'
+    context 'with a single config file' do
+      let(:options) { { config: 'spec/fixtures/sample_config.yml' } }
+      it "uses values from the config file" do
+        expect(config.port).to eq '9999'
+      end
+    end
+    context 'with multiple config files' do
+      let(:options) { { config: ['spec/fixtures/sample_config.yml', 'spec/fixtures/another_sample_config.yml'] } }
+      it "uses values from the config file" do
+        expect(config.port).to eq '9998'
+        expect(config.verbose?).to eq true
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solr_wrapper
 version: !ruby/object:Gem::Version
-  version: 0.13.2
+  version: 0.14.0
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-05 00:00:00.000000000 Z
+date: 2016-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -167,6 +167,7 @@ files:
 - lib/solr_wrapper/tasks/solr_wrapper.rake
 - lib/solr_wrapper/version.rb
 - solr_wrapper.gemspec
+- spec/fixtures/another_sample_config.yml
 - spec/fixtures/basic_configs/_rest_managed.json
 - spec/fixtures/basic_configs/currency.xml
 - spec/fixtures/basic_configs/lang/stopwords_en.txt
@@ -206,6 +207,7 @@ signing_key:
 specification_version: 4
 summary: Solr 5 service wrapper
 test_files:
+- spec/fixtures/another_sample_config.yml
 - spec/fixtures/basic_configs/_rest_managed.json
 - spec/fixtures/basic_configs/currency.xml
 - spec/fixtures/basic_configs/lang/stopwords_en.txt