solr_wrapper 4.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 670f1eb6c506211a4b48b0e9d9dfd323bb84d795f9fa6ff92f2b5215b957b7c2
-  data.tar.gz: 684817a09ede9dbd1d91175660ea9ac3a570443de19a50a328ef6e0d77947f15
+  metadata.gz: 8990953af5f4056ffa716a2d1187995684efdbeb41e3c54e7c1f6056d5875c9d
+  data.tar.gz: 80c77a4af17402b1a5743b263bd6ffeeaddb366d13723b64071e50035a313d16
 SHA512:
-  metadata.gz: 52615ab1fec5e78d0ea585642940696b25ae185b0c31d925fadcf715821004b65da77abe9e666cf120021ef1b52676d0e8ffee078f1a889d2bc2b3bca9cd0f8a
-  data.tar.gz: 03316f12ece3f78901e293dbe2cbd65406b103af0d1575fa6a135c98677ae5ec94040b3682a4007f37315d28e7997d031e50c25583e2334a2f3aefd872baaa62
+  metadata.gz: 4f8e1736239ffdd87d5327743cc5baab237f56e4b90264ed87b18272a6be225e55f04bfa29fe2fd757f9be32f12a437dbed127b9ed6341fba4100ba03c30cc51
+  data.tar.gz: ef4b72a613031cd55d745cb57c76b26f3331e6d877e36133dd72bd859129578dbbbdce07ac05dc5415fac3e5667a73f9ad1d720c1721fda2a1ef1f1956275ac8

data/README.md

@@ -46,6 +46,7 @@ SolrWrapper.wrap port: 8983,
 | solr_options  | (Hash) |
 | env           | (Hash) |
 | persist      | (Boolean) Preserves the data in you collection between startups |
+| contrib | (Array<Hash>) |
 
 ```ruby
 solr.with_collection(name: 'collection_name', dir: 'path_to_solr_configs')

data/lib/solr_wrapper/configuration.rb

@@ -145,18 +145,22 @@ module SolrWrapper
 
     def collection_options
       hash = options.fetch(:collection, {})
-      Configuration.slice(convert_keys(hash), :name, :dir, :persist)
+      Configuration.slice(hash.transform_keys(&:to_sym), :name, :dir, :persist)
     end
 
     def configsets
       configsets = options[:configsets] || []
-      configsets.map { |x| convert_keys(x) }
+      configsets.map { |x| x.transform_keys(&:to_sym) }
     end
 
     def poll_interval
       options.fetch(:poll_interval, 1)
     end
 
+    def contrib
+      options.fetch(:contrib, [])
+    end
+
     private
 
       def self.slice(source, *keys)
@@ -182,11 +186,22 @@ module SolrWrapper
           $stderr.puts "Unable to parse config #{config_file}" if verbose?
           return {}
         end
-        convert_keys(config)
+        config.transform_keys(&:to_sym)
+        absoluteize_paths(config, root: File.dirname(config_file))
       end
 
-      def convert_keys(hash)
-        hash.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
+      def absoluteize_paths(config, root: Dir.pwd)
+        return config unless config[:contrib]
+
+        config = config.dup
+
+        config[:contrib] = config[:contrib].map do |mapping|
+          mapping = mapping.transform_keys(&:to_sym)
+          mapping[:from] = File.expand_path(mapping[:from], root)
+          mapping[:to] ||= 'contrib/'
+        end
+
+        config
       end
 
       def default_configuration_paths

data/lib/solr_wrapper/instance.rb

@@ -244,6 +244,14 @@ module SolrWrapper
       raise_error_unless_extracted
       FileUtils.cp config.solr_xml, File.join(config.instance_dir, 'server', 'solr', 'solr.xml') if config.solr_xml
       FileUtils.cp_r File.join(config.extra_lib_dir, '.'), File.join(config.instance_dir, 'server', 'solr', 'lib') if config.extra_lib_dir
+
+      config.contrib.each do |mapping|
+        if File.directory? mapping[:from]
+          FileUtils.cp_r mapping[:from], File.join(config.instance_dir, mapping[:to])
+        else
+          FileUtils.cp mapping[:from], File.join(config.instance_dir, mapping[:to])
+        end
+      end
     end
 
     def extract_and_configure

data/lib/solr_wrapper/tgz_extractor.rb

@@ -1,4 +1,4 @@
-require 'rubygems/package'
+require 'minitar'
 require 'zlib'
 
 module SolrWrapper
@@ -13,29 +13,7 @@ module SolrWrapper
     end
 
     def extract!
-      Gem::Package::TarReader.new(Zlib::GzipReader.open(file)) do |tar|
-        dest = nil
-        tar.each do |entry|
-          if entry.full_name == TAR_LONGLINK
-            dest = File.join destination, entry.read.strip
-            next
-          end
-          dest ||= File.join destination, entry.full_name
-          if entry.directory?
-            File.delete dest if File.file? dest
-            FileUtils.mkdir_p dest, mode: entry.header.mode, verbose: false
-          elsif entry.file?
-            FileUtils.rm_rf dest if File.directory? dest
-            File.open dest, 'wb' do |f|
-              f.print entry.read
-            end
-            FileUtils.chmod entry.header.mode, dest, verbose: false
-          elsif entry.header.typeflag == '2' # Symlink!
-            File.symlink entry.header.linkname, dest
-          end
-          dest = nil
-        end
-      end
+      Minitar.unpack(Zlib::GzipReader.open(file), destination)
     rescue StandardError => e
       abort "Unable to extract #{file} into #{destination}: #{e.message}"
     end

data/lib/solr_wrapper/version.rb

@@ -1,3 +1,3 @@
 module SolrWrapper
-  VERSION = '4.0.0'
+  VERSION = '4.0.1'
 end

data/solr_wrapper.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "http"
+  spec.add_dependency "minitar"
   spec.add_dependency "ruby-progressbar"
   spec.add_dependency "retriable"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solr_wrapper
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Chris Beer
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-20 00:00:00.000000000 Z
+date: 2022-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitar
+  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: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement