solr_wrapper 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26e84bf462a67bf41bcc28be718464861ce482d8
-  data.tar.gz: c38874bc575bfe27d3481ea5e6b61d8f9da28ca1
+  metadata.gz: 21a2a6e484329fe66c2531342783d9ac4007a1a3
+  data.tar.gz: 25cd86f3084f418c6a88192986b0ba6d6a2013b5
 SHA512:
-  metadata.gz: 28ade5c8d559625c6d584202ecdd9ce5ca0bc55d2e49fe3bfe3480629df45e766311986cf8d0a1ba80d2f1b3826094c18014c8e2dd3e754702067391d726846f
-  data.tar.gz: fc164fb6434984bd6c6f05964a2755b08c71c303480542dea0da5149dc0c3e60d79eb61c74afaafb8aa44a591baba8a728bb4420f34ca91055918b7ee38c064a
+  metadata.gz: 08b856eb075be3bb9521531f700ba0dd367f18917a787cda40537419707c16a69abc6c6ad27c1a64459a6642a73c7e0aa705d41e5fcc1a13d212dc5708b020fe
+  data.tar.gz: 9ee588f5119ad0806f84178b2969e7b06f26d3a0407913e5f0a99ae5d80585249a6b360e64e032795d778b3bc04173ab8419ad1b6ef4616a6eb2ea38a7e97481

data/exe/solr_wrapper

@@ -5,14 +5,14 @@ require 'optparse'
 
 options = {}
 collection_options = {}
-OptionParser.new do |opts|
+args = OptionParser.new do |opts|
   opts.banner = "Usage: solr_wrapper [options]"
 
   opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
     options[:verbose] = v
   end
 
-  opts.on("--config", "Load configuration from a file") do |v|
+  opts.on("--config FILE", "Load configuration from a file") do |v|
     options[:config] = v
   end
 
@@ -20,7 +20,7 @@ OptionParser.new do |opts|
     options[:version] = v
   end
 
-  opts.on("-pPORT", "--port PORT", "Specify the port Solr should run at (default: 8983)") do |p|
+  opts.on("-pPORT", "--port PORT", "Specify the port Solr should run at (default: #{SolrWrapper.default_solr_port})") do |p|
     if p == 'random'
       options[:port] = nil
     else
@@ -55,12 +55,20 @@ OptionParser.new do |opts|
   opts.on("--no-checksum", "Skip running checksum validation on the downloaded file") do |d|
     options[:ignore_md5sum] = true
   end
-end.parse!
+end
+
+begin
+  args.parse!
+rescue => error
+  $stderr.puts "ERROR: #{error}\n"
+  $stderr.puts args.help
+  exit 1
+end
 
 # default to verbose
 options[:verbose] = true if options[:verbose].nil?
 
-instance = SolrWrapper.default_instance(options)
+instance = SolrWrapper.instance(options)
 $stderr.print "Starting Solr #{instance.version} on port #{instance.port} ... "
 instance.wrap do |conn|
   conn.with_collection(collection_options) do

data/lib/solr_wrapper/configuration.rb

@@ -38,12 +38,28 @@ module SolrWrapper
       options.fetch(:port) { SolrWrapper.default_instance_options[:port] }.to_s
     end
 
+    def zookeeper_host
+      options[:zookeeper_host]
+    end
+
+    def zookeeper_port
+      options[:zookeeper_port]
+    end
+
     def download_path
       options[:download_path]
     end
 
     def download_dir
-      options[:download_dir]
+      options[:download_dir] || default_download_dir
+    end
+
+    def default_download_dir
+      if defined? Rails
+        File.join(Rails.root, 'tmp')
+      else
+        Dir.tmpdir
+      end
     end
 
     def solr_options

data/lib/solr_wrapper/instance.rb

@@ -50,6 +50,10 @@ module SolrWrapper
       config.url
     end
 
+    def instance_dir
+      config.instance_dir
+    end
+
     def version
       config.version
     end
@@ -126,12 +130,49 @@ module SolrWrapper
 
       create_options = { p: port }
       create_options[:c] = options[:name] if options[:name]
+      create_options[:n] = options[:config_name] if options[:config_name]
       create_options[:d] = options[:dir] if options[:dir]
       exec("create", create_options)
 
       options[:name]
     end
 
+    ##
+    # Update the collection configuration in zookeeper
+    # @param [Hash] options
+    # @option options [String] :config_name
+    # @option options [String] :dir
+    def upconfig(options = {})
+      options[:name] ||= SecureRandom.hex
+      options[:zkhost] ||= zkhost
+
+      upconfig_options = { upconfig: true, n: options[:name] }
+      upconfig_options[:d] = options[:dir] if options[:dir]
+      upconfig_options[:z] = options[:zkhost] if options[:zkhost]
+
+      exec 'zk', upconfig_options
+
+      options[:name]
+    end
+
+    ##
+    # Copy the collection configuration from zookeeper to a local directory
+    # @param [Hash] options
+    # @option options [String] :config_name
+    # @option options [String] :dir
+    def downconfig(options = {})
+      options[:name] ||= SecureRandom.hex
+      options[:zkhost] ||= zkhost
+
+      downconfig_options = { downconfig: true, n: options[:name] }
+      downconfig_options[:d] = options[:dir] if options[:dir]
+      downconfig_options[:z] = options[:zkhost] if options[:zkhost]
+
+      exec 'zk', downconfig_options
+
+      options[:name]
+    end
+
     ##
     # Create a new collection in solr
     # @param [String] name collection name
@@ -314,6 +355,10 @@ module SolrWrapper
       end
     end
 
+    def zkhost
+      "#{config.zookeeper_host}:#{config.zookeeper_port}" if config.cloud
+    end
+
     def raise_error_unless_extracted
       raise RuntimeError, "there is no solr instance at #{config.instance_dir}.  Run SolrWrapper.extract first." unless extracted?
     end

data/lib/solr_wrapper/settings.rb

@@ -25,6 +25,11 @@ module SolrWrapper
       '127.0.0.1'
     end
 
+    def zookeeper_host
+      @zookeeper_host ||= static_config.zookeeper_port
+      @zookeeper_host ||= host
+    end
+
     ##
     # Get the port this Solr instance is running at
     def port
@@ -32,6 +37,12 @@ module SolrWrapper
       @port ||= random_open_port.to_s
     end
 
+    def zookeeper_port
+      @zookeeper_port ||= static_config.zookeeper_port
+      @zookeeper_port ||= "#{port.to_i + 1000}"
+    end
+
+
     ##
     # Get a (likely) URL to the solr instance
     def url
@@ -85,7 +96,6 @@ module SolrWrapper
 
       def download_dir
         @download_dir ||= static_config.download_dir
-        @download_dir ||= Dir.tmpdir
         FileUtils.mkdir_p @download_dir
         @download_dir
       end

data/lib/solr_wrapper/tasks/solr_wrapper.rake

@@ -4,8 +4,7 @@ require 'solr_wrapper'
 namespace :solr do
   desc "Load the solr options and solr instance"
   task :environment do
-    SolrWrapper.default_instance_options[:download_dir] ||= Rails.root.to_s + '/tmp' if defined? Rails
-    @solr_instance = SolrWrapper.default_instance
+    @solr_instance = SolrWrapper.instance
   end
 
   desc 'Install a clean version of solr. Replaces the existing copy if there is one.'

data/lib/solr_wrapper/version.rb

@@ -1,3 +1,3 @@
 module SolrWrapper
-  VERSION = '0.8.0'
+  VERSION = '0.9.0'
 end

data/lib/solr_wrapper.rb

@@ -10,9 +10,13 @@ module SolrWrapper
     '6.0.0'
   end
 
+  def self.default_solr_port
+    '8983'
+  end
+
   def self.default_instance_options
     @default_instance_options ||= {
-      port: '8983',
+      port: SolrWrapper.default_solr_port,
       version: SolrWrapper.default_solr_version
     }
   end
@@ -22,12 +26,16 @@ module SolrWrapper
   end
 
   def self.default_instance(options = {})
-    @default_instance ||= SolrWrapper::Instance.new options
+    @default_instance ||= instance(default_instance_options)
+  end
+
+  def self.instance(options)
+    SolrWrapper::Instance.new(options)
   end
 
   ##
   # Ensures a Solr service is running before executing the block
   def self.wrap(options = {}, &block)
-    default_instance(options).wrap &block
+    instance(options).wrap &block
   end
 end

data/spec/lib/solr_wrapper/instance_spec.rb

@@ -1,7 +1,8 @@
 require 'spec_helper'
 
 describe SolrWrapper::Instance do
-  let(:solr_instance) { SolrWrapper::Instance.new }
+  let(:options) { {} }
+  let(:solr_instance) { SolrWrapper::Instance.new(options) }
   subject { solr_instance }
   let(:client) { SimpleSolrClient::Client.new(subject.url) }
 
@@ -34,6 +35,24 @@ describe SolrWrapper::Instance do
     end
   end
 
+  context 'with a SolrCloud instance' do
+    let(:options) { { cloud: true } }
+    it 'can upload configurations' do
+      subject.wrap do |solr|
+        config_name = solr.upconfig dir: File.join(FIXTURES_DIR, 'basic_configs')
+        Dir.mktmpdir do |dir|
+          solr.downconfig name: config_name, dir: dir
+        end
+        solr.with_collection(config_name: config_name) do |collection_name|
+          core = client.core(collection_name)
+          unless defined? JRUBY_VERSION
+            expect(core.all.size).to eq 0
+          end
+        end
+      end
+    end
+  end
+
   describe 'exec' do
     let(:cmd) { 'start' }
     let(:options) { { p: '4098', help: true } }
@@ -71,6 +90,11 @@ describe SolrWrapper::Instance do
     it { is_expected.to eq 'http://127.0.0.1:8983/solr/' }
   end
 
+  describe "#instance_dir" do
+    subject { solr_instance.instance_dir }
+    it { is_expected.to start_with Dir.tmpdir }
+  end
+
   describe "#version" do
     subject { solr_instance.version }
     it { is_expected.to eq '6.0.0' }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solr_wrapper
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-11 00:00:00.000000000 Z
+date: 2016-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip