solr_wrapper 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '092270d968ea024833bc6185caf854c05c8e623e'
-  data.tar.gz: 83d3dd71ca0de7c18ee9090a06ff051b174dbf4a
+  metadata.gz: cad9f5f469895a40d84f56ad3616e31c57e70d71
+  data.tar.gz: d58ab53dbd4f74094c54236d17b77b94603bc700
 SHA512:
-  metadata.gz: c4da5d83939b7d10b089d4453b79fb778aa499809cbd114d634fe8e7e790a21896c73320055fa43d3682559768fcb5729f2062bde7ab1ee9beeb92e967c1cf50
-  data.tar.gz: c7373e52dcd5520e541947655b1e95c6fcd53e9ccf7b356d7bf2efa37f60bb36555508451bc46546c92b3b1899859040453072802e54ba9fd59238fed106553d
+  metadata.gz: 29d1843324f9737a005b4a73e885eb7d72bc73729ce61f1dca81b895dffedaf59ab2c744c6f85747b2d9821486c94d977c996d0c0b766845a82f45b159d03b08
+  data.tar.gz: 812ea387dbe8da2ba18f80c8d067b04e2bc0915f1b7d886b63fcb7c2c810bfda1c7eb7b69f1a139134baefc1d8f842102c515cbb2a842e3b23f75f2179973063

data/lib/solr_wrapper.rb

@@ -5,6 +5,9 @@ require 'solr_wrapper/md5'
 require 'solr_wrapper/downloader'
 require 'solr_wrapper/instance'
 require 'solr_wrapper/client'
+require 'solr_wrapper/runner'
+require 'solr_wrapper/popen_runner'
+require 'solr_wrapper/popen4_runner'
 
 module SolrWrapper
   def self.default_solr_version

data/lib/solr_wrapper/instance.rb

@@ -9,6 +9,7 @@ require 'tmpdir'
 require 'zip'
 require 'erb'
 require 'yaml'
+require 'retriable'
 
 module SolrWrapper
   class Instance
@@ -148,6 +149,10 @@ module SolrWrapper
       create_options[:n] = options[:config_name] if options[:config_name]
       create_options[:d] = options[:dir] if options[:dir]
 
+      Retriable.retriable do
+        raise "Not started yet" unless started?
+      end
+
       # short-circuit if we're using persisted data with an existing core/collection
       return if options[:persist] && create_options[:c] && client.exists?(create_options[:c])
 
@@ -307,51 +312,12 @@ module SolrWrapper
     # @example start solr in cloud mode on port 8983
     #   exec('start', {p: '8983', c: true})
     def exec(cmd, options = {})
-      silence_output = !options.delete(:output)
-
-      args = [config.solr_binary, cmd] + config.solr_options.merge(options).map do |k, v|
-        case v
-        when true
-          "-#{k}"
-        when false, nil
-          # don't return anything
-        else
-          ["-#{k}", "#{v}"]
-        end
-      end.flatten.compact
-
-      if IO.respond_to? :popen4
-        # JRuby
-        env_str = config.env.map { |k, v| "#{Shellwords.escape(k)}=#{Shellwords.escape(v)}" }.join(" ")
-        pid, input, output, error = IO.popen4(env_str + " " + args.join(" "))
-        stringio = StringIO.new
-        if config.verbose? && !silence_output
-          IO.copy_stream(output, $stderr)
-          IO.copy_stream(error, $stderr)
-        else
-          IO.copy_stream(output, stringio)
-          IO.copy_stream(error, stringio)
-        end
-
-        input.close
-        output.close
-        error.close
-        exit_status = Process.waitpid2(pid).last
-      else
-        IO.popen(config.env, args + [err: [:child, :out]]) do |io|
-          stringio = StringIO.new
-
-          if config.verbose? && !silence_output
-            IO.copy_stream(io, $stderr)
-          else
-            IO.copy_stream(io, stringio)
-          end
-
-          _, exit_status = Process.wait2(io.pid)
-        end
-      end
+      stringio = StringIO.new
+      # JRuby uses Popen4
+      command_runner = IO.respond_to?(:popen4) ? Popen4Runner : PopenRunner
+      runner = command_runner.new(cmd, options, config)
+      exit_status = runner.run(stringio)
 
