bio-samtools 0.3.1 → 0.3.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. data/VERSION +1 -1
  2. data/bio-samtools.gemspec +2 -1
  3. data/ext/Makefile-bioruby.patch +27 -0
  4. data/ext/mkrf_conf.rb +6 -4
  5. data/lib/bio/db/sam/external/VERSION +1 -1
  6. metadata +19 -18
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.3.1
1
+ 0.3.2
data/bio-samtools.gemspec CHANGED
@@ -5,7 +5,7 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{bio-samtools}
8
- s.version = "0.3.1"
8
+ s.version = "0.3.2"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = [%q{Ricardo Ramirez-Gonzalez}, %q{Dan MacLean}, %q{Raoul J.P. Bonnal}]
@@ -93,6 +93,7 @@ Gem::Specification.new do |s|
93
93
  "doc/rdoc-style.css",
94
94
  "doc/tutorial.html",
95
95
  "doc/tutorial.pdf",
96
+ "ext/Makefile-bioruby.patch",
96
97
  "ext/mkrf_conf.rb",
97
98
  "lib/bio-samtools.rb",
98
99
  "lib/bio/.DS_Store",
data/ext/Makefile-bioruby.patch ADDED
@@ -0,0 +1,27 @@
1
+ --- Makefile 2011-10-27 14:57:06.000000000 +0200
2
+ +++ ../Makefile-bioruby 2011-10-27 14:57:41.000000000 +0200
3
+ @@ -1,10 +1,11 @@
4
+ CC= gcc
5
+ -CFLAGS= -g -Wall -O2 #-m64 #-arch ppc
6
+ +CFLAGS= -g -Wall -O2 -m64 #-arch ppc
7
+ DFLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_USE_KNETFILE -D_CURSES_LIB=1
8
+ KNETFILE_O= knetfile.o
9
+ LOBJS= bgzf.o kstring.o bam_aux.o bam.o bam_import.o sam.o bam_index.o \
10
+ bam_pileup.o bam_lpileup.o bam_md.o razf.o faidx.o bedidx.o \
11
+ - $(KNETFILE_O) bam_sort.o sam_header.o bam_reheader.o kprobaln.o bam_cat.o
12
+ + $(KNETFILE_O) bam_sort.o sam_header.o bam_reheader.o kprobaln.o bam_cat.o bam_plcmd.o \
13
+ + bam2bcf.o bam2bcf_indel.o sample.o bcftools/bcf.o bcftools/bcfutils.o errmod.o bcftools/fet.o
14
+ AOBJS= bam_tview.o bam_plcmd.o sam_view.o \
15
+ bam_rmdup.o bam_rmdupse.o bam_mate.o bam_stat.o bam_color.o \
16
+ bamtk.o kaln.o bam2bcf.o bam2bcf_indel.o errmod.o sample.o \
17
+ @@ -81,8 +82,8 @@
18
+ dylib:
19
+ @$(MAKE) cleanlocal; \
20
+ case `uname` in \
21
+ - Linux) $(MAKE) CFLAGS="$(CFLAGS) -fPIC" libbam.so.1-local;; \
22
+ - Darwin) $(MAKE) CFLAGS="$(CFLAGS) -fPIC" libbam.1.dylib-local;; \
23
+ + Linux) $(MAKE) CFLAGS="$(CFLAGS) -fPIC" libbam.so.1-local;; \
24
+ + Darwin) $(MAKE) CFLAGS="$(CFLAGS) -fPIC" libbam.1.dylib-local ;; \
25
+ *) echo 'Unknown OS';; \
26
+ esac
27
+
data/ext/mkrf_conf.rb CHANGED
@@ -36,12 +36,14 @@ end
36
36
  task :compile do
37
37
  sh "tar xvfj #{SamToolsFile}"
38
38
  cd("samtools-#{Version}") do
39
-
39
+ sh "patch < ../Makefile-bioruby.patch"
40
40
  case Config::CONFIG['host_os']
41
41
  when /linux/
42
- sh "CFLAGS='-g -Wall -O2 -fPIC' make -e"
42
+ #sh "CFLAGS='-g -Wall -O2 -fPIC' make -e"
43
+ sh "make"
43
44
  cp("libbam.a","#{path_external}")
44
- sh "CFLAGS='-g -Wall -O2 -fPIC' make -e libbam.so.1-local"
45
+ #sh "CFLAGS='-g -Wall -O2 -fPIC' make -e libbam.so.1-local"
46
+ sh "make libbam.so.1-local"
45
47
  cp("libbam.so.1","#{path_external}")
46
48
  when /darwin/
47
49
  sh "make"
@@ -49,7 +51,7 @@ task :compile do
49
51
  sh "make libbam.1.dylib-local"
50
52
  cp("libbam.1.dylib","#{path_external}")
51
53
  when /mswin|mingw/ then raise NotImplementedError, "BWA library is not available for Windows platform"
52
- end#case
54
+ end #case
53
55
  end #cd
54
56
  end
55
57
 
data/lib/bio/db/sam/external/VERSION CHANGED
@@ -1 +1 @@
1
- 0.1.16
1
+ 0.1.18
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bio-samtools
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.1
4
+ version: 0.3.2
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -15,7 +15,7 @@ date: 2011-10-27 00:00:00.000000000Z
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
17
17
  name: ffi
18
- requirement: &2169462860 !ruby/object:Gem::Requirement
18
+ requirement: &2152165380 !ruby/object:Gem::Requirement
19
19
  none: false
20
20
  requirements:
21
21
  - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
23
23
  version: '0'
24
24
  type: :runtime
25
25
  prerelease: false
26
- version_requirements: *2169462860
26
+ version_requirements: *2152165380
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: bio
29
- requirement: &2169461340 !ruby/object:Gem::Requirement
29
+ requirement: &2152164200 !ruby/object:Gem::Requirement
30
30
  none: false
31
31
  requirements:
32
32
  - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
34
34
  version: 1.4.2
35
35
  type: :runtime
36
36
  prerelease: false
37
- version_requirements: *2169461340
37
+ version_requirements: *2152164200
38
38
  - !ruby/object:Gem::Dependency
39
39
  name: shoulda
40
- requirement: &2169458620 !ruby/object:Gem::Requirement
40
+ requirement: &2152162920 !ruby/object:Gem::Requirement
41
41
  none: false
42
42
  requirements:
43
43
  - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
45
45
  version: '0'
46
46
  type: :development
47
47
  prerelease: false
48
- version_requirements: *2169458620
48
+ version_requirements: *2152162920
49
49
  - !ruby/object:Gem::Dependency
50
50
  name: bundler
51
- requirement: &2169456540 !ruby/object:Gem::Requirement
51
+ requirement: &2152161080 !ruby/object:Gem::Requirement
52
52
  none: false
53
53
  requirements:
54
54
  - - ~>
@@ -56,10 +56,10 @@ dependencies:
56
56
  version: 1.0.0
57
57
  type: :development
58
58
  prerelease: false
59
- version_requirements: *2169456540
59
+ version_requirements: *2152161080
60
60
  - !ruby/object:Gem::Dependency
61
61
  name: jeweler
62
- requirement: &2169454480 !ruby/object:Gem::Requirement
62
+ requirement: &2152160280 !ruby/object:Gem::Requirement
63
63
  none: false
64
64
  requirements:
65
65
  - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
67
67
  version: '0'
68
68
  type: :development
69
69
  prerelease: false
70
- version_requirements: *2169454480
70
+ version_requirements: *2152160280
71
71
  - !ruby/object:Gem::Dependency
72
72
  name: rcov
73
- requirement: &2169453180 !ruby/object:Gem::Requirement
73
+ requirement: &2152158920 !ruby/object:Gem::Requirement
74
74
  none: false
75
75
  requirements:
76
76
  - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
78
78
  version: '0'
79
79
  type: :development
80
80
  prerelease: false
81
- version_requirements: *2169453180
81
+ version_requirements: *2152158920
82
82
  - !ruby/object:Gem::Dependency
83
83
  name: bio
84
- requirement: &2169451320 !ruby/object:Gem::Requirement
84
+ requirement: &2152158080 !ruby/object:Gem::Requirement
85
85
  none: false
86
86
  requirements:
87
87
  - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
89
89
  version: 1.4.2
90
90
  type: :development
91
91
  prerelease: false
92
- version_requirements: *2169451320
92
+ version_requirements: *2152158080
93
93
  - !ruby/object:Gem::Dependency
94
94
  name: ffi
95
- requirement: &2169447120 !ruby/object:Gem::Requirement
95
+ requirement: &2152156660 !ruby/object:Gem::Requirement
96
96
  none: false
97
97
  requirements:
98
98
  - - ! '>='
@@ -100,7 +100,7 @@ dependencies:
100
100
  version: '0'
101
101
  type: :development
102
102
  prerelease: false
103
- version_requirements: *2169447120
103
+ version_requirements: *2152156660
104
104
  description: ! "Binder of samtools for ruby, on the top of FFI. \n\n This project
105
105
  was born from the need to add support of BAM files to \n the gee_fu genome browser
106
106
  (http://github.com/danmaclean/gee_fu)."
@@ -184,6 +184,7 @@ files:
184
184
  - doc/rdoc-style.css
185
185
  - doc/tutorial.html
186
186
  - doc/tutorial.pdf
187
+ - ext/Makefile-bioruby.patch
187
188
  - ext/mkrf_conf.rb
188
189
  - lib/bio-samtools.rb
189
190
  - lib/bio/.DS_Store
@@ -237,7 +238,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
237
238
  version: '0'
238
239
  segments:
239
240
  - 0
240
- hash: -3326585484229877040
241
+ hash: 1935979892005829555
241
242
  required_rubygems_version: !ruby/object:Gem::Requirement
242
243
  none: false
243
244
  requirements: