solr_wrapper 0.10.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7916cf546d675d2a3f008f4a271aa4fc2cf7b8ae
-  data.tar.gz: 3d2e1456ff74edb606a60cef2fa1731ae5a74351
+  metadata.gz: 6e8efc2491de8905a2041eea0f2f20fec15f679e
+  data.tar.gz: dc5882eb1d93b37e85d6f6643a1e5e2f72a826b4
 SHA512:
-  metadata.gz: ff2b8b312c13c8b68c233f0799c68f36761109beea56fe2648485a89be28980b53d16d5646479ce58c0575cdde11025ff9ed74b81c923eb923953dcfbcf862cf
-  data.tar.gz: 58a248017fd9ec7330af89ca300d686710a6c71c36d96d9af5cd1967e8c1a703be7618835d30d3f5f7066958e1046fef686f3fa2b0d2d308e3c8f4990c3963fe
+  metadata.gz: 549aa457e595f347bf9470bc23e0f7a49b01cf5cefaef9af22a943b623fc974926fc6e9a14e05c898cd5e5a491cb4f9c864a39cf058d3713aa4210fe924bf14d
+  data.tar.gz: e7f28b13c0d59fbe0f77efb8f28da82820cd9e6f78d46e050932c0eff465c5a794366609767f59c98a52cebe3df75b0b44745cc2d6cbcb3527b0654c2cdae0aa

data/.travis.yml

@@ -1,9 +1,9 @@
 language: ruby
 sudo: false
 rvm:
-  - 2.2.4
-  - 2.3.0
-  - jruby-9.0.1.0
+  - 2.2.5
+  - 2.3.1
+  - jruby-9.1.0.0
 cache:
   directories:
   - /tmp/solr-5.4.1

data/README.md

@@ -26,7 +26,7 @@ SolrWrapper.wrap port: 8983,
                  instance_dir: '/opt/solr'
 ```
 
-Options:
+### Valid ruby and YAML options
 
 |Option         |                                         |
 |---------------|-----------------------------------------|
@@ -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) |
@@ -43,6 +44,7 @@ Options:
 | ignore_md5sum | (Boolean) |
 | solr_options  | (Hash) |
 | env           | (Hash) |
+| persist      | (Boolean) Preserves the data in you collection between startups |
 
 ```ruby
 solr.with_collection(name: 'collection_name', dir: 'path_to_solr_configs')
@@ -53,6 +55,30 @@ solr.with_collection(name: 'collection_name', dir: 'path_to_solr_configs')
 ```console
 $ solr_wrapper -p 8983
 ```
+To see a list of valid options when using solr_wrapper to launch a Solr instance from the command line:
+```
+$ solr_wrapper -h
+```
+
+### Configuration file
+SolrWrapper can read configuration options from a YAML configuration file.
+By default, it looks for configuration files at `.solr_wrapper` and `~/.solr_wrapper`.
+
+You can also specify a configuration file when launching from the command line as follows:
+```
+$ solr_wrapper -config <path_to_config_file>
+```
+
+### Cleaning your repository from the command line
+
+By defualt SorlWrapper will clean out your data when it shuts down.
+If you utilize the preserve option your data will remain between runs.
+
+To clean out data that is being preserved explicitly run:
+```
+$ solr_wrapper <configuration options> clean
+```
+***Note*** You must use the same configuration options on the clean command as you do on the run command to clean the correct instance.
 
 ## Rake tasks
 

data/exe/solr_wrapper

@@ -5,8 +5,14 @@ require 'optparse'
 
 options = {}
 collection_options = {}
+subtext = <<HELP
+Commonly used command are:
+   clean :     cleans all data from solr and configures a clean instance based on configuration options
+See 'solr_wrapper COMMAND --help' for more information on a specific command.
+HELP
+
 args = OptionParser.new do |opts|
-  opts.banner = "Usage: solr_wrapper [options]"
+  opts.banner = "Usage: solr_wrapper [options] subcommand"
 
   opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
     options[:verbose] = v
@@ -32,8 +38,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,12 +58,33 @@ 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
+
+  opts.separator ""
+  opts.separator subtext
 end
 
+
+subcommands = {
+    'clean' => OptionParser.new do |opts|
+      opts.banner = "Usage: clean"
+    end,
+}
+
+
 begin
+  args.order!
+  command = ARGV.shift
+  if command
+    raise "Bad subcommand: #{command}" unless subcommands[command]
+    subcommands[command].order!
+  end
   args.parse!
 rescue => error
   $stderr.puts "ERROR: #{error}\n"
@@ -65,10 +92,18 @@ rescue => error
   exit 1
 end
 
-# default to verbose
-options[:verbose] = true if options[:verbose].nil?
-
 instance = SolrWrapper.instance(options)
+
+if command == '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
@@ -76,6 +111,8 @@ instance.wrap do |conn|
     begin
       conn.wait
     rescue Interrupt
+      Signal.trap("SIGTERM") {"IGNORE"}
+      Signal.trap("SIGINT") {"IGNORE"}
       $stderr.puts "Solr is shutting down."
     end
   end

data/lib/solr_wrapper/client.rb

@@ -0,0 +1,36 @@
+require 'faraday'
+require 'json'
+
+module SolrWrapper
+  # Solr REST API client to get status information
+  class Client
+    attr_reader :url
+
+    def initialize(url)
+      @url = url
+    end
+
+    # Check if a core or collection exists
+    def exists?(core_or_collection_name)
+      collection?(core_or_collection_name) || core?(core_or_collection_name)
+    end
+
+    private
+
+    def collection?(name)
+      response = conn.get('admin/collections?action=LIST&wt=json')
+      data = JSON.parse(response.body)
+      return if data['error'] && data['error']['msg'] == 'Solr instance is not running in SolrCloud mode.'
+      data['collections'].include? name
+    end
+
+    def core?(name)
+      response = conn.get('admin/cores?action=STATUS&wt=json&core=' + name)
+      !JSON.parse(response.body)['status'][name].empty?
+    end
+
+    def conn
+      @conn ||= Faraday.new(url: url)
+    end
+  end
+end

data/lib/solr_wrapper/configuration.rb

@@ -2,9 +2,11 @@ module SolrWrapper
   class Configuration
     attr_reader :options
 
-    def initialize(options)
-      @options = read_config(options[:config], options[:verbose])
-             .merge options
+    def initialize(options = {})
+      @config = options[:config]
+      @verbose = options[:verbose]
+
+      @options = load_configs(Array(options[:config])).merge(options)
     end
 
     def solr_xml
@@ -46,8 +48,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
@@ -55,7 +57,7 @@ module SolrWrapper
     end
 
     def default_download_dir
-      if defined?(Rails) && Rails.root
+      if defined?(Rails) && Rails.respond_to?(:root) && Rails.root
         File.join(Rails.root, 'tmp')
       else
         Dir.tmpdir
@@ -87,7 +89,7 @@ module SolrWrapper
     end
 
     def verbose?
-      !!options.fetch(:verbose, false)
+      @verbose || (options && !!options.fetch(:verbose, false))
     end
 
     def version_file
@@ -96,7 +98,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
@@ -114,21 +116,23 @@ module SolrWrapper
         keys.each_with_object({}) { |k, hash| hash[k] = source[k] if source.has_key?(k) }
       end
 
-      def read_config(config_file, verbose)
-        default_configuration_paths.each do |p|
+      def load_configs(config_files)
+        config = {}
+
+        (default_configuration_paths + config_files.compact).each do |p|
           path = File.expand_path(p)
-          config_file ||= path if File.exist? path
+          next unless File.exist? path
+          config.merge!(read_config(path))
         end
 
-        unless config_file
-          $stdout.puts "No config specified" if verbose
-          return {}
-        end
+        config
+      end
 
-        $stdout.puts "Loading configuration from #{config_file}" if verbose
+      def read_config(config_file)
+        $stdout.puts "Loading configuration from #{config_file}" if verbose?
         config = YAML.load(ERB.new(IO.read(config_file)).result(binding))
         unless config
-          $stderr.puts "Unable to parse config #{config_file}" if verbose
+          $stderr.puts "Unable to parse config #{config_file}" if verbose?
           return {}
         end
         convert_keys(config)
@@ -139,7 +143,7 @@ module SolrWrapper
       end
 
       def default_configuration_paths
-        ['.solr_wrapper', '~/.solr_wrapper']
+        ['~/.solr_wrapper.yml', '~/.solr_wrapper', '.solr_wrapper.yml', '.solr_wrapper']
       end
   end
 end

data/lib/solr_wrapper/downloader.rb

@@ -7,6 +7,8 @@ module SolrWrapper
       open(url, content_length_proc: ->(bytes) { pbar.total = bytes }, progress_proc: ->(bytes) { pbar.progress = bytes }) do |io|
         IO.copy_stream(io, output)
       end
+    rescue OpenURI::HTTPError => e
+      raise SolrWrapperError, "Unable to download solr from #{url}\n#{e.message}"
     end
 
     class SafeProgressBar < ProgressBar::Base

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
@@ -147,6 +147,10 @@ module SolrWrapper
       create_options[:c] = options[:name] if options[:name]
       create_options[:n] = options[:config_name] if options[:config_name]
       create_options[:d] = options[:dir] if options[:dir]
+
+      # short-circuit if we're using persisted data with an existing core/collection
+      return if options[:persist] && create_options[:c] && client.exists?(create_options[:c])
+
       exec("create", create_options)
 
       options[:name]
@@ -208,7 +212,7 @@ module SolrWrapper
       begin
         yield name
       ensure
-        delete name
+        delete name unless options[:persist]
       end
     end
 
@@ -217,7 +221,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 +289,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
 
     ##
@@ -381,6 +385,10 @@ module SolrWrapper
       "#{config.zookeeper_host}:#{config.zookeeper_port}" if config.cloud
     end
 
+    def client
+      SolrWrapper::Client.new(url)
+    end
+
     def raise_error_unless_extracted
       raise RuntimeError, "there is no solr instance at #{config.instance_dir}.  Run SolrWrapper.extract first." unless extracted?
     end

data/lib/solr_wrapper/settings.rb

@@ -1,4 +1,5 @@
 require 'delegate'
+require 'faraday'
 
 module SolrWrapper
   # Configuraton that comes from static and dynamic sources.
@@ -51,7 +52,7 @@ module SolrWrapper
 
     def instance_dir
       @instance_dir ||= static_config.instance_dir
-      @instance_dir ||= File.join(Dir.tmpdir, File.basename(download_url, ".zip"))
+      @instance_dir ||= File.join(tmpdir, File.basename(download_url, ".zip"))
     end
 
     def managed?
@@ -63,9 +64,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 +91,15 @@ module SolrWrapper
 
     private
 
-      def default_download_path
+      def tmpdir
+        if defined?(Rails) && Rails.root
+          File.join(Rails.root, 'tmp')
+        else
+          Dir.tmpdir
+        end
+      end
+
+      def default_solr_zip_path
         File.join(download_dir, File.basename(download_url))
       end
 
@@ -100,15 +109,26 @@ module SolrWrapper
         @download_dir
       end
 
-
       def default_download_url
         @default_url ||= begin
           json = open(static_config.mirror_url).read
           doc = JSON.parse(json)
-          doc['preferred'] + doc['path_info']
+          url = doc['preferred'] + doc['path_info']
+
+          response = Faraday.head(url)
+
+          if response.success?
+            url
+          else
+            archive_download_url
+          end
         end
-      rescue SocketError
-        "http://www.us.apache.org/dist/lucene/solr/#{static_config.version}/solr-#{static_config.version}.zip"
+      rescue Errno::ECONNRESET, SocketError, Faraday::Error
+        archive_download_url
+      end
+
+      def archive_download_url
+        "http://archive.apache.org/dist/lucene/solr/#{static_config.version}/solr-#{static_config.version}.zip"
       end
 
       def random_open_port

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.16.0'
 end

data/lib/solr_wrapper.rb

@@ -4,10 +4,11 @@ require 'solr_wrapper/settings'
 require 'solr_wrapper/md5'
 require 'solr_wrapper/downloader'
 require 'solr_wrapper/instance'
+require 'solr_wrapper/client'
 
 module SolrWrapper
   def self.default_solr_version
-    '6.0.0'
+    '6.2.0'
   end
 
   def self.default_solr_port
@@ -38,4 +39,6 @@ module SolrWrapper
   def self.wrap(options = {}, &block)
     instance(options).wrap &block
   end
+
+  class SolrWrapperError < StandardError; end
 end

data/solr_wrapper.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "faraday"
   spec.add_dependency "rubyzip"
   spec.add_dependency "ruby-progressbar"
 
@@ -27,4 +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"
 end

data/spec/fixtures/another_sample_config.yml

@@ -0,0 +1,2 @@
+port: 9998
+verbose: true

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

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe SolrWrapper::Client do
+  subject { described_class.new('http://localhost:8983/solr/') }
+
+  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": {} } }')
+
+      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."} }')
+
+      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": {} } }')
+
+      expect(subject.exists?('x')).to eq true
+      expect(subject.exists?('a')).to eq false
+    end
+  end
+end

data/spec/lib/solr_wrapper/configuration_spec.rb

@@ -22,13 +22,22 @@ describe SolrWrapper::Configuration do
     end
   end
 
-  describe "#read_config" do
+  describe "#load_configs" do
     before do
       allow(config).to receive(:default_configuration_paths).and_return([])
     end
-    let(:options) { { config: 'spec/fixtures/sample_config.yml' } }
-    it "uses values from the config file" do
-      expect(config.port).to eq '9999'
+    context 'with a single config file' do
+      let(:options) { { config: 'spec/fixtures/sample_config.yml' } }
+      it "uses values from the config file" do
+        expect(config.port).to eq '9999'
+      end
+    end
+    context 'with multiple config files' do
+      let(:options) { { config: ['spec/fixtures/sample_config.yml', 'spec/fixtures/another_sample_config.yml'] } }
+      it "uses values from the config file" do
+        expect(config.port).to eq '9998'
+        expect(config.verbose?).to eq true
+      end
     end
   end
 
@@ -38,7 +47,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,44 @@ 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
+
+      describe 'single solr node' do
+        it 'allows persistent collection on restart' do
+          subject.wrap do |solr|
+            solr.with_collection(name: 'solr-node-persistent-core', dir: File.join(FIXTURES_DIR, 'basic_configs'), persist: true) {}
+          end
+
+          subject.wrap do |solr|
+            solr.with_collection(name: 'solr-node-persistent-core', dir: File.join(FIXTURES_DIR, 'basic_configs'), persist: true) {}
+            solr.delete 'solr-node-persistent-core'
+          end
+        end
+      end
+
+      describe 'solr cloud' do
+        let(:options) { { cloud: true } }
+
+        it 'allows persistent collection on restart' do
+          subject.wrap do |solr|
+            config_name = solr.upconfig dir: File.join(FIXTURES_DIR, 'basic_configs')
+            solr.with_collection(name: 'solr-cloud-persistent-collection', config_name: config_name, persist: true) {}
+          end
+
+          subject.wrap do |solr|
+            solr.with_collection(name: 'solr-cloud-persistent-collection', persist: true) {}
+            solr.delete 'solr-cloud-persistent-collection'
+          end
+        end
+      end
+    end
   end
 
   context 'with a SolrCloud instance' do
@@ -114,7 +152,7 @@ describe SolrWrapper::Instance do
 
   describe "#version" do
     subject { solr_instance.version }
-    it { is_expected.to eq '6.0.0' }
+    it { is_expected.to eq '6.2.0' }
   end
 
   describe "#md5" do

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ require 'solr_wrapper'
 require 'simple_solr_client'
 
 require 'rspec'
+require 'fakeweb'
 
 FIXTURES_DIR = File.expand_path("fixtures", File.dirname(__FILE__))
 

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: solr_wrapper
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.16.0
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-21 00:00:00.000000000 Z
+date: 2016-08-29 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: faraday
+  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: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: fakeweb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - chris@cbeer.info
@@ -129,6 +157,7 @@ files:
 - coveralls.yml
 - exe/solr_wrapper
 - lib/solr_wrapper.rb
+- lib/solr_wrapper/client.rb
 - lib/solr_wrapper/configuration.rb
 - lib/solr_wrapper/downloader.rb
 - lib/solr_wrapper/instance.rb
@@ -138,6 +167,7 @@ files:
 - lib/solr_wrapper/tasks/solr_wrapper.rake
 - lib/solr_wrapper/version.rb
 - solr_wrapper.gemspec
+- spec/fixtures/another_sample_config.yml
 - spec/fixtures/basic_configs/_rest_managed.json
 - spec/fixtures/basic_configs/currency.xml
 - spec/fixtures/basic_configs/lang/stopwords_en.txt
@@ -147,6 +177,7 @@ files:
 - spec/fixtures/basic_configs/stopwords.txt
 - spec/fixtures/basic_configs/synonyms.txt
 - spec/fixtures/sample_config.yml
+- spec/lib/solr_wrapper/client_spec.rb
 - spec/lib/solr_wrapper/configuration_spec.rb
 - spec/lib/solr_wrapper/instance_spec.rb
 - spec/lib/solr_wrapper_spec.rb
@@ -171,11 +202,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Solr 5 service wrapper
 test_files:
+- spec/fixtures/another_sample_config.yml
 - spec/fixtures/basic_configs/_rest_managed.json
 - spec/fixtures/basic_configs/currency.xml
 - spec/fixtures/basic_configs/lang/stopwords_en.txt
@@ -185,6 +217,7 @@ test_files:
 - spec/fixtures/basic_configs/stopwords.txt
 - spec/fixtures/basic_configs/synonyms.txt
 - spec/fixtures/sample_config.yml
+- spec/lib/solr_wrapper/client_spec.rb
 - spec/lib/solr_wrapper/configuration_spec.rb
 - spec/lib/solr_wrapper/instance_spec.rb
 - spec/lib/solr_wrapper_spec.rb