solrj_wrapper 0.0.2 → 1.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b7989bdc10a4e4a7a95890a667b9f9b86518a917
+  data.tar.gz: 3954aed416588570e50fdc057d6a5c612138902a
+SHA512:
+  metadata.gz: 670af841e8fbf23f4299cb976ca769b4d21f7bc39d8990b78ce00272857c66d6c38cf4497777ca988ed3f783f54f6e33c32d041edf8006da5dfc98e62a22f0bd
+  data.tar.gz: 2d6f5d5021adbb3106eae923927f6afba7d3f53486601d3f9c21e62cb8365cb0ec99946280bf143f049a537103a132f8c28258efe3453b8fbdcb6dca1830a603

data/.coveralls.yml

@@ -0,0 +1 @@
+service_name: travis-ci

data/.gitignore

@@ -5,7 +5,9 @@ doc
 .yardoc
 *.lock
 solrmarc.log*
+solrmarc-sw
 pkg
+tmp
 
 ## vim
 *.swp

data/.ruby-gemset

@@ -0,0 +1 @@
+solrj_wrapper

data/.ruby-version

@@ -0,0 +1 @@
+jruby-1.7.9

data/.travis.yml

@@ -0,0 +1,13 @@
+language: ruby
+rvm:
+  - jruby-19mode # JRuby in 1.9 mode
+  - jruby-head
+script: 
+  rake rspec_wrapped SETTINGS='ci'
+cache:
+  directories:
+  - solrmarc-sw
+notifications:
+  email:
+    - ndushay@stanford.edu
+    - laneymcg@stanford.edu

data/.yardopts

@@ -0,0 +1,3 @@
+--title 'SolrjWrapper Documentation'
+lib/**/*.rb -
+README.rdoc LICENSE 

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 # See solrj_wrapper.gemspec for this gem's dependencies
 gemspec

data/README.rdoc

@@ -1,5 +1,8 @@
 = SolrjWrapper
 
+{<img src="https://travis-ci.org/sul-dlss/solrj_wrapper.svg" alt="Build Status" />}[https://travis-ci.org/sul-dlss/solrj_wrapper] {<img src="https://coveralls.io/repos/sul-dlss/solrj_wrapper/badge.png?branch=master" alt="Coverage Status" />}[https://coveralls.io/r/sul-dlss/solrj_wrapper?branch=master] {<img src="https://gemnasium.com/sul-dlss/solrj_wrapper.png" alt="Dependency Status" />}[https://gemnasium.com/sul-dlss/solrj_wrapper] {<img src="https://badge.fury.io/rb/solrj_wrapper.svg" alt="Gem Version" />}[http://badge.fury.io/rb/solrj_wrapper]
+
+
 Ruby wrapper for interacting with Solrj objects, such as org.apache.solr.client.solrj.impl.StreamingUpdateSolrServer.
 
 == Installation
@@ -24,7 +27,7 @@ Here are some examples of use cribbed from the specs:
 
 	sjw = SolrjWrapper.new(solrj_jar_dir, solr_url, solrj_queue_size, solrj_num_threads)
   sjw.get_query_result_docs(q).should be_an_instance_of(Java::OrgApacheSolrCommon::SolrDocumentList)
-  sjw.streaming_update_server.should be_an_instance_of(Java::OrgApacheSolrClientSolrjImpl::StreamingUpdateSolrServer)
+  sjw.query_server.should be_an_instance_of(Java::OrgApacheSolrClientSolrjImpl::HttpSolrServer)
   sid = Java::OrgApacheSolrCommon::SolrInputDocument.new
   sjw.add_vals_to_fld(sid, "single", ["val"])
 

data/Rakefile

@@ -15,8 +15,4 @@ end
 
 Dir.glob('lib/tasks/*.rake').each { |r| import r }
 
-namespace :sj_wrap do
-  task :default => :ci  
-  task :rspec => :rspec_plain
-  task :spec => :rspec_plain
-end
+task :default => :rspec_wrapped

data/config/jetty.yml

@@ -0,0 +1,5 @@
+default:
+  jetty_port: 8984
+  java_opts:
+    - "-XX:MaxPermSize=128m"
+    - "-Xmx1256m"

data/lib/config/settings.yml

@@ -8,16 +8,16 @@ prod:
 
 # settings for local development
 dev:
-  solr_url: http://127.0.0.1:8985/solr/dev
-  solrj_jar_dir: solrmarc/dist/lib
+  solr_url: your_dev_solr_url
+  solrj_jar_dir: your_solrj_jar_dir
   solrj_queue_size: 20
   solrj_num_threads: 1
   log_level: info
 
 # settings for continuous integration
 ci:
-  solr_url: http://127.0.0.1:8985/solr/test
-  solrj_jar_dir: solrmarc/dist/lib
+  solr_url: http://localhost:8984/solr
+  solrj_jar_dir: solrmarc-sw/dist/lib
   solrj_queue_size: 20
   solrj_num_threads: 1
   log_level: info

data/lib/solrj_wrapper/version.rb

@@ -1,3 +1,3 @@
 class SolrjWrapper
-  VERSION = "0.0.2"
+  VERSION = "1.0.0"
 end

data/lib/solrj_wrapper.rb

@@ -22,9 +22,8 @@ class SolrjWrapper
     @logger = Logger.new(log_file)
     @logger.level = log_level
     load_solrj(solrj_jar_dir)
-    @query_server = org.apache.solr.client.solrj.impl.CommonsHttpSolrServer.new(solr_url)
-    @streaming_update_server = org.apache.solr.client.solrj.impl.StreamingUpdateSolrServer.new(solr_url, queue_size, num_threads)
-    useJavabin!
+    @query_server = org.apache.solr.client.solrj.impl.HttpSolrServer.new(solr_url)
+    @streaming_update_server = @query_server 
   end
 
   # send the query to Solr and get the SolrDocumentList from the response

data/lib/tasks/ci.rake

@@ -1,9 +1,44 @@
-namespace :sj_wrap do
+require 'jettywrapper'
 
-  desc "run continuous integration suite (tests, coverage, docs)" 
-  task :ci do 
-    Rake::Task["sj_wrap:rspec_wrapped"].invoke
-    Rake::Task["sj_wrap:doc"].invoke
+desc "run continuous integration suite (tests, coverage, docs)" 
+task :ci do 
+  Rake::Task["sj_wrap:rspec_wrapped"].invoke
+  Rake::Task["sj_wrap:doc"].invoke
+end
+
+desc 'clone solrmarc-sw from sul-dlss github'
+task :clone_solrmarc do
+  `git clone https://github.com/sul-dlss/solrmarc-sw.git` unless File.directory? 'solrmarc-sw'
+end
+
+desc "set up Solr for testing in jetty"
+task :setup_jetty => :clone_solrmarc do
+  Dir.chdir('solrmarc-sw') do 
+    `git pull`
+    `ant ext_setup`
   end
+end
+task :setup_test_solr => :setup_jetty
+
+desc "start jetty for running tests"
+task :run_jetty do
+  `rm -rf solrmarc-sw/test/jetty/solr/data/index`
+  jetty_dir = File.expand_path(File.dirname(__FILE__) + '../../../solrmarc-sw/test/jetty')
+  jetty_params = Jettywrapper.load_config.merge({:jetty_home => jetty_dir,
+                                                :solr_home => jetty_dir + '/solr',
+                                                :java_opts => "-Dsolr.data.dir=" + jetty_dir + "/solr/data",
+                                                :startup_wait => 45,
+                                                :jetty_port => 8984
+                                                })
+  error = Jettywrapper.start(jetty_params) 
+end
+task :jetty_start => :run_jetty
+task :start_jetty => :run_jetty
 
+desc  "stop jetty used for testing"
+task :stop_jetty do
+  jetty_params = Jettywrapper.load_config.merge({:jetty_home => File.expand_path(File.dirname(__FILE__) + '../../../solrmarc-sw/test/jetty'),:startup_wait => 10})
+  error = Jettywrapper.stop(jetty_params) 
 end
+
+task :jetty_stop => :stop_jetty

data/lib/tasks/doc.rake

@@ -1,23 +1,19 @@
 require 'yard'
 require 'yard/rake/yardoc_task'
 
-namespace :sj_wrap do
-  
-  # Use yard to build docs
-  begin
-    project_root = File.expand_path(File.dirname(__FILE__) + "/../..")
-    doc_dest_dir = File.join(project_root, 'doc')
+# Use yard to build docs
+begin
+  project_root = File.expand_path(File.dirname(__FILE__) + "/../..")
+  doc_dest_dir = File.join(project_root, 'doc')
 
-    YARD::Rake::YardocTask.new(:doc) do |yt|
-      yt.files = Dir.glob(File.join(project_root, 'lib', '**', '*.rb')) +
-                   [ File.join(project_root, 'README.rdoc') ]
-      yt.options = ['--output-dir', doc_dest_dir, '--readme', 'README.rdoc', '--title', 'SolrJ_Wrapper Documentation']
-    end
-  rescue LoadError
-    desc "Generate YARD Documentation"
-    task :doc do
-      abort "Please install the YARD gem to generate rdoc."
-    end
-  end  
-
-end
+  YARD::Rake::YardocTask.new(:doc) do |yt|
+    yt.files = Dir.glob(File.join(project_root, 'lib', '**', '*.rb')) +
+                 [ File.join(project_root, 'README.rdoc') ]
+    yt.options = ['--output-dir', doc_dest_dir, '--readme', 'README.rdoc', '--title', 'SolrJ_Wrapper Documentation']
+  end
+rescue LoadError
+  desc "Generate YARD Documentation"
+  task :doc do
+    abort "Please install the YARD gem to generate rdoc."
+  end
+end  

data/lib/tasks/spec.rake

@@ -1,26 +1,22 @@
 require 'rspec/core/rake_task'
 
-namespace :sj_wrap do
-
-  desc "Run all specs, with jetty instance running"
-  task :rspec_wrapped => ['sj_wrap:solrmarc:ant_dist_site', 'sj_wrap:jetty:config'] do
-    test_jetty_dir = File.expand_path(File.dirname(__FILE__) + '../../../solrmarc/test/jetty')
-    require 'jettywrapper'
-    jetty_params = Jettywrapper.load_config.merge({
-      :jetty_home => test_jetty_dir,
-      :solr_home => test_jetty_dir + '/solr',
-      :java_opts => "-Dsolr.data.dir=" + test_jetty_dir + "/solr/test/data",
-      :jetty_port => 8985,
-      :startup_wait => 25
-    })
-    error = Jettywrapper.wrap(jetty_params) do 
-      Rake::Task['sj_wrap:rspec_plain'].invoke
-    end
-    raise "TEST FAILURES: #{error}" if error
-  end
-
-  RSpec::Core::RakeTask.new(:rspec_plain) do |spec|
-    spec.rspec_opts = ["-c", "-f progress", "-r ./spec/spec_helper.rb"]
+desc "Run all specs, with jetty instance running"
+task :rspec_wrapped => ['setup_jetty'] do
+  jetty_dir = File.expand_path(File.dirname(__FILE__) + '../../../solrmarc-sw/test/jetty')
+  require 'jettywrapper'
+  jetty_params = Jettywrapper.load_config.merge({
+    :jetty_home => jetty_dir,
+    :solr_home => jetty_dir + '/solr',
+    :java_opts => "-Dsolr.data.dir=" + jetty_dir + "/solr/data",
+    :jetty_port => 8984,
+    :startup_wait => 45
+  })
+  error = Jettywrapper.wrap(jetty_params) do 
+    Rake::Task['rspec'].invoke
   end
+  raise "TEST FAILURES: #{error}" if error
+end
 
+RSpec::Core::RakeTask.new(:rspec) do |spec|
+  spec.rspec_opts = ["-c", "-f progress", "-r ./spec/spec_helper.rb"]
 end

data/solrj_wrapper.gemspec

@@ -25,8 +25,8 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "yard"
   # tests
 	gem.add_development_dependency 'rspec'
+	gem.add_development_dependency 'coveralls'
 	gem.add_development_dependency 'simplecov'
-	gem.add_development_dependency 'simplecov-rcov'
   gem.add_development_dependency "jettywrapper"
 
 end

data/spec/solrj_wrapper_spec.rb

@@ -8,25 +8,25 @@ describe SolrjWrapper do
   end
   
   it "should initialize a query_server object" do
-    @solrj_wrapper.query_server.should be_an_instance_of(Java::OrgApacheSolrClientSolrjImpl::CommonsHttpSolrServer)
+    expect(@solrj_wrapper.query_server).to be_an_instance_of(Java::OrgApacheSolrClientSolrjImpl::HttpSolrServer)
   end
 
   context "get_query_result_docs" do
     it "should return a SolrDocumentList object" do
       q = org.apache.solr.client.solrj.SolrQuery.new
-      @solrj_wrapper.get_query_result_docs(q).should be_an_instance_of(Java::OrgApacheSolrCommon::SolrDocumentList)
+      expect(@solrj_wrapper.get_query_result_docs(q)).to be_an_instance_of(Java::OrgApacheSolrCommon::SolrDocumentList)
     end
     
     it "should return an object of size 0 when there are no hits" do
       q = org.apache.solr.client.solrj.SolrQuery.new
       q.setQuery("zzzzzznohitszzzzzzzz")
-      @solrj_wrapper.get_query_result_docs(q).size.should == 0
+      expect(@solrj_wrapper.get_query_result_docs(q).size).to eq 0
     end
     
     it "should return an object of size 0 when rows = 0" do
       q = org.apache.solr.client.solrj.SolrQuery.new
       q.setRows(0)
-      @solrj_wrapper.get_query_result_docs(q).size.should == 0
+      expect(@solrj_wrapper.get_query_result_docs(q).size).to eq 0
     end
 
     it "should return an object of size > 1 when there are hits and rows is > 0" do
@@ -35,67 +35,67 @@ describe SolrjWrapper do
       @solrj_wrapper.add_doc_to_ix(sid, "test_rec")
       @solrj_wrapper.commit
       q = org.apache.solr.client.solrj.SolrQuery.new
-      @solrj_wrapper.get_query_result_docs(q).size.should_not == 0
+      expect(@solrj_wrapper.get_query_result_docs(q).size).not_to eq 0
       @solrj_wrapper.empty_ix
     end
   end
   
-  it "should initialize a streaming_update_server object" do
-    @solrj_wrapper.streaming_update_server.should be_an_instance_of(Java::OrgApacheSolrClientSolrjImpl::StreamingUpdateSolrServer)
+  it "streaming_update_server should be an HttpSolrServer object" do
+    expect(@solrj_wrapper.streaming_update_server).to be_an_instance_of(Java::OrgApacheSolrClientSolrjImpl::HttpSolrServer)
   end
   
   context "add_vals_to_fld" do
     it "should do nothing if the field name or value is nil or of size 0" do
       sid = Java::OrgApacheSolrCommon::SolrInputDocument.new
       @solrj_wrapper.add_vals_to_fld(sid, nil, ["val"])
-      sid.isEmpty.should be_true
+      expect(sid.isEmpty).to eq true
       @solrj_wrapper.add_vals_to_fld(sid, "", ["val"])
-      sid.isEmpty.should be_true
+      expect(sid.isEmpty).to eq true
       @solrj_wrapper.add_vals_to_fld(sid, "fldname", nil)
-      sid.isEmpty.should be_true
+      expect(sid.isEmpty).to eq true
       @solrj_wrapper.add_vals_to_fld(sid, "fldname", [])
-      sid.isEmpty.should be_true
+      expect(sid.isEmpty).to eq true
     end
     
     it "should create a new field when none exists" do
       sid = Java::OrgApacheSolrCommon::SolrInputDocument.new
       @solrj_wrapper.add_vals_to_fld(sid, "single", ["val"])
       vals = sid["single"].getValues
-      vals.size.should == 1
-      vals[0].should == "val"
+      expect(vals.size).to eq 1
+      expect(vals[0]).to eq "val"
       @solrj_wrapper.add_vals_to_fld(sid, "mult", ["val1", "val2"])
       vals = sid["mult"].getValues
-      vals.size.should == 2
-      vals[0].should == "val1"
-      vals[1].should == "val2"
+      expect(vals.size).to eq 2
+      expect(vals[0]).to eq "val1"
+      expect(vals[1]).to eq "val2"
     end
     
     it "should keep the existing values when it adds a value to a field" do
       sid = Java::OrgApacheSolrCommon::SolrInputDocument.new
       @solrj_wrapper.add_vals_to_fld(sid, "fld", ["val"])
       vals = sid["fld"].getValues
-      vals.size.should == 1
-      vals[0].should == "val"
+      expect(vals.size).to eq 1
+      expect(vals[0]).to eq "val"
       @solrj_wrapper.add_vals_to_fld(sid, "fld", ["val1", "val2"])
       vals = sid["fld"].getValues
-      vals.size.should == 3
-      vals.contains("val").should_not be_nil
-      vals.contains("val1").should_not be_nil
-      vals.contains("val2").should_not be_nil
+      expect(vals.size).to eq 3
+      expect(vals.contains("val")).not_to eq nil
+      expect(vals.contains("val1")).not_to eq nil
+      expect(vals.contains("val2")).not_to eq nil
     end
     
     it "should add all values, except those already present" do
       sid = Java::OrgApacheSolrCommon::SolrInputDocument.new
       @solrj_wrapper.add_vals_to_fld(sid, "fld", ["val"])
       vals = sid["fld"].getValues
-      vals.size.should == 1
-      vals[0].should == "val"
+      expect(vals.size).to eq 1
+      expect(vals[0]).to eq "val"
       @solrj_wrapper.add_vals_to_fld(sid, "fld", ["val1", "val2", "val"])
       vals = sid["fld"].getValues
-      vals.size.should == 3
-      vals.contains("val").should_not be_nil
-      vals.contains("val1").should_not be_nil
-      vals.contains("val2").should_not be_nil
+      expect(vals.size).to eq 3
+      expect(vals.contains("val")).not_to eq nil
+      expect(vals.contains("val1")).not_to eq nil
+      expect(vals.contains("val2")).not_to eq nil
     end
   end # context add_vals_to_fld
 
@@ -103,21 +103,21 @@ describe SolrjWrapper do
     it "should do nothing if the field name or value is nil or of size 0" do
       sid = Java::OrgApacheSolrCommon::SolrInputDocument.new
       @solrj_wrapper.add_val_to_fld(sid, nil, "val")
-      sid.isEmpty.should be_true
+      expect(sid.isEmpty).to eq true
       @solrj_wrapper.add_val_to_fld(sid, "", "val")
-      sid.isEmpty.should be_true
+      expect(sid.isEmpty).to eq true
       @solrj_wrapper.add_val_to_fld(sid, "fldname", nil)
-      sid.isEmpty.should be_true
+      expect(sid.isEmpty).to eq true
       @solrj_wrapper.add_val_to_fld(sid, "fldname", [])
-      sid.isEmpty.should be_true
+      expect(sid.isEmpty).to eq true
     end
     
     it "should create a new field when none exists" do
       sid = Java::OrgApacheSolrCommon::SolrInputDocument.new
       @solrj_wrapper.add_val_to_fld(sid, "single", "val")
       vals = sid["single"].getValues
-      vals.size.should == 1
-      vals[0].should == "val"
+      expect(vals.size).to eq 1
+      expect(vals[0]).to eq "val"
     end
     
     it "should keep the existing values when it adds a value to a field" do
@@ -125,10 +125,10 @@ describe SolrjWrapper do
       @solrj_wrapper.add_vals_to_fld(sid, "fld", ["val1", "val2"])
       @solrj_wrapper.add_val_to_fld(sid, "fld", "val")
       vals = sid["fld"].getValues
-      vals.size.should == 3
-      vals.contains("val").should_not be_nil
-      vals.contains("val1").should_not be_nil
-      vals.contains("val2").should_not be_nil
+      expect(vals.size).to eq 3
+      expect(vals.contains("val")).not_to eq nil
+      expect(vals.contains("val1")).not_to eq nil
+      expect(vals.contains("val2")).not_to eq nil
     end
     
     it "should add all values, except those already present" do
@@ -136,10 +136,10 @@ describe SolrjWrapper do
       @solrj_wrapper.add_vals_to_fld(sid, "fld", ["val1", "val2", "val"])
       @solrj_wrapper.add_val_to_fld(sid, "fld", "val")
       vals = sid["fld"].getValues
-      vals.size.should == 3
-      vals.contains("val").should_not be_nil
-      vals.contains("val1").should_not be_nil
-      vals.contains("val2").should_not be_nil
+      expect(vals.size).to eq 3
+      expect(vals.contains("val")).not_to eq nil
+      expect(vals.contains("val1")).not_to eq nil
+      expect(vals.contains("val2")).not_to eq nil
     end
   end # context add_vals_to_fld
 
@@ -149,12 +149,12 @@ describe SolrjWrapper do
       @solrj_wrapper.add_vals_to_fld(sid, "fld", ["val1", "val2", "val3"])
       @solrj_wrapper.replace_field_values(sid, "fld", ["val4", "val5"])
       vals = sid["fld"].getValues
-      vals.size.should == 2
-      vals.contains("val1").should be_false
-      vals.contains("val2").should be_false
-      vals.contains("val3").should be_false
-      vals.contains("val4").should be_true
-      vals.contains("val5").should be_true
+      expect(vals.size).to eq 2
+      expect(vals.contains("val1")).to eq false
+      expect(vals.contains("val2")).to eq false
+      expect(vals.contains("val3")).to eq false
+      expect(vals.contains("val4")).to eq true
+      expect(vals.contains("val5")).to eq true
     end
 
     it "should retain unchanged values" do
@@ -162,26 +162,26 @@ describe SolrjWrapper do
       @solrj_wrapper.add_vals_to_fld(sid, "fld", ["val1", "val2"])
       @solrj_wrapper.replace_field_values(sid, "fld", ["val2", "val3"])
       vals = sid["fld"].getValues
-      vals.size.should == 2
-      vals.contains("val1").should be_false
-      vals.contains("val2").should be_true
-      vals.contains("val3").should be_true
+      expect(vals.size).to eq 2
+      expect(vals.contains("val1")).to eq false
+      expect(vals.contains("val2")).to eq true
+      expect(vals.contains("val3")).to eq true
     end
     
     it "should create a field when none existed before" do
       sid = Java::OrgApacheSolrCommon::SolrInputDocument.new
-      sid["fld"].should be_nil
+      expect(sid["fld"]).to eq nil
       @solrj_wrapper.replace_field_values(sid, "fld", ["val1"])
       vals = sid["fld"].getValues
-      vals.size.should == 1
-      vals.contains("val1").should be_true
+      expect(vals.size).to eq 1
+      expect(vals.contains("val1")).to eq true
     end
     
     it "should remove a field if there are no values to add" do
       sid = Java::OrgApacheSolrCommon::SolrInputDocument.new
       @solrj_wrapper.add_vals_to_fld(sid, "fld", ["val1", "val2"])
       @solrj_wrapper.replace_field_values(sid, "fld", [])
-      sid["fld"].should be_nil
+      expect(sid["fld"]).to eq nil
     end
   end
 

data/spec/spec_helper.rb

@@ -1,16 +1,13 @@
+require 'coveralls'
+Coveralls.wear!
+
 # for test coverage
 require 'simplecov'
-require 'simplecov-rcov'
-class SimpleCov::Formatter::MergedFormatter
-  def format(result)
-     SimpleCov::Formatter::HTMLFormatter.new.format(result)
-     SimpleCov::Formatter::RcovFormatter.new.format(result)
-  end
-end
-SimpleCov.formatter = SimpleCov::Formatter::MergedFormatter
+SimpleCov.formatter = Coveralls::SimpleCov::Formatter
 SimpleCov.start do
-  add_filter "/spec/"
-  add_filter "/lib/config/"
+  add_filter "spec"
+  add_filter "config"
+  add_filter "lib/config"
 end
 
 require 'solrj_wrapper/settings'

metadata

@@ -1,91 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: solrj_wrapper
 version: !ruby/object:Gem::Version
-  prerelease:
-  version: 0.0.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Naomi Dushay
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-04-27 00:00:00.000000000Z
+date: 2014-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: &3808 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  requirement: *3808
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
   name: rdoc
-  version_requirements: &3826 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  requirement: *3826
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
   name: yard
-  version_requirements: &3842 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  requirement: *3842
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: &3858 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  requirement: *3858
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
-  name: simplecov
-  version_requirements: &3874 !ruby/object:Gem::Requirement
+  name: coveralls
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  requirement: *3874
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
-  name: simplecov-rcov
-  version_requirements: &3890 !ruby/object:Gem::Requirement
+  name: simplecov
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  requirement: *3890
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
   name: jettywrapper
-  version_requirements: &3906 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  requirement: *3906
   prerelease: false
   type: :development
 description: Ruby wrapper for interacting with Solrj objects, such as org.apache.solr.client.solrj.impl.StreamingUpdateSolrServer
@@ -95,21 +115,23 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .coveralls.yml
 - .gitignore
-- .gitmodules
-- .rvmrc
+- .ruby-gemset
+- .ruby-version
+- .travis.yml
+- .yardopts
 - Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
+- config/jetty.yml
 - lib/config/settings.yml
 - lib/solrj_wrapper.rb
 - lib/solrj_wrapper/settings.rb
 - lib/solrj_wrapper/version.rb
 - lib/tasks/ci.rake
 - lib/tasks/doc.rake
-- lib/tasks/jetty.rake
-- lib/tasks/solrmarc.rake
 - lib/tasks/spec.rake
 - solrj_wrapper.gemspec
 - spec/solr/solr.xml
@@ -117,37 +139,29 @@ files:
 - spec/spec_helper.rb
 homepage:
 licenses: []
+metadata: {}
 post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: 2
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: 2
       version: '0'
-  none: false
 requirements: []
 rubyforge_project:
-rubygems_version: 1.8.15
+rubygems_version: 2.2.0
 signing_key:
-specification_version: 3
+specification_version: 4
 summary: This gem must be run under JRuby, and also requires a directory containing SolrJ jars and solr url (see config/settings.yml)
 test_files:
 - spec/solr/solr.xml
 - spec/solrj_wrapper_spec.rb
 - spec/spec_helper.rb
 has_rdoc:
-...

data/.gitmodules

@@ -1,3 +0,0 @@
-[submodule "solrmarc"]
-	path = solrmarc
-	url = git://github.com/solrmarc/stanford-solr-marc.git

data/.rvmrc

@@ -1 +0,0 @@
-rvm use jruby-1.6.7@solrj_wrapper --create

data/lib/tasks/jetty.rake

@@ -1,38 +0,0 @@
-require 'jettywrapper'
-
-namespace :sj_wrap do
-  namespace :jetty do
-    
-    desc "Modify test jetty solr to be multicore"
-    task :config => ['sj_wrap:solrmarc:setup_test_jetty'] do
-
-      # copy the solr.xml file for multi-core to test jetty solr
-      jetty_solr_dir = "solrmarc/test/jetty/solr" 
-      cp('spec/solr/solr.xml', jetty_solr_dir, :verbose => true)
-
-      # set up solr dev and test conf directories
-      dev_conf_dir = "#{jetty_solr_dir}/dev/conf"
-      test_conf_dir = "#{jetty_solr_dir}/test/conf"
-      mkdir_p(dev_conf_dir) unless Dir.exists?(dev_conf_dir)
-      mkdir_p(test_conf_dir) unless Dir.exists?(test_conf_dir)
-      single_core_conf_dir = "#{jetty_solr_dir}/conf"
-      Dir["#{single_core_conf_dir}/*"].each { |f| 
-        cp_r(f, dev_conf_dir, :verbose => true)
-        cp_r(f, test_conf_dir, :verbose => true)
-      }
-      
-      require 'fileutils'
-      # remove single core conf directory
-      FileUtils.rm_rf("#{jetty_solr_dir}/conf/.", :verbose => true)
-      Dir.foreach(jetty_solr_dir + "/conf") { |f| 
-        fn = File.join(jetty_solr_dir, f)
-        File.delete(fn) if f != '.' && f != '..'
-      }
-      
-    end
-
-    desc "Copies the SOLR config files and starts up the test-jetty instance"
-    task :load => [:config, 'jetty:start']
-
-  end
-end

data/lib/tasks/solrmarc.rake

@@ -1,17 +0,0 @@
-namespace :sj_wrap do
-  namespace :solrmarc do
-    require 'ant'
-    
-    desc "run ant dist_site target in solrmarc"
-    task :ant_dist_site do
-      ant '-f solrmarc/build.xml dist_site'
-    end
-    
-    desc "run ant target to set up testing jetty per straight solrmarc"
-    task :setup_test_jetty do
-      ant '-f solrmarc/build.xml test_clean_site'
-      ant '-f solrmarc/build.xml site_setup_test_jetty'
-    end
-
-  end
-end