-      stringio.rewind
       if exit_status != 0 && cmd != 'status'
         raise "Failed to execute solr #{cmd}: #{stringio.read}. Further information may be available in #{instance_dir}/logs"
       end

data/lib/solr_wrapper/popen4_runner.rb

@@ -0,0 +1,32 @@
+module SolrWrapper
+  # Runs a command using popen4 (typically for JRuby)
+  class Popen4Runner < Runner
+    def run(stringio)
+      pid, input, output, error = IO.popen4(command)
+      if config.verbose? && !silence_output?
+        IO.copy_stream(output, $stderr)
+        IO.copy_stream(error, $stderr)
+      else
+        IO.copy_stream(output, stringio)
+        IO.copy_stream(error, stringio)
+      end
+
+      input.close
+      output.close
+      error.close
+      exit_status = Process.waitpid2(pid).last
+      stringio.rewind
+      exit_status
+    end
+
+    private
+
+    def command
+      env_str + ' ' + argument_list.join(' ')
+    end
+
+    def env_str
+      config.env.map { |k, v| "#{Shellwords.escape(k)}=#{Shellwords.escape(v)}" }.join(' ')
+    end
+  end
+end

data/lib/solr_wrapper/popen_runner.rb

@@ -0,0 +1,19 @@
+module SolrWrapper
+  # Runs a command using popen (typically for MRI)
+  class PopenRunner < Runner
+    def run(stringio)
+      exit_status = nil
+      IO.popen(config.env, argument_list + [err: [:child, :out]]) do |io|
+        if config.verbose? && !silence_output?
+          IO.copy_stream(io, $stderr)
+        else
+          IO.copy_stream(io, stringio)
+        end
+
+        _, exit_status = Process.wait2(io.pid)
+      end
+      stringio.rewind
+      exit_status
+    end
+  end
+end

data/lib/solr_wrapper/runner.rb

@@ -0,0 +1,32 @@
+module SolrWrapper
+  # An abstract class for running commands in the shell
+  class Runner
+    def initialize(cmd, options, config)
+      @cmd = cmd
+      @silence_output = !options.delete(:output)
+      @options = options
+      @config = config
+    end
+
+    attr_reader :cmd, :options, :config
+
+    def silence_output?
+      @silence_output
+    end
+
+    private
+
+    def argument_list
+      [config.solr_binary, cmd] + config.solr_options.merge(options).map do |k, v|
+        case v
+        when true
+          "-#{k}"
+        when false, nil
+          nil
+        else
+          ["-#{k}", v.to_s]
+        end
+      end.flatten.compact
+    end
+  end
+end

data/lib/solr_wrapper/version.rb

@@ -1,3 +1,3 @@
 module SolrWrapper
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/solr_wrapper.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "faraday"
   spec.add_dependency "rubyzip"
   spec.add_dependency "ruby-progressbar"
+  spec.add_dependency "retriable"
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solr_wrapper
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-27 00:00:00.000000000 Z
+date: 2017-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: retriable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -162,7 +176,10 @@ files:
 - lib/solr_wrapper/downloader.rb
 - lib/solr_wrapper/instance.rb
 - lib/solr_wrapper/md5.rb
+- lib/solr_wrapper/popen4_runner.rb
+- lib/solr_wrapper/popen_runner.rb
 - lib/solr_wrapper/rake_task.rb
+- lib/solr_wrapper/runner.rb
 - lib/solr_wrapper/settings.rb
 - lib/solr_wrapper/tasks/solr_wrapper.rake
 - lib/solr_wrapper/version.rb
@@ -202,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Solr 5 service wrapper