solr_wrapper 0.17.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae1eb7d22a407381248a653d41b0df070313427e
-  data.tar.gz: ff7c614cf39b2d4a97e808018dab901fc0f20fb2
+  metadata.gz: '092270d968ea024833bc6185caf854c05c8e623e'
+  data.tar.gz: 83d3dd71ca0de7c18ee9090a06ff051b174dbf4a
 SHA512:
-  metadata.gz: 7ff26b718f0b4f198367a1bd836788b6bda5291a296a99f1f27cd653d5538d20c34b7f0397eb63fe8c632748b262dad08a5a19721c1cf5381fd5f8a6d0eda129
-  data.tar.gz: 88146a36061f4954abff8162d136b966e68d8ca4ad5a02ae9274a4cfd87a4c0cb91d9bc66e1efa2f2604152156811772f1a63c4400630032ce606570619393df
+  metadata.gz: c4da5d83939b7d10b089d4453b79fb778aa499809cbd114d634fe8e7e790a21896c73320055fa43d3682559768fcb5729f2062bde7ab1ee9beeb92e967c1cf50
+  data.tar.gz: c7373e52dcd5520e541947655b1e95c6fcd53e9ccf7b356d7bf2efa37f60bb36555508451bc46546c92b3b1899859040453072802e54ba9fd59238fed106553d

data/.travis.yml

@@ -1,12 +1,13 @@
 language: ruby
 sudo: false
 rvm:
-  - 2.2.5
-  - 2.3.1
-  - jruby-9.1.0.0
-cache:
-  directories:
-  - /tmp/solr-5.4.1
+  - 2.4.1
+  - 2.3.4
+  - jruby-9.1.8.0
 
 jdk:
-  - oraclejdk8
+  - oraclejdk8
+
+env:
+  global:
+    JRUBY_OPTS=-J-Xmx2g

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/configuration.rb

@@ -1,3 +1,5 @@
+require 'faraday'
+
 module SolrWrapper
   class Configuration
     attr_reader :options
@@ -77,7 +79,14 @@ module SolrWrapper
     end
 
     def version
-      @version ||= options.fetch(:version, SolrWrapper.default_instance_options[:version])
+      @version ||= begin
+        config_version = options.fetch(:version, SolrWrapper.default_instance_options[:version])
+        if config_version == 'latest'
+          fetch_latest_version
+        else
+          config_version
+        end
+      end
     end
 
     def mirror_url
@@ -145,5 +154,10 @@ module SolrWrapper
       def default_configuration_paths
         ['~/.solr_wrapper.yml', '~/.solr_wrapper', '.solr_wrapper.yml', '.solr_wrapper']
       end
+
+      def fetch_latest_version
+        response = Faraday.get('https://svn.apache.org/repos/asf/lucene/cms/trunk/content/latestversion.mdtext')
+        response.body.strip
+      end
   end
 end

data/lib/solr_wrapper/downloader.rb

@@ -8,7 +8,7 @@ module SolrWrapper
         IO.copy_stream(io, output)
       end
     rescue OpenURI::HTTPError => e
-      raise SolrWrapperError, "Unable to download solr from #{url}\n#{e.message}"
+      raise SolrWrapperError, "Unable to download solr from #{url}\n#{e.message}: #{e.io.read}"
     end
 
     class SafeProgressBar < ProgressBar::Base

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
@@ -74,7 +74,11 @@ module SolrWrapper
     end
 
     def md5url
-      "http://archive.apache.org/dist/lucene/solr/#{static_config.version}/solr-#{static_config.version}.zip.md5"
+      if default_download_url == archive_download_url
+        "#{archive_download_url}.md5"
+      else
+        "http://www.us.apache.org/dist/lucene/solr/#{static_config.version}/solr-#{static_config.version}.zip.md5"
+      end
     end
 
     def md5sum_path
@@ -128,7 +132,7 @@ module SolrWrapper
       end
 
       def archive_download_url
-        "http://archive.apache.org/dist/lucene/solr/#{static_config.version}/solr-#{static_config.version}.zip"
+        "https://archive.apache.org/dist/lucene/solr/#{static_config.version}/solr-#{static_config.version}.zip"
       end
 
       def random_open_port

data/lib/solr_wrapper/version.rb

@@ -1,3 +1,3 @@
 module SolrWrapper
-  VERSION = '0.17.0'
+  VERSION = '1.0.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'
+    'latest'
   end
 
   def self.default_solr_port

data/solr_wrapper.gemspec

@@ -28,5 +28,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "simple_solr_client"
   spec.add_development_dependency "coveralls"
-  spec.add_development_dependency "fakeweb"
+  spec.add_development_dependency "webmock"
 end

data/spec/lib/solr_wrapper/client_spec.rb

@@ -5,18 +5,18 @@ describe SolrWrapper::Client do
 
   describe '#exists?' do
     it 'checks if a solrcloud collection exists' do
-      FakeWeb.register_uri(:get, 'http://localhost:8983/solr/admin/collections?action=LIST&wt=json', body: '{ "collections": ["x", "y", "z"]}')
-      FakeWeb.register_uri(:get, 'http://localhost:8983/solr/admin/cores?action=STATUS&wt=json&core=a', body: '{ "status": { "a": {} } }')
+      stub_request(:get, 'http://localhost:8983/solr/admin/collections?action=LIST&wt=json').to_return(body: '{ "collections": ["x", "y", "z"]}')
+      stub_request(:get, 'http://localhost:8983/solr/admin/cores?action=STATUS&wt=json&core=a').to_return(body: '{ "status": { "a": {} } }')
 
       expect(subject.exists?('x')).to eq true
       expect(subject.exists?('a')).to eq false
     end
 
     it 'checks if a solr core exists' do
-      FakeWeb.register_uri(:get, 'http://localhost:8983/solr/admin/collections?action=LIST&wt=json', body: '{ "error": { "msg": "Solr instance is not running in SolrCloud mode."} }')
+      stub_request(:get, 'http://localhost:8983/solr/admin/collections?action=LIST&wt=json').to_return(body: '{ "error": { "msg": "Solr instance is not running in SolrCloud mode."} }')
 
-      FakeWeb.register_uri(:get, 'http://localhost:8983/solr/admin/cores?action=STATUS&wt=json&core=x', body: '{ "status": { "x": { "name": "x" } } }')
-      FakeWeb.register_uri(:get, 'http://localhost:8983/solr/admin/cores?action=STATUS&wt=json&core=a', body: '{ "status": { "a": {} } }')
+      stub_request(:get, 'http://localhost:8983/solr/admin/cores?action=STATUS&wt=json&core=x').to_return(body: '{ "status": { "x": { "name": "x" } } }')
+      stub_request(:get, 'http://localhost:8983/solr/admin/cores?action=STATUS&wt=json&core=a').to_return(body: '{ "status": { "a": {} } }')
 
       expect(subject.exists?('x')).to eq true
       expect(subject.exists?('a')).to eq false

data/spec/lib/solr_wrapper/configuration_spec.rb

@@ -61,4 +61,26 @@ describe SolrWrapper::Configuration do
       expect(config.configsets).to include(name: 'project-development-configset', dir: 'solr/config/')
     end
   end
+
+  describe '#version' do
+    context 'when it is a version number' do
+      let(:options) { { version: 'x.y.z' } }
+
+      it 'uses that version' do
+        expect(config.version).to eq 'x.y.z'
+      end
+    end
+
+    context 'when it is "latest"' do
+      let(:options) { { version: 'latest'} }
+
+      before do
+        stub_request(:get, 'https://svn.apache.org/repos/asf/lucene/cms/trunk/content/latestversion.mdtext').to_return(body: 'z.y.x')
+      end
+
+      it 'fetches the latest version number from apache' do
+        expect(config.version).to eq 'z.y.x'
+      end
+    end
+  end
 end

data/spec/lib/solr_wrapper/instance_spec.rb

@@ -151,8 +151,12 @@ describe SolrWrapper::Instance do
   end
 
   describe "#version" do
+    before do
+      allow(solr_instance.config).to receive(:version).and_return('solr-version-number')
+    end
+
     subject { solr_instance.version }
-    it { is_expected.to eq '6.2.0' }
+    it { is_expected.to eq 'solr-version-number' }
   end
 
   describe "#md5" do

data/spec/spec_helper.rb

@@ -5,7 +5,9 @@ require 'solr_wrapper'
 require 'simple_solr_client'
 
 require 'rspec'
-require 'fakeweb'
+require 'webmock/rspec'
+
+WebMock.allow_net_connect!
 
 FIXTURES_DIR = File.expand_path("fixtures", File.dirname(__FILE__))
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solr_wrapper
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-01 00:00:00.000000000 Z
+date: 2017-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fakeweb
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -202,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Solr 5 service wrapper