Fix Solr 9.7 :dir option handling (#161)

* normalize :dir option to absolute path, for consistent handling in any solr version

* Fix attempt to handle dir to conf, go up one dir right way and do not require trailing /

* use absolute_path instead of expand_path with .

Co-authored-by: Chris Beer <[email protected]>

---------

Co-authored-by: Chris Beer <[email protected]>

Author: jrochkind

lib/solr_wrapper/instance.rb

@@ -159,12 +159,17 @@ def create(options = {})
         create_options[:n] = options[:config_name] if options[:config_name]
 
         if options[:dir]
+          # Turn a relative path to absolute. Solr 9.7+ changes relative to be
+          # relative to solr instance dir (which can be a temp dir for us),
+          # instead of command CWD. Normalize to absolute is good for all.
+          options[:dir] = File.absolute_path(options[:dir])
+
           # Solr 9.7 required that the dir argument contain a `conf` directory that
           # contains the actual configuration files.
           if version >= '9.7' && !File.exist?(File.join(options[:dir], 'conf'))
-
-            if options[:dir].match?(/conf\/$/)
-              create_options[:d] = File.expand_path(options[:dir], '..')
+            # ends in `conf` or `conf/`
+            if options[:dir].match?(/conf\/?$/)
+              create_options[:d] = File.expand_path("..", options[:dir])
             else
               tmpdir = Dir.mktmpdir