solr_wrapper 0.0.8 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d623c1253308fa9cc7f764545205bedb37b5762d
-  data.tar.gz: f780cad1a1d87bcb091a67ad93bb0cf8ef27653f
+  metadata.gz: b3ec6e7361a92276fb0c598b56ea2fdc17572bbd
+  data.tar.gz: caa89e5097dc0c14704187ed5de7bc67343c815f
 SHA512:
-  metadata.gz: b6fec0e500b9f9eb0e3b9310cac05a1b8fcb0d92a486163a5c948ec58384ff29ec47d3f90770e993db6c6b4736290bdc27efa89709ce1be9f2a68126d9fd03ec
-  data.tar.gz: e82830633d26c503626cee5a830ba6f577c07264bf6b06e49e5c01433784684b4a2ce4b108f5765c22e72fbbb1836cbea984b69d907a7864f5f58111b7e264fb
+  metadata.gz: 36f69de4648f9db4f3b361f888e4d5767ef120d00a8b916a8a4b8569a5026397e1f89b2adfdf885338daef6f33c5b28f85030f23c254843847d6e2fe44c2cd29
+  data.tar.gz: 58632ed157bc742f09df5b011eef3cfb5b06404e0b3460079146608c3689472ee8fcd2ffdd0538dcd3eef5156cf7c7986a658adb752940e523a3df77bf5e623c

data/exe/solr_wrapper

@@ -0,0 +1,30 @@
+#!/usr/bin/env ruby
+
+require 'solr_wrapper'
+require 'optparse'
+
+options = {}
+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("--version VERSION", "Specify a Solr version to download (default: #{SolrWrapper.default_solr_version})") do |v|
+    options[:version] = v
+  end
+
+  opts.on("-pPORT", "--port PORT", "Specify the port Solr should run at (default: 8983)") do |p|
+    options[:port] = p
+  end
+end.parse!
+
+# default to verbose
+options[:verbose] = true if options[:verbose].nil?
+
+SolrWrapper.wrap(options) do |conn|
+  while conn.status
+    sleep 1
+  end
+end

data/lib/solr_wrapper/instance.rb

@@ -10,7 +10,7 @@ require 'zip'
 
 module SolrWrapper
   class Instance
-    attr_reader :options
+    attr_reader :options, :pid
 
     ##
     # @param [Hash] options
@@ -63,6 +63,8 @@ module SolrWrapper
           sleep 1
         end
       end
+
+      @pid = nil
     end
 
     ##
@@ -205,8 +207,8 @@ module SolrWrapper
       if IO.respond_to? :popen4
         # JRuby
         env_str = env.map { |k, v| "#{Shellwords.escape(k)}=#{Shellwords.escape(v)}" }.join(" ")
-        _, input, output, error = IO.popen4(env_str + " " + args.join(" "))
-
+        pid, input, output, error = IO.popen4(env_str + " " + args.join(" "))
+        @pid = pid
         stringio = StringIO.new
         if verbose? && !output
           IO.copy_stream(output, $stderr)
@@ -234,8 +236,9 @@ module SolrWrapper
           else
             IO.copy_stream(io, stringio)
           end
-          _, exit_status = Process.wait2(io.pid)
+          @pid = io.pid
 
+          _, exit_status = Process.wait2(io.pid)
           stringio.rewind
 
           if exit_status != 0

data/lib/solr_wrapper/version.rb

@@ -1,3 +1,3 @@
 module SolrWrapper
-  VERSION = "0.0.8"
+  VERSION = "0.1.0"
 end

data/lib/solr_wrapper.rb

@@ -3,7 +3,7 @@ require 'solr_wrapper/instance'
 
 module SolrWrapper
   def self.default_solr_version
-    "5.1.0"
+    "5.2.1"
   end
 
   def self.default_instance(options = {})

data/solr_wrapper.gemspec

@@ -13,7 +13,8 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.bindir        = 'exe'
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solr_wrapper
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.1.0
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2015-04-19 00:00:00.000000000 Z
+date: 2015-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -111,7 +111,8 @@ dependencies:
 description: 
 email:
 - chris@cbeer.info
-executables: []
+executables:
+- solr_wrapper
 extensions: []
 extra_rdoc_files: []
 files:
@@ -125,6 +126,7 @@ files:
 - README.md
 - Rakefile
 - coveralls.yml
+- exe/solr_wrapper
 - lib/solr_wrapper.rb
 - lib/solr_wrapper/instance.rb
 - lib/solr_wrapper/version.rb