solr_wrapper 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce8d8ac85d7a99148fca4876c7b9e5ce092224f7
-  data.tar.gz: 7dc6333a599a500d996d50e03d777b86429a00e8
+  metadata.gz: 5229665bfffd6eb3c3e38108cd36d84b409cc54b
+  data.tar.gz: e8a7241dea583db2962c2b6d6246075b990a3d67
 SHA512:
-  metadata.gz: ee2b2a29b6dd15c5b0e02fa11f6bef560394437b5bb3c69639e00d9ac35de9cb953f76e298b8b67f27d3209238a1fb60929293f506fdc33dd4b9d43a03c2a0f2
-  data.tar.gz: 9ad3a192f2bf3d68ee18b4213154ec975dd7107b705e0d4e5b34827a03e02535b727725887948d495d781d900ddf4d33956d3f3fc6fe4d14a57d7296281fae06
+  metadata.gz: 8c69756abf7399f832f0bf43e2b36d215634fa5d6819bf1809b94e34f9dbf82adf51483c8ab6d5c8b99ac3c941dfad020bb18721dd7b24ff39c4d83eb0973910
+  data.tar.gz: e8d79fda52e963694f6e253743ed45e19b41c4c0c676ab73b183340de0d1b8385fa8521da3681e9fd6a16fe6d78ae18aed50b74fa5c1974c6c37e35abf8588a8

data/exe/solr_wrapper

@@ -17,7 +17,11 @@ OptionParser.new do |opts|
   end
 
   opts.on("-pPORT", "--port PORT", "Specify the port Solr should run at (default: 8983)") do |p|
-    options[:port] = p
+    if p == 'random'
+      options[:port] = nil
+    else
+      options[:port] = p
+    end
   end
 
   opts.on("-c", "--cloud", "Run solr in cloud mode") do |c|
@@ -45,10 +49,17 @@ end.parse!
 # default to verbose
 options[:verbose] = true if options[:verbose].nil?
 
-SolrWrapper.wrap(options) do |conn|
+instance = SolrWrapper.default_instance(options)
+$stderr.print "Starting Solr #{instance.version} on port #{instance.port} ... "
+instance.wrap do |conn|
   conn.with_collection(collection_options) do
-    while conn.status
-      sleep 1
+    $stderr.puts "http://#{instance.host}:#{instance.port}/solr/"
+    begin
+      while conn.status
+        sleep 1
+      end
+    rescue Interrupt
+      $stderr.puts "Solr is shutting down."
     end
   end
 end

data/lib/solr_wrapper/instance.rb

@@ -87,6 +87,8 @@ module SolrWrapper
 
       out = exec('status').read
       out =~ /running on port #{port}/
+    rescue
+      false
     end
 
     ##
@@ -143,7 +145,8 @@ module SolrWrapper
     ##
     # Get the port this Solr instance is running at
     def port
-      @port ||= options.fetch(:port, random_open_port).to_s
+      @port ||= options[:port]
+      @port ||= random_open_port.to_s
     end
 
     ##
@@ -224,6 +227,10 @@ module SolrWrapper
     end
     # rubocop:enable Lint/RescueException
 
+    def version
+      @version ||= options.fetch(:version, SolrWrapper.default_solr_version)
+    end
+
     protected
 
     def extracted?
@@ -335,10 +342,6 @@ module SolrWrapper
       "http://www.us.apache.org/dist/lucene/solr/#{version}/solr-#{version}.zip.md5"
     end
 
-    def version
-      @version ||= options.fetch(:version, SolrWrapper.default_solr_version)
-    end
-
     def solr_options
       options.fetch(:solr_options, {})
     end

data/lib/solr_wrapper/version.rb

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

data/lib/solr_wrapper.rb

@@ -3,7 +3,7 @@ require 'solr_wrapper/instance'
 
 module SolrWrapper
   def self.default_solr_version
-    '5.3.1'
+    '5.4.1'
   end
 
   def self.default_instance_options

metadata

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