solr_wrapper 0.9.2 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 355fb4da1493c8acef5c50b5592fbe773c220bf2
-  data.tar.gz: 028aaa504c0253da58d78ad498bdfe45849c0795
+  metadata.gz: 7916cf546d675d2a3f008f4a271aa4fc2cf7b8ae
+  data.tar.gz: 3d2e1456ff74edb606a60cef2fa1731ae5a74351
 SHA512:
-  metadata.gz: 5852f71aa91dca84cc24c4587a0300c3cafc218e621d6400a1a21eeab070a659dfa2f81a88417f347af032a9606ad850633548a1079a42cf113244fefcf185be
-  data.tar.gz: 78bc51949c8bf5c2a1dfa107a01144f748e4a3b834b9602fad88ad01785c20e5e74fcf1ea0ce48ef1081681baf79e9ca12d73e74414484206ee65d0db9177ef2
+  metadata.gz: ff2b8b312c13c8b68c233f0799c68f36761109beea56fe2648485a89be28980b53d16d5646479ce58c0575cdde11025ff9ed74b81c923eb923953dcfbcf862cf
+  data.tar.gz: 58a248017fd9ec7330af89ca300d686710a6c71c36d96d9af5cd1967e8c1a703be7618835d30d3f5f7066958e1046fef686f3fa2b0d2d308e3c8f4990c3963fe

data/lib/solr_wrapper/configuration.rb

@@ -99,6 +99,11 @@ module SolrWrapper
       Configuration.slice(convert_keys(hash), :name, :dir)
     end
 
+    def configsets
+      configsets = options[:configsets] || []
+      configsets.map { |x| convert_keys(x) }
+    end
+
     def poll_interval
       options.fetch(:poll_interval, 1)
     end

data/lib/solr_wrapper/instance.rb

@@ -77,6 +77,8 @@ module SolrWrapper
         unless status
           sleep config.poll_interval
         end
+
+        after_start
       end
     end
 
@@ -355,6 +357,16 @@ module SolrWrapper
 
     private
 
+    def after_start
+      create_configsets if config.cloud
+    end
+
+    def create_configsets
+      config.configsets.each do |configset|
+        upconfig(configset)
+      end
+    end
+
     def extracted_version
       File.read(config.version_file).strip if File.exists? config.version_file
     end

data/lib/solr_wrapper/version.rb

@@ -1,3 +1,3 @@
 module SolrWrapper
-  VERSION = '0.9.2'
+  VERSION = '0.10.0'
 end

data/spec/fixtures/sample_config.yml

@@ -2,3 +2,6 @@ port: 9999
 collection:
   dir: solr/config/
   name: project-development
+configsets:
+  - dir: solr/config/
+    name: project-development-configset

data/spec/lib/solr_wrapper/configuration_spec.rb

@@ -41,4 +41,15 @@ describe SolrWrapper::Configuration do
       expect(config.collection_options).to eq(name: 'project-development', dir: 'solr/config/')
     end
   end
+
+  describe '#configsets' 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.configsets).to include(name: 'project-development-configset', dir: 'solr/config/')
+    end
+  end
 end

data/spec/lib/solr_wrapper/instance_spec.rb

@@ -7,6 +7,7 @@ describe SolrWrapper::Instance do
   let(:client) { SimpleSolrClient::Client.new(subject.url) }
 
   describe "#with_collection" do
+    let(:options) { { cloud: false } }
     context "without a name" do
       it "creates a new anonymous collection" do
         subject.wrap do |solr|
@@ -51,6 +52,22 @@ describe SolrWrapper::Instance do
         end
       end
     end
+
+    context 'with a config file' do
+      before do
+        allow(solr_instance.config).to receive(:configsets)
+          .and_return([name: 'project-development', dir: 'solr/config/'])
+      end
+
+      it 'creates a new configsets with options from the config' do
+        expect(subject).to receive(:upconfig).with(
+          hash_including(name: 'project-development', dir: anything))
+
+        subject.wrap do
+          # no-op
+        end
+      end
+    end
   end
 
   describe 'exec' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solr_wrapper
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.10.0
 platform: ruby
 authors:
 - Chris Beer