solr_wrapper 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7916cf546d675d2a3f008f4a271aa4fc2cf7b8ae
-  data.tar.gz: 3d2e1456ff74edb606a60cef2fa1731ae5a74351
+  metadata.gz: e09bf11e0bdc4b5b491f07d8a186d1a7b8a5f114
+  data.tar.gz: 7624c4541d2769a337b2388a5613b97223f4422d
 SHA512:
-  metadata.gz: ff2b8b312c13c8b68c233f0799c68f36761109beea56fe2648485a89be28980b53d16d5646479ce58c0575cdde11025ff9ed74b81c923eb923953dcfbcf862cf
-  data.tar.gz: 58a248017fd9ec7330af89ca300d686710a6c71c36d96d9af5cd1967e8c1a703be7618835d30d3f5f7066958e1046fef686f3fa2b0d2d308e3c8f4990c3963fe
+  metadata.gz: 4e39cd0114a9e4c0811d29507e111daebc58a10ac669ee2e83accc7730670ef77fd274522acdd128c5737e90729c969d39c4426dafe237c30c2ba5b941bab37e
+  data.tar.gz: 9a293c7571d72fc9b107bacf127bc6bc9b81872fd0726650699a3c72ea80a484bd7d779edcaaa52ec39e29c0165af9b524826958aa6204bef082ac832fe5eeb5

data/README.md

@@ -35,7 +35,8 @@ Options:
 | version       | Solr version to download and install |
 | port          | port to run Solr on |
 | version_file  | Local path to store the currently installed version |
-| download_path | Local path for storing the downloaded Solr zip file |
+| download_dir  | Local path for storing the downloaded Solr zip file |
+| solr_zip_path | Local path to the Solr zip file |
 | md5sum        | Path/URL to MD5 checksum |
 | solr_xml      | Path to Solr configuration |
 | verbose       | (Boolean) |

data/exe/solr_wrapper

@@ -32,8 +32,8 @@ args = OptionParser.new do |opts|
     options[:cloud] = c
   end
 
-  opts.on("--download_path PATH", "Download/use solr at the given path") do |d|
-    options[:download_path] = d
+  opts.on("--solr_zip_path PATH", "Download/use solr at the given path") do |d|
+    options[:solr_zip_path] = d
   end
 
   opts.on("-iDIR", "--instance_directory DIR", "Install/use solr at the given directory") do |d|
@@ -52,6 +52,10 @@ args = OptionParser.new do |opts|
     collection_options[:dir] = d
   end
 
+  opts.on("--[no-]persist", "Persist the solr connection data") do |d|
+    collection_options[:persist] = d
+  end
+
   opts.on("--no-checksum", "Skip running checksum validation on the downloaded file") do |d|
     options[:ignore_md5sum] = true
   end

data/lib/solr_wrapper/configuration.rb

@@ -46,8 +46,8 @@ module SolrWrapper
       options[:zookeeper_port]
     end
 
-    def download_path
-      options[:download_path]
+    def solr_zip_path
+      options[:solr_zip_path]
     end
 
     def download_dir
@@ -96,7 +96,7 @@ module SolrWrapper
 
     def collection_options
       hash = options.fetch(:collection, {})
-      Configuration.slice(convert_keys(hash), :name, :dir)
+      Configuration.slice(convert_keys(hash), :name, :dir, :persist)
     end
 
     def configsets

data/lib/solr_wrapper/instance.rb

@@ -22,8 +22,8 @@ module SolrWrapper
     # @option options [String] :port port to run Solr on
     # @option options [Boolean] :cloud Run solr in cloud mode
     # @option options [String] :version_file Local path to store the currently installed version
-    # @option options [String] :download_dir Local directory to store the downloaded Solr zip and its md5 file in (overridden by :download_path)
-    # @option options [String] :download_path Local path for storing the downloaded Solr zip file
+    # @option options [String] :download_dir Local directory to store the downloaded Solr zip and its md5 file in (overridden by :solr_zip_path)
+    # @option options [String] :solr_zip_path Local path for storing the downloaded Solr zip file
     # @option options [Boolean] :validate Should solr_wrapper download a new md5 and (re-)validate the zip file? (default: trueF)
     # @option options [String] :md5sum Path/URL to MD5 checksum
     # @option options [String] :solr_xml Path to Solr configuration
@@ -208,7 +208,7 @@ module SolrWrapper
       begin
         yield name
       ensure
-        delete name
+        delete name unless options[:persist]
       end
     end
 
@@ -217,7 +217,7 @@ module SolrWrapper
     def clean!
       stop
       remove_instance_dir!
-      FileUtils.remove_entry(config.download_path) if File.exists?(config.download_path)
+      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
       md5.clean!
       FileUtils.remove_entry(config.version_file) if File.exists? config.version_file
@@ -285,11 +285,11 @@ module SolrWrapper
     end
 
     def download
-      unless File.exists?(config.download_path) && md5.validate?(config.download_path)
-        Downloader.fetch_with_progressbar config.download_url, config.download_path
-        md5.validate! config.download_path
+      unless File.exists?(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
-      config.download_path
+      config.solr_zip_path
     end
 
     ##

data/lib/solr_wrapper/settings.rb

@@ -63,9 +63,9 @@ module SolrWrapper
       @download_url ||= default_download_url
     end
 
-    def download_path
-      @download_path ||= static_config.download_path
-      @download_path ||= default_download_path
+    def solr_zip_path
+      @solr_zip_path ||= static_config.solr_zip_path
+      @solr_zip_path ||= default_solr_zip_path
     end
 
     def version_file
@@ -90,7 +90,7 @@ module SolrWrapper
 
     private
 
-      def default_download_path
+      def default_solr_zip_path
         File.join(download_dir, File.basename(download_url))
       end
 

data/lib/solr_wrapper/tasks/solr_wrapper.rake

@@ -4,7 +4,7 @@ require 'solr_wrapper'
 namespace :solr do
   desc "Load the solr options and solr instance"
   task :environment do
-    @solr_instance = SolrWrapper.instance
+    @solr_instance = SolrWrapper.default_instance
   end
 
   desc 'Install a clean version of solr. Replaces the existing copy if there is one.'
@@ -17,7 +17,7 @@ namespace :solr do
   desc 'start solr'
   task start: :environment do
     begin
-      puts "Starting solr at #{File.expand_path(@solr_instance.instance_dir)} with options #{@solr_instance.options}"
+      puts "Starting solr at #{@solr_instance.config.url}"
       @solr_instance.start
     rescue => e
       if e.message.include?("Port #{@solr_instance.port} is already being used by another process")

data/lib/solr_wrapper/version.rb

@@ -1,3 +1,3 @@
 module SolrWrapper
-  VERSION = '0.10.0'
+  VERSION = '0.11.0'
 end

data/spec/fixtures/sample_config.yml

@@ -2,6 +2,7 @@ port: 9999
 collection:
   dir: solr/config/
   name: project-development
+  persist: false
 configsets:
   - dir: solr/config/
     name: project-development-configset

data/spec/lib/solr_wrapper/configuration_spec.rb

@@ -38,7 +38,7 @@ describe SolrWrapper::Configuration do
     end
     let(:options) { { config: 'spec/fixtures/sample_config.yml' } }
     it "uses values from the config file" do
-      expect(config.collection_options).to eq(name: 'project-development', dir: 'solr/config/')
+      expect(config.collection_options).to eq(name: 'project-development', dir: 'solr/config/', persist: false)
     end
   end
 

data/spec/lib/solr_wrapper/instance_spec.rb

@@ -34,6 +34,15 @@ describe SolrWrapper::Instance do
         solr_instance.with_collection(dir: File.join(FIXTURES_DIR, "basic_configs")) {}
       end
     end
+
+    context 'persistent collections' do
+      it "creates a new collection with options from the config" do
+        expect(solr_instance).to receive(:create).with(
+          hash_including(name: 'project-development'))
+        expect(solr_instance).not_to receive(:delete)
+        solr_instance.with_collection(name: 'project-development', dir: 'solr/config/', persist: true) {}
+      end
+    end
   end
 
   context 'with a SolrCloud instance' do

metadata

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