madeline 0.1.5 → 0.1.6
Sign up to get free protection for your applications and to get access to all the features.
- data/Manifest +1 -1
- data/Rakefile +1 -1
- data/ext/madeline/madeline2-linux-x86_64-r97 +0 -0
- data/lib/madeline.rb +2 -2
- data/lib/madeline/interface.rb +9 -7
- data/madeline.gemspec +4 -4
- metadata +5 -5
- data/ext/madeline/madeline2-linux-x86_64 +0 -0
data/Manifest
CHANGED
data/Rakefile
CHANGED
@@ -4,7 +4,7 @@ require 'echoe'
|
|
4
4
|
require 'rake/testtask'
|
5
5
|
require 'rake/rdoctask'
|
6
6
|
|
7
|
-
Echoe.new('madeline','0.1.
|
7
|
+
Echoe.new('madeline','0.1.6') do |p|
|
8
8
|
p.description = "Interface to Madeline2"
|
9
9
|
p.url = "http://github.com/dmauldin/madeline"
|
10
10
|
p.author = "Denise Mauldin"
|
Binary file
|
data/lib/madeline.rb
CHANGED
@@ -1,12 +1,12 @@
|
|
1
1
|
module Madeline
|
2
2
|
|
3
|
-
VERSION = "0.1.
|
3
|
+
VERSION = "0.1.6"
|
4
4
|
|
5
5
|
MADELINE_VERSION = "2.0"
|
6
6
|
|
7
7
|
MADELINE_ROOT = File.expand_path(File.dirname(__FILE__))
|
8
8
|
|
9
|
-
MADELINE_COMMAND = "#{MADELINE_ROOT}/../ext/madeline/madeline2-linux-x86_64"
|
9
|
+
MADELINE_COMMAND = "#{MADELINE_ROOT}/../ext/madeline/madeline2-linux-x86_64-r97"
|
10
10
|
|
11
11
|
|
12
12
|
end
|
data/lib/madeline/interface.rb
CHANGED
@@ -25,24 +25,26 @@ module Madeline
|
|
25
25
|
end
|
26
26
|
tempfile.flush
|
27
27
|
tempoutfile = Tempfile.new('madeline_output')
|
28
|
+
if !File.exists?(tempfile.path)
|
29
|
+
raise Error, "Failed to create madeline input file #{tempfile.path}"
|
30
|
+
end
|
28
31
|
begin
|
29
32
|
log = `#{command} --outputprefix #{tempoutfile.path} --outputext .xml #{tempfile.path} 2>&1`
|
30
|
-
|
31
33
|
unless (log.match(/Pedigree output file is/)) then
|
32
|
-
raise Error, "Madeline failed to run.
|
34
|
+
raise Error, "Madeline failed to run or had a segmentation fault. #{command} --outputprefix #{tempoutfile.path} --outputext .xml #{tempfile.path}"
|
33
35
|
end
|
34
36
|
filename = "#{tempoutfile.path}.xml"
|
35
37
|
if (!File.exists?(filename)) then
|
36
|
-
raise Error, "Output File doesn't exist."
|
38
|
+
raise Error, "Output File doesn't exist. #{filename} command was : #{command} --outputprefix #{tempoutfile.path} --outputext .xml #{tempfile.path}"
|
37
39
|
end
|
38
|
-
rescue
|
40
|
+
rescue
|
39
41
|
if log.nil? then
|
40
|
-
raise Error, "Madeline failed to run. Tried #{@madeline}"
|
42
|
+
raise Error, "Madeline failed to run. Tried #{@madeline}. #{$!}"
|
41
43
|
else
|
42
|
-
raise Error, "Madeline had an error: #{log}
|
44
|
+
raise Error, "Madeline had an error: #{log} Tried #{@madeline}.\n #{$!}\n"
|
43
45
|
end
|
44
46
|
ensure
|
45
|
-
tempfile.close!
|
47
|
+
# tempfile.close!
|
46
48
|
end
|
47
49
|
unless $?.exitstatus.zero?
|
48
50
|
raise Error, log
|
data/madeline.gemspec
CHANGED
@@ -2,15 +2,15 @@
|
|
2
2
|
|
3
3
|
Gem::Specification.new do |s|
|
4
4
|
s.name = %q{madeline}
|
5
|
-
s.version = "0.1.
|
5
|
+
s.version = "0.1.6"
|
6
6
|
|
7
7
|
s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
|
8
8
|
s.authors = ["Denise Mauldin"]
|
9
|
-
s.date = %q{2011-11-
|
9
|
+
s.date = %q{2011-11-17}
|
10
10
|
s.description = %q{Interface to Madeline2}
|
11
11
|
s.email = %q{denise.mauldin@gmail.com}
|
12
|
-
s.extra_rdoc_files = ["README.md", "ext/madeline/madeline2-linux-x86_64", "lib/madeline.rb", "lib/madeline/interface.rb"]
|
13
|
-
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"]
|
12
|
+
s.extra_rdoc_files = ["README.md", "ext/madeline/madeline2-linux-x86_64-r97", "lib/madeline.rb", "lib/madeline/interface.rb"]
|
13
|
+
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"]
|
14
14
|
s.homepage = %q{http://github.com/dmauldin/madeline}
|
15
15
|
s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Madeline", "--main", "README.md"]
|
16
16
|
s.require_paths = ["lib", "ext"]
|
metadata
CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
|
|
5
5
|
segments:
|
6
6
|
- 0
|
7
7
|
- 1
|
8
|
-
-
|
9
|
-
version: 0.1.
|
8
|
+
- 6
|
9
|
+
version: 0.1.6
|
10
10
|
platform: ruby
|
11
11
|
authors:
|
12
12
|
- Denise Mauldin
|
@@ -14,7 +14,7 @@ autorequire:
|
|
14
14
|
bindir: bin
|
15
15
|
cert_chain: []
|
16
16
|
|
17
|
-
date: 2011-11-
|
17
|
+
date: 2011-11-17 00:00:00 -08:00
|
18
18
|
default_executable:
|
19
19
|
dependencies: []
|
20
20
|
|
@@ -26,13 +26,13 @@ extensions: []
|
|
26
26
|
|
27
27
|
extra_rdoc_files:
|
28
28
|
- README.md
|
29
|
-
- ext/madeline/madeline2-linux-x86_64
|
29
|
+
- ext/madeline/madeline2-linux-x86_64-r97
|
30
30
|
- lib/madeline.rb
|
31
31
|
- lib/madeline/interface.rb
|
32
32
|
files:
|
33
33
|
- README.md
|
34
34
|
- Rakefile
|
35
|
-
- ext/madeline/madeline2-linux-x86_64
|
35
|
+
- ext/madeline/madeline2-linux-x86_64-r97
|
36
36
|
- lib/madeline.rb
|
37
37
|
- lib/madeline/interface.rb
|
38
38
|
- test/fixtures/madeline.yml
|
Binary file
|