merb-core 1.1.1 → 1.1.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.
- data/lib/merb-core/test.rb +8 -2
- data/lib/merb-core/version.rb +1 -1
- metadata +22 -8
data/lib/merb-core/test.rb
CHANGED
|
@@ -16,6 +16,12 @@ rescue LoadError => e
|
|
|
16
16
|
end
|
|
17
17
|
|
|
18
18
|
if Merb.test_framework.to_s == "rspec"
|
|
19
|
-
|
|
20
|
-
|
|
19
|
+
begin
|
|
20
|
+
require 'merb-core/test/test_ext/rspec'
|
|
21
|
+
require 'merb-core/test/matchers'
|
|
22
|
+
rescue LoadError
|
|
23
|
+
Merb.logger.warn! "You're using RSpec as a testing framework but you don't have " \
|
|
24
|
+
"the gem installed. To provide full functionality of the test " \
|
|
25
|
+
"helpers you should install it."
|
|
26
|
+
end
|
|
21
27
|
end
|
data/lib/merb-core/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: merb-core
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
hash:
|
|
4
|
+
hash: 23
|
|
5
5
|
prerelease: false
|
|
6
6
|
segments:
|
|
7
7
|
- 1
|
|
8
8
|
- 1
|
|
9
|
-
-
|
|
10
|
-
version: 1.1.
|
|
9
|
+
- 2
|
|
10
|
+
version: 1.1.2
|
|
11
11
|
platform: ruby
|
|
12
12
|
authors:
|
|
13
13
|
- Ezra Zygmuntowicz
|
|
@@ -15,7 +15,7 @@ autorequire:
|
|
|
15
15
|
bindir: bin
|
|
16
16
|
cert_chain: []
|
|
17
17
|
|
|
18
|
-
date: 2010-06-
|
|
18
|
+
date: 2010-06-17 00:00:00 +01:00
|
|
19
19
|
default_executable:
|
|
20
20
|
dependencies:
|
|
21
21
|
- !ruby/object:Gem::Dependency
|
|
@@ -94,9 +94,23 @@ dependencies:
|
|
|
94
94
|
type: :runtime
|
|
95
95
|
version_requirements: *id005
|
|
96
96
|
- !ruby/object:Gem::Dependency
|
|
97
|
-
name:
|
|
97
|
+
name: bundler
|
|
98
98
|
prerelease: false
|
|
99
99
|
requirement: &id006 !ruby/object:Gem::Requirement
|
|
100
|
+
none: false
|
|
101
|
+
requirements:
|
|
102
|
+
- - ">="
|
|
103
|
+
- !ruby/object:Gem::Version
|
|
104
|
+
hash: 3
|
|
105
|
+
segments:
|
|
106
|
+
- 0
|
|
107
|
+
version: "0"
|
|
108
|
+
type: :runtime
|
|
109
|
+
version_requirements: *id006
|
|
110
|
+
- !ruby/object:Gem::Dependency
|
|
111
|
+
name: rspec
|
|
112
|
+
prerelease: false
|
|
113
|
+
requirement: &id007 !ruby/object:Gem::Requirement
|
|
100
114
|
none: false
|
|
101
115
|
requirements:
|
|
102
116
|
- - ">="
|
|
@@ -108,11 +122,11 @@ dependencies:
|
|
|
108
122
|
- 9
|
|
109
123
|
version: 1.2.9
|
|
110
124
|
type: :development
|
|
111
|
-
version_requirements: *
|
|
125
|
+
version_requirements: *id007
|
|
112
126
|
- !ruby/object:Gem::Dependency
|
|
113
127
|
name: webrat
|
|
114
128
|
prerelease: false
|
|
115
|
-
requirement: &
|
|
129
|
+
requirement: &id008 !ruby/object:Gem::Requirement
|
|
116
130
|
none: false
|
|
117
131
|
requirements:
|
|
118
132
|
- - ">="
|
|
@@ -124,7 +138,7 @@ dependencies:
|
|
|
124
138
|
- 1
|
|
125
139
|
version: 0.3.1
|
|
126
140
|
type: :development
|
|
127
|
-
version_requirements: *
|
|
141
|
+
version_requirements: *id008
|
|
128
142
|
description: Merb. Pocket rocket web framework.
|
|
129
143
|
email: ez@engineyard.com
|
|
130
144
|
executables:
|