solr_wrapper 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 268deefedc3708ca544b44edbe00c17edc5e7d45
-  data.tar.gz: 1b4d8ffae8633e33e71754485c92d27310b6baca
+  metadata.gz: 5229665bfffd6eb3c3e38108cd36d84b409cc54b
+  data.tar.gz: e8a7241dea583db2962c2b6d6246075b990a3d67
 SHA512:
-  metadata.gz: ad2ec9387d6393a46082c3d1217a282e9c75e77c90e7d5951528f9c565be6ff54fd4f403671f509f439bf67e8996b01decb8e907bd09320e4707350cbce17b83
-  data.tar.gz: d7423fccc5c26525ecf969d30a36c8a938dc0ecd8d4fed2c0cc9a1c3ae5ad38da1bfc5774cfbc65ed44c48296d60a95b5a12358050d06ab275caea4f1c39a02c
+  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

@@ -145,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
 
     ##
@@ -226,6 +227,10 @@ module SolrWrapper
     end
     # rubocop:enable Lint/RescueException
 
+    def version
+      @version ||= options.fetch(:version, SolrWrapper.default_solr_version)
+    end
+
     protected
 
     def extracted?
@@ -337,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.2'
+  VERSION = '0.5.0'
 end

metadata

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