1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
|
From: Dmitry Borodaenko <angdraug@debian.org>
Date: Wed, 14 Sep 2011 01:17:04 +0300
Subject: remove usage of rubygems
---
lib/dbd/ODBC.rb | 6 ------
test/ts_dbd.rb | 10 +---------
2 files changed, 1 insertions(+), 15 deletions(-)
diff --git a/lib/dbd/ODBC.rb b/lib/dbd/ODBC.rb
index 2661bf4..c351175 100644
--- a/lib/dbd/ODBC.rb
+++ b/lib/dbd/ODBC.rb
@@ -34,12 +34,6 @@ $:.delete(".") # FIXME oh for the love of pete..
require "odbc"
$: << "."
-begin
- require 'rubygems'
- gem 'dbi'
-rescue LoadError => e
-end
-
require 'dbi'
module DBI
diff --git a/test/ts_dbd.rb b/test/ts_dbd.rb
index fcd301e..29339f3 100644
--- a/test/ts_dbd.rb
+++ b/test/ts_dbd.rb
@@ -1,5 +1,3 @@
-require 'rubygems'
-gem 'test-unit'
# figure out what tests to run
require 'yaml'
require 'test/unit/testsuite'
@@ -96,13 +94,7 @@ if __FILE__ == $0
begin
require 'dbi'
rescue LoadError => e
- begin
- require 'rubygems'
- gem 'dbi'
- require 'dbi'
- rescue LoadError => e
- abort "DBI must already be installed or must come with this package for tests to work."
- end
+ abort "DBI must already be installed or must come with this package for tests to work."
end
Deprecate.set_action(proc { })
--
|
