madeline 0.1.5 → 0.1.6

data/Manifest

@@ -1,6 +1,6 @@
 README.md
 Rakefile
-ext/madeline/madeline2-linux-x86_64
+ext/madeline/madeline2-linux-x86_64-r97
 lib/madeline.rb
 lib/madeline/interface.rb
 test/fixtures/madeline.yml

data/Rakefile

@@ -4,7 +4,7 @@ require 'echoe'
 require 'rake/testtask'
 require 'rake/rdoctask'
 
-Echoe.new('madeline','0.1.5') do |p|
+Echoe.new('madeline','0.1.6') do |p|
   p.description 		= "Interface to Madeline2"
   p.url				= "http://github.com/dmauldin/madeline"
   p.author			= "Denise Mauldin"

data/lib/madeline.rb

@@ -1,12 +1,12 @@
 module Madeline
 
-  VERSION 		= "0.1.4"
+  VERSION 		= "0.1.6"
 
   MADELINE_VERSION	= "2.0"
 
   MADELINE_ROOT		= File.expand_path(File.dirname(__FILE__))
 
-  MADELINE_COMMAND	= "#{MADELINE_ROOT}/../ext/madeline/madeline2-linux-x86_64"
+  MADELINE_COMMAND	= "#{MADELINE_ROOT}/../ext/madeline/madeline2-linux-x86_64-r97"
 
 
 end

data/lib/madeline/interface.rb

@@ -25,24 +25,26 @@ module Madeline
       end
       tempfile.flush
       tempoutfile = Tempfile.new('madeline_output')
+      if !File.exists?(tempfile.path)
+        raise Error, "Failed to create madeline input file #{tempfile.path}"
+      end
       begin
         log = `#{command} --outputprefix #{tempoutfile.path} --outputext .xml #{tempfile.path} 2>&1`
-
         unless (log.match(/Pedigree output file is/)) then
-	  raise Error, "Madeline failed to run.  Check Madeline path."
+	  raise Error, "Madeline failed to run or had a segmentation fault.  #{command} --outputprefix #{tempoutfile.path} --outputext .xml #{tempfile.path}"
 	end
         filename = "#{tempoutfile.path}.xml"
 	if (!File.exists?(filename)) then
-	  raise Error, "Output File doesn't exist."
+	  raise Error, "Output File doesn't exist. #{filename}   command was : #{command} --outputprefix #{tempoutfile.path} --outputext .xml #{tempfile.path}"
         end
-      rescue Exception
+      rescue 
 	if log.nil? then
-          raise Error, "Madeline failed to run. Tried #{@madeline}"
+          raise Error, "Madeline failed to run. Tried #{@madeline}.  #{$!}"
 	else
-	  raise Error, "Madeline had an error: #{log}.  Tried #{@madeline}"
+	  raise Error, "Madeline had an error: #{log}  Tried #{@madeline}.\n #{$!}\n"
 	end
       ensure
-        tempfile.close!
+#        tempfile.close!
       end
       unless $?.exitstatus.zero?
         raise Error, log 

data/madeline.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{madeline}
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Denise Mauldin"]
-  s.date = %q{2011-11-15}
+  s.date = %q{2011-11-17}
   s.description = %q{Interface to Madeline2}
   s.email = %q{denise.mauldin@gmail.com}
-  s.extra_rdoc_files = ["README.md", "ext/madeline/madeline2-linux-x86_64", "lib/madeline.rb", "lib/madeline/interface.rb"]
-  s.files = ["README.md", "Rakefile", "ext/madeline/madeline2-linux-x86_64", "lib/madeline.rb", "lib/madeline/interface.rb", "test/fixtures/madeline.yml", "test/labels.txt", "test/madeline_test.rb", "test/pedigree.txt", "test/test_helper.rb", "Manifest", "madeline.gemspec"]
+  s.extra_rdoc_files = ["README.md", "ext/madeline/madeline2-linux-x86_64-r97", "lib/madeline.rb", "lib/madeline/interface.rb"]
+  s.files = ["README.md", "Rakefile", "ext/madeline/madeline2-linux-x86_64-r97", "lib/madeline.rb", "lib/madeline/interface.rb", "test/fixtures/madeline.yml", "test/labels.txt", "test/madeline_test.rb", "test/pedigree.txt", "test/test_helper.rb", "Manifest", "madeline.gemspec"]
   s.homepage = %q{http://github.com/dmauldin/madeline}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Madeline", "--main", "README.md"]
   s.require_paths = ["lib", "ext"]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Denise Mauldin
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-15 00:00:00 -08:00
+date: 2011-11-17 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -26,13 +26,13 @@ extensions: []
 
 extra_rdoc_files: 
 - README.md
-- ext/madeline/madeline2-linux-x86_64
+- ext/madeline/madeline2-linux-x86_64-r97
 - lib/madeline.rb
 - lib/madeline/interface.rb
 files: 
 - README.md
 - Rakefile
-- ext/madeline/madeline2-linux-x86_64
+- ext/madeline/madeline2-linux-x86_64-r97
 - lib/madeline.rb
 - lib/madeline/interface.rb
 - test/fixtures/madeline.yml