solr_wrapper 0.18.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77650c2027982f2b38ccfb7bacd68256533c9a8a
-  data.tar.gz: 9c9b6e6ff2fb3e152330148fc133d98d16cab042
+  metadata.gz: c79d57707566b9eb01ef46907be4d6990b4605a1
+  data.tar.gz: 2702fa747f39c90047d032c8187870dadab62d5a
 SHA512:
-  metadata.gz: 29ad4272bd32b464f3477816731a0a60cc913918c1675a1bb56de0faad36d385b6f7640d398bf90e95c8a22c8008487a297c27fa1ab9795533697d525cfd0731
-  data.tar.gz: 550b5860c11b95a95d4b3d18aaa746029307029b5df95ecad0a84bf705ec3900fa7648c350feb42fd74a53428b13c358e1e8958baded580b75834c755f4aed6e
+  metadata.gz: f5b4dd813e6e3bac738a8c982e086545d40dd09995ee197275d0dda9aa4dcf00744245031f88cf5c7c6cca7d8d263fa2d7de7f82876124fdb6a4b1b390f6743b
+  data.tar.gz: bec2c92b37e4d24064228e8bef8537e6fbcb4d4c2183d43cf4b7b2f0d114e460ae9020dbee48917849452e63d200c33d147ed693563283d5536a0c6728a01c3f

data/exe/solr_wrapper

@@ -8,6 +8,7 @@ collection_options = {}
 subtext = <<HELP
 Commonly used command are:
    clean :     cleans all data from solr and configures a clean instance based on configuration options
+   dir   :     prints the solr instance dir
 See 'solr_wrapper COMMAND --help' for more information on a specific command.
 HELP
 
@@ -75,6 +76,9 @@ subcommands = {
     'clean' => OptionParser.new do |opts|
       opts.banner = "Usage: clean"
     end,
+    'dir' => OptionParser.new do |opts|
+      opts.banner = "Usage: dir"
+    end,
 }
 
 
@@ -94,26 +98,28 @@ end
 
 instance = SolrWrapper.instance(options)
 
-if command == 'clean'
+case command
+when 'clean'
   if instance.started?
     $stderr.puts "Please stop solr before cleaning"
     exit 1
   end
   $stderr.puts "cleaning #{instance.instance_dir}..."
   instance.remove_instance_dir!
-  exit 0
-end
-
-$stderr.print "Starting Solr #{instance.version} on port #{instance.port} ... "
-instance.wrap do |conn|
-  conn.with_collection(collection_options) do
-    $stderr.puts "http://#{instance.host}:#{instance.port}/solr/"
-    begin
-      conn.wait
-    rescue Interrupt
-      Signal.trap("SIGTERM") {"IGNORE"}
-      Signal.trap("SIGINT") {"IGNORE"}
-      $stderr.puts "Solr is shutting down."
+when 'dir'
+  puts instance.instance_dir
+else
+  $stderr.print "Starting Solr #{instance.version} on port #{instance.port} ... "
+  instance.wrap do |conn|
+    conn.with_collection(collection_options) do
+      $stderr.puts "http://#{instance.host}:#{instance.port}/solr/"
+      begin
+        conn.wait
+      rescue Interrupt
+        Signal.trap("SIGTERM") {"IGNORE"}
+        Signal.trap("SIGINT") {"IGNORE"}
+        $stderr.puts "Solr is shutting down."
+      end
     end
   end
 end

data/lib/solr_wrapper/instance.rb

@@ -221,16 +221,16 @@ module SolrWrapper
     def clean!
       stop
       remove_instance_dir!
-      FileUtils.remove_entry(config.download_dir, true) if File.exists?(config.download_dir)
-      FileUtils.remove_entry(config.tmp_save_dir, true) if File.exists? config.tmp_save_dir
+      FileUtils.remove_entry(config.download_dir, true) if File.exist?(config.download_dir)
+      FileUtils.remove_entry(config.tmp_save_dir, true) if File.exist? config.tmp_save_dir
       md5.clean!
-      FileUtils.remove_entry(config.version_file) if File.exists? config.version_file
+      FileUtils.remove_entry(config.version_file) if File.exist? config.version_file
     end
 
     ##
     # Clean up any files in the Solr instance dir
     def remove_instance_dir!
-      FileUtils.remove_entry(instance_dir, true) if File.exists? instance_dir
+      FileUtils.remove_entry(instance_dir, true) if File.exist? instance_dir
     end
 
     def configure
@@ -278,18 +278,18 @@ module SolrWrapper
 
       config.instance_dir
     ensure
-      FileUtils.remove_entry config.tmp_save_dir if File.exists? config.tmp_save_dir
+      FileUtils.remove_entry config.tmp_save_dir if File.exist? config.tmp_save_dir
     end
     # rubocop:enable Lint/RescueException
 
     protected
 
     def extracted?
-      File.exists?(config.solr_binary) && extracted_version == config.version
+      File.exist?(config.solr_binary) && extracted_version == config.version
     end
 
     def download
-      unless File.exists?(config.solr_zip_path) && md5.validate?(config.solr_zip_path)
+      unless File.exist?(config.solr_zip_path) && md5.validate?(config.solr_zip_path)
         Downloader.fetch_with_progressbar config.download_url, config.solr_zip_path
         md5.validate! config.solr_zip_path
       end
@@ -353,7 +353,7 @@ module SolrWrapper
 
       stringio.rewind
       if exit_status != 0 && cmd != 'status'
-        raise "Failed to execute solr #{cmd}: #{stringio.read}"
+        raise "Failed to execute solr #{cmd}: #{stringio.read}. Further information may be available in #{instance_dir}/logs"
       end
 
       stringio
@@ -372,7 +372,7 @@ module SolrWrapper
     end
 
     def extracted_version
-      File.read(config.version_file).strip if File.exists? config.version_file
+      File.read(config.version_file).strip if File.exist? config.version_file
     end
 
     def extracted_version=(version)

data/lib/solr_wrapper/md5.rb

@@ -6,7 +6,7 @@ module SolrWrapper
     end
 
     def clean!
-      FileUtils.remove_entry(config.md5sum_path) if File.exists? config.md5sum_path
+      FileUtils.remove_entry(config.md5sum_path) if File.exist? config.md5sum_path
     end
 
     def validate?(file)
@@ -33,7 +33,7 @@ module SolrWrapper
       end
 
       def md5file
-        unless File.exists? config.md5sum_path
+        unless File.exist? config.md5sum_path
           Downloader.fetch_with_progressbar config.md5url, config.md5sum_path
         end
 

data/lib/solr_wrapper/settings.rb

@@ -56,7 +56,7 @@ module SolrWrapper
     end
 
     def managed?
-      File.exists?(instance_dir)
+      File.exist?(instance_dir)
     end
 
     def download_url

data/lib/solr_wrapper/version.rb

@@ -1,3 +1,3 @@
 module SolrWrapper
-  VERSION = '0.18.0'
+  VERSION = '0.19.0'
 end

data/lib/solr_wrapper.rb

@@ -8,7 +8,7 @@ require 'solr_wrapper/client'
 
 module SolrWrapper
   def self.default_solr_version
-    '6.2.0'
+    '6.3.0'
   end
 
   def self.default_solr_port

data/spec/lib/solr_wrapper/instance_spec.rb

@@ -152,7 +152,7 @@ describe SolrWrapper::Instance do
 
   describe "#version" do
     subject { solr_instance.version }
-    it { is_expected.to eq '6.2.0' }
+    it { is_expected.to eq '6.3.0' }
   end
 
   describe "#md5" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solr_wrapper
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.19.0
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-06 00:00:00.000000000 Z
+date: 2016-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday