solr_wrapper 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02801c03fb674022382afba55cb728b5ec82d177
-  data.tar.gz: e042c59c01ab0ed69f48a0415032c5e5f798ae4b
+  metadata.gz: ce8d8ac85d7a99148fca4876c7b9e5ce092224f7
+  data.tar.gz: 7dc6333a599a500d996d50e03d777b86429a00e8
 SHA512:
-  metadata.gz: 36168cce73a5fef10a0e683068363955f94f23cfc92132f6bf856b89d75605f9a804506aa8d2cd6bdc07acdc930f5053fb43a6aab7eeac311eb9d427b9f04d06
-  data.tar.gz: c9e006036531e1e31a23b3babda62345a1c6742d741d7ede1fa4f2eeac579f3dd3372dacfc9f6be6924dfdee883bc594b9b1f39882fe17f52db90f077cd16466
+  metadata.gz: ee2b2a29b6dd15c5b0e02fa11f6bef560394437b5bb3c69639e00d9ac35de9cb953f76e298b8b67f27d3209238a1fb60929293f506fdc33dd4b9d43a03c2a0f2
+  data.tar.gz: 9ad3a192f2bf3d68ee18b4213154ec975dd7107b705e0d4e5b34827a03e02535b727725887948d495d781d900ddf4d33956d3f3fc6fe4d14a57d7296281fae06

data/lib/solr_wrapper/instance.rb

@@ -4,6 +4,7 @@ require 'json'
 require 'open-uri'
 require 'ruby-progressbar'
 require 'securerandom'
+require 'socket'
 require 'stringio'
 require 'tmpdir'
 require 'zip'
@@ -133,10 +134,16 @@ module SolrWrapper
       end
     end
 
+    ##
+    # Get the host this Solr instance is bound to
+    def host
+      '127.0.0.1'
+    end
+
     ##
     # Get the port this Solr instance is running at
     def port
-      options.fetch(:port, "8983").to_s
+      @port ||= options.fetch(:port, random_open_port).to_s
     end
 
     ##
@@ -159,7 +166,7 @@ module SolrWrapper
     ##
     # Get a (likely) URL to the solr instance
     def url
-      "http://127.0.0.1:#{port}/solr/"
+      "http://#{host}:#{port}/solr/"
     end
 
     def configure
@@ -329,7 +336,7 @@ module SolrWrapper
     end
 
     def version
-      @version ||= options.fetch(:version, default_solr_version)
+      @version ||= options.fetch(:version, SolrWrapper.default_solr_version)
     end
 
     def solr_options
@@ -340,10 +347,6 @@ module SolrWrapper
       options.fetch(:env, {})
     end
 
-    def default_solr_version
-      SolrWrapper.default_solr_version
-    end
-
     def download_path
       @download_path ||= options.fetch(:download_path, default_download_path)
     end
@@ -418,6 +421,16 @@ module SolrWrapper
       end
     end
 
+    def random_open_port
+      socket = Socket.new(:INET, :STREAM, 0)
+      begin
+        socket.bind(Addrinfo.tcp('127.0.0.1', 0))
+        socket.local_address.ip_port
+      ensure
+        socket.close
+      end
+    end
+
     def raise_error_unless_extracted
       raise RuntimeError, "there is no solr instance at #{instance_dir}.  Run SolrWrapper.extract first." unless extracted?
     end

data/lib/solr_wrapper/version.rb

@@ -1,3 +1,3 @@
 module SolrWrapper
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

data/lib/solr_wrapper.rb

@@ -7,7 +7,14 @@ module SolrWrapper
   end
 
   def self.default_instance_options
-    @default_instance_options ||= {}
+    @default_instance_options ||= {
+      port: '8983',
+      version: SolrWrapper.default_solr_version
+    }
+  end
+
+  def self.default_instance_options=(options)
+    @default_instance_options = options
   end
 
   def self.default_instance(options = {})

data/spec/lib/solr_wrapper/instance_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe SolrWrapper::Instance do
   let(:solr_instance) { SolrWrapper::Instance.new }
   subject { solr_instance }
-  let(:client) { SimpleSolrClient::Client.new("http://localhost:#{subject.port}/solr/") }
+  let(:client) { SimpleSolrClient::Client.new(subject.url) }
   describe "#with_collection" do
     it "should create a new anonymous collection" do
       subject.wrap do |solr|

data/spec/lib/solr_wrapper_spec.rb

@@ -12,4 +12,11 @@ describe SolrWrapper do
       end
     end
   end
+
+  describe ".default_instance_options=" do
+    it "sets default options" do
+      SolrWrapper.default_instance_options = { port: '1234' }
+      expect(SolrWrapper.default_instance_options[:port]). to eq '1234'
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solr_wrapper
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-15 00:00:00.000000000 Z
+date: 2015-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip