solrmarc_wrapper 0.0.3 → 0.0.4

data/Gemfile

@@ -1,4 +1,4 @@
 source :rubygems
 
-# Please see solrmarc_wrapper.gemspec for this gem's dependencies
+# See solrmarc_wrapper.gemspec for this gem's dependencies
 gemspec

data/LICENSE

@@ -1,22 +1,5 @@
-Copyright (c) 2012 Naomi Dushay
+Copyright (c) 20XX-2012.  The Board of Trustees of the Leland Stanford Junior University. All rights reserved.
 
-MIT License
+Redistribution and use of this distribution in source and binary forms, with or without modification, are permitted provided that: The above copyright notice and this permission notice appear in all copies and supporting documentation; The name, identifiers, and trademarks of The Board of Trustees of the Leland Stanford Junior University are not used in advertising or publicity without the express prior written permission of The Board of Trustees of the Leland Stanford Junior University; Recipients acknowledge that this distribution is made available as a research courtesy, "as is", potentially with defects, without any obligation on the part of The Board of Trustees of the Leland Stanford Junior University to provide support, services, or repair;
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE BOARD OF TRUSTEES OF THE LELAND STANFORD JUNIOR UNIVERSITY DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, WITH REGARD TO THIS SOFTWARE, INCLUDING WITHOUT LIMITATION ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, AND IN NO EVENT SHALL THE BOARD OF TRUSTEES OF THE LELAND STANFORD JUNIOR UNIVERSITY BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, TORT (INCLUDING NEGLIGENCE) OR STRICT LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

data/README.rdoc

@@ -29,6 +29,8 @@ Example:  this retrieves the full marc record stored in the Solr index, runs it
 
 == Contributing
 
+See also the wiki page for committers:  https://github.com/solrmarc/solrmarc_wrapper/wiki/For-Committers
+
 1. Fork it
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Added some feature'`)

data/config/settings.yml

@@ -9,14 +9,14 @@ prod:
 dev:
   solrmarc_dist_dir: your_solrmarc_dist_dir
   solrmarc_conf_props_file: your_solrmarc_config.properties
-  solr_url: http://127.0.0.1:8983/solr/dev
+  solr_url: http://127.0.0.1:8984/solr/dev
   log_level: info
 
 # settings for continuous integration
 ci:
   solrmarc_dist_dir: solrmarc/dist
   solrmarc_conf_props_file: sw_config.properties
-  solr_url: http://127.0.0.1:8983/solr/test
+  solr_url: http://127.0.0.1:8984/solr/test
   log_level: info
     
 # add:

data/lib/solrmarc_wrapper.rb

@@ -11,16 +11,18 @@ class SolrmarcWrapper
 
   # @param solrmarc_dist_dir  distribution directory of SolrMarc build 
   # @param solrmarc_conf_props_fname  the name of the xx_config.properties file for SolrMarc, relative to solrmarc_dist_dir
-  # @param 
+  # @param solr_url  the base url of a running Solr server 
+  # @param log_level  level of Logger messages to output; defaults to Logger::INFO
+  # @param log_file  file to receive Logger output; defaults to STDERR
   # solr_url  base url of the solr instance
   def initialize(solrmarc_dist_dir, config_props_fname, solr_url, log_level=Logger::INFO, log_file=STDERR)
     if not defined? JRUBY_VERSION
       raise "SolrmarcWrapper only runs under jruby"
     end
-    load_solrmarc(solrmarc_dist_dir)
-    setup_solr_reindexer(solr_url, config_props_fname)
     @logger = Logger.new(log_file)
     @logger.level = log_level
+    load_solrmarc(solrmarc_dist_dir)
+    setup_solr_reindexer(solr_url, config_props_fname)
   end
 
   # retrieves the full marc rec

data/lib/solrmarc_wrapper/version.rb

@@ -1,3 +1,3 @@
 class SolrmarcWrapper
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/tasks/doc.rake

@@ -11,7 +11,7 @@ namespace :sm_wrap do
     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', 'crez-sw-ingest Documentation']
+      yt.options = ['--output-dir', doc_dest_dir, '--readme', 'README.rdoc', '--title', 'Solrmarc_Wrapper Documentation']
     end
   rescue LoadError
     desc "Generate YARD Documentation"

data/lib/tasks/spec.rake

@@ -10,7 +10,7 @@ namespace :sm_wrap do
       :jetty_home => test_jetty_dir,
       :solr_home => test_jetty_dir + '/solr',
       :java_opts => "-Dsolr.data.dir=" + test_jetty_dir + "/solr/test/data",
-      :jetty_port => 8983,
+      :jetty_port => 8984,
       :startup_wait => 25
     })
     error = Jettywrapper.wrap(jetty_params) do 

data/spec/scripts/curl_add_bare666_to_test.sh

@@ -1 +1 @@
-curl "http://localhost:8983/solr/test/update?commit=true" -H "Content-Type: text/xml" --data-binary @spec/fixtures/add_solrdoc_bare666.xml
+curl "http://localhost:8984/solr/test/update?commit=true" -H "Content-Type: text/xml" --data-binary @spec/fixtures/add_solrdoc_bare666.xml

data/spec/scripts/curl_empty_test_solr.sh

@@ -1 +1 @@
-curl "http://localhost:8983/solr/test/update?commit=true" -H "Content-Type: application/xml" --data-binary '<delete><query>*:*</query></delete>'
+curl "http://localhost:8984/solr/test/update?commit=true" -H "Content-Type: application/xml" --data-binary '<delete><query>*:*</query></delete>'

data/spec/solr/solr.xml

@@ -1,21 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
 <!--
 All (relative) paths are relative to the installation path
 persistent: Save changes made via the API to this file

metadata

@@ -2,14 +2,14 @@
 name: solrmarc_wrapper
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Naomi Dushay
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-04-17 00:00:00.000000000Z
+date: 2012-04-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake