marcspec 1.6.5 → 1.6.6

data/CHANGES

@@ -1,3 +1,7 @@
+1.6.6
+  * Remove references to FATAL errors, which logback (nee jlogger) doesn't support
+  * Exit with code 1 (not zero) when things are, in fact, fatal (using Process.abort)
+  
 1.6.5
   * Change to use jlogger
   

data/Rakefile

@@ -15,7 +15,7 @@ begin
     gem.add_development_dependency "rspec"
     gem.add_development_dependency "yard", ">= 0"
     gem.add_development_dependency 'ci_reporter'
-    gem.add_dependency 'marc4j4r', '>=1.3.0'
+    gem.add_dependency 'marc4j4r', '>=1.2.0'
     gem.add_dependency 'jlogger', '>=0.0.3'
     gem.add_dependency 'jruby_streaming_update_solr_server', '>=0.5.3'
     

data/VERSION

@@ -1 +1 @@
-1.6.5
+1.6.6

data/lib/marcspec/map.rb

@@ -61,7 +61,7 @@ module MARCSpec
       when :multi
         return MultiValueMap.new(rawmap[:mapname], rawmap[:map])
       else
-        log.fatal "Map file #{filename} doesn't seem to be either a KV map or a MuliValueMap according to :maptype (#{rawmap[:maptype]})"
+        log.error "Map file #{filename} doesn't seem to be either a KV map or a MuliValueMap according to :maptype (#{rawmap[:maptype]})"
         raise ArgumentError, "File #{filename} doesn't evaluate to a valid map"
       end
       

data/lib/marcspec/specset.rb

@@ -85,8 +85,8 @@ module MARCSpec
       f = File.open(f) if f.is_a? String
 
       unless f
-        log.fatal("Can't open file #{file}") 
-        Process.exit
+        log.error("Can't open file #{file}; unable to configure") 
+        Process.abort("Can't open file #{file}; unable to configure")
       end
       self.instance_eval(f.read)
       self.check_and_fill_maps
@@ -100,8 +100,8 @@ module MARCSpec
             log.debug "  Found map #{map.mapname} for solr field #{sfs.solrField}"
             sfs.map = map
           else
-            log.fatal "  Cannot find map #{sfs._mapname} for solr field #{sfs.solrField}"
-            Process.exit
+            log.error "  Cannot find map #{sfs._mapname} for solr field #{sfs.solrField}"
+            Process.abort("Cannot find map #{sfs._mapname} for solr field #{sfs.solrField}")
           end
         end
       end
@@ -123,8 +123,8 @@ module MARCSpec
         if spechash[:mapname]
           map = self.map(spechash[:mapname])
           unless map
-            log.fatal "Cannot find map #{spechash[:mapname]} for field #{spechash[:solrField]}"
-            Process.exit
+            log.error "Cannot find map #{spechash[:mapname]} for field #{spechash[:solrField]}"
+            Process.abort("Cannot find map #{spechash[:mapname]} for field #{spechash[:solrField]}")
           else
             log.debug "  Found map #{spechash[:mapname]} for field #{spechash[:solrField]}"
             solrspec.map = map

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 1
     - 6
-    - 5
-  version: 1.6.5
+    - 6
+  version: 1.6.6
 platform: ruby
 authors: 
   - BillDueber
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-15 00:00:00 -04:00
+date: 2010-10-18 00:00:00 -04:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -62,9 +62,9 @@ dependencies:
           - !ruby/object:Gem::Version 
             segments: 
               - 1
-              - 3
+              - 2
               - 0
-            version: 1.3.0
+            version: 1.2.0
     type: :runtime
     version_requirements: *id004
   - !ruby/object:Gem::Dependency