merb-more 1.0.3 → 1.0.4
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/Rakefile +55 -20
- data/lib/merb-more.rb +10 -11
- metadata +25 -35
data/Rakefile
CHANGED
@@ -19,10 +19,36 @@ merb_more_gem_paths = %w[
|
|
19
19
|
merb-helpers
|
20
20
|
merb-mailer
|
21
21
|
merb-param-protection
|
22
|
-
merb_datamapper
|
23
22
|
]
|
24
23
|
|
25
|
-
|
24
|
+
merb_release = {
|
25
|
+
"merb-auth" =>
|
26
|
+
[
|
27
|
+
"merb-auth",
|
28
|
+
"merb-auth-core",
|
29
|
+
"merb-auth-more",
|
30
|
+
"merb-auth-slice-password"
|
31
|
+
],
|
32
|
+
"merb" =>
|
33
|
+
[
|
34
|
+
"merb",
|
35
|
+
"merb-action-args",
|
36
|
+
"merb-assets",
|
37
|
+
"merb-slices",
|
38
|
+
"merb-cache",
|
39
|
+
"merb-core",
|
40
|
+
"merb-exceptions",
|
41
|
+
"merb-gen",
|
42
|
+
"merb-haml",
|
43
|
+
"merb-helpers",
|
44
|
+
"merb-mailer",
|
45
|
+
"merb-more",
|
46
|
+
"merb-param-protection",
|
47
|
+
"merb_datamapper",
|
48
|
+
]
|
49
|
+
}
|
50
|
+
|
51
|
+
merb_gem_paths = %w[merb merb-core merb_datamapper] + merb_more_gem_paths
|
26
52
|
|
27
53
|
merb_gems = merb_gem_paths.map { |p| File.basename(p) }
|
28
54
|
merb_more_gems = merb_more_gem_paths.map { |p| File.basename(p) }
|
@@ -41,7 +67,7 @@ merb_more_spec = Gem::Specification.new do |s|
|
|
41
67
|
s.required_rubygems_version = ">= 1.3.0"
|
42
68
|
s.add_dependency "merb-core", ">= #{Merb::VERSION}"
|
43
69
|
merb_more_gems.each do |gem|
|
44
|
-
s.add_dependency gem, "
|
70
|
+
s.add_dependency gem, "= #{Merb::VERSION}"
|
45
71
|
end
|
46
72
|
end
|
47
73
|
|
@@ -86,11 +112,10 @@ end
|
|
86
112
|
|
87
113
|
desc "Install all gems"
|
88
114
|
task :install do
|
89
|
-
|
115
|
+
merb_gems.each do |gem|
|
90
116
|
Merb::RakeHelper.install(gem, :version => Merb::VERSION)
|
91
117
|
end
|
92
|
-
%x{sudo gem install
|
93
|
-
%x{sudo gem install gems/merb-#{Merb::VERSION}.gem}
|
118
|
+
puts %x{sudo gem install pkg/merb-more-#{Merb::VERSION}.gem}
|
94
119
|
end
|
95
120
|
|
96
121
|
desc "Uninstall all gems"
|
@@ -118,7 +143,7 @@ task "lib/merb-more.rb" do
|
|
118
143
|
file.puts "### AUTOMATICALLY GENERATED. DO NOT EDIT!"
|
119
144
|
merb_more_gems.each do |gem|
|
120
145
|
next if gem == "merb-gen"
|
121
|
-
file.puts "require
|
146
|
+
file.puts "require \"#{gem}\""
|
122
147
|
end
|
123
148
|
end
|
124
149
|
end
|
@@ -177,20 +202,30 @@ namespace :release do
|
|
177
202
|
desc "Publish Merb release files to RubyForge."
|
178
203
|
task :merb => [ :package ] do
|
179
204
|
require 'rubyforge'
|
180
|
-
|
181
|
-
|
182
|
-
|
183
|
-
|
184
|
-
|
185
|
-
|
186
|
-
|
187
|
-
|
188
|
-
|
189
|
-
|
190
|
-
|
191
|
-
|
192
|
-
|
205
|
+
|
206
|
+
r = RubyForge.new
|
207
|
+
r.configure
|
208
|
+
|
209
|
+
puts "\nLogging in...\n\n"
|
210
|
+
r.login
|
211
|
+
|
212
|
+
merb_release.each do |project, packages|
|
213
|
+
packages.each do |package|
|
214
|
+
begin
|
215
|
+
puts "Adding #{project}: #{package}"
|
216
|
+
file = "gems/#{package}-#{PKG_VERSION}.gem"
|
217
|
+
r.add_release project, package, Merb::VERSION, file
|
218
|
+
r.add_file project, package, Merb::VERSION, file
|
219
|
+
rescue Exception => e
|
220
|
+
if e.message =~ /You have already released this version/
|
221
|
+
puts "You already released #{project}: #{package}. Continuing\n\n"
|
222
|
+
else
|
223
|
+
raise e
|
224
|
+
end
|
225
|
+
end
|
226
|
+
end
|
193
227
|
end
|
228
|
+
|
194
229
|
end
|
195
230
|
end
|
196
231
|
|
data/lib/merb-more.rb
CHANGED
@@ -1,12 +1,11 @@
|
|
1
1
|
### AUTOMATICALLY GENERATED. DO NOT EDIT!
|
2
|
-
require
|
3
|
-
require
|
4
|
-
require
|
5
|
-
require
|
6
|
-
require
|
7
|
-
require
|
8
|
-
require
|
9
|
-
require
|
10
|
-
require
|
11
|
-
require
|
12
|
-
require 'merb_datamapper'
|
2
|
+
require "merb-action-args"
|
3
|
+
require "merb-assets"
|
4
|
+
require "merb-slices"
|
5
|
+
require "merb-auth"
|
6
|
+
require "merb-cache"
|
7
|
+
require "merb-exceptions"
|
8
|
+
require "merb-haml"
|
9
|
+
require "merb-helpers"
|
10
|
+
require "merb-mailer"
|
11
|
+
require "merb-param-protection"
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: merb-more
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.0.
|
4
|
+
version: 1.0.4
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Engine Yard
|
@@ -9,7 +9,7 @@ autorequire:
|
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
11
|
|
12
|
-
date: 2008-
|
12
|
+
date: 2008-12-08 00:00:00 -08:00
|
13
13
|
default_executable:
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
@@ -20,7 +20,7 @@ dependencies:
|
|
20
20
|
requirements:
|
21
21
|
- - ">="
|
22
22
|
- !ruby/object:Gem::Version
|
23
|
-
version: 1.0.
|
23
|
+
version: 1.0.4
|
24
24
|
version:
|
25
25
|
- !ruby/object:Gem::Dependency
|
26
26
|
name: merb-action-args
|
@@ -28,9 +28,9 @@ dependencies:
|
|
28
28
|
version_requirement:
|
29
29
|
version_requirements: !ruby/object:Gem::Requirement
|
30
30
|
requirements:
|
31
|
-
- - "
|
31
|
+
- - "="
|
32
32
|
- !ruby/object:Gem::Version
|
33
|
-
version: 1.0.
|
33
|
+
version: 1.0.4
|
34
34
|
version:
|
35
35
|
- !ruby/object:Gem::Dependency
|
36
36
|
name: merb-assets
|
@@ -38,9 +38,9 @@ dependencies:
|
|
38
38
|
version_requirement:
|
39
39
|
version_requirements: !ruby/object:Gem::Requirement
|
40
40
|
requirements:
|
41
|
-
- - "
|
41
|
+
- - "="
|
42
42
|
- !ruby/object:Gem::Version
|
43
|
-
version: 1.0.
|
43
|
+
version: 1.0.4
|
44
44
|
version:
|
45
45
|
- !ruby/object:Gem::Dependency
|
46
46
|
name: merb-slices
|
@@ -48,9 +48,9 @@ dependencies:
|
|
48
48
|
version_requirement:
|
49
49
|
version_requirements: !ruby/object:Gem::Requirement
|
50
50
|
requirements:
|
51
|
-
- - "
|
51
|
+
- - "="
|
52
52
|
- !ruby/object:Gem::Version
|
53
|
-
version: 1.0.
|
53
|
+
version: 1.0.4
|
54
54
|
version:
|
55
55
|
- !ruby/object:Gem::Dependency
|
56
56
|
name: merb-auth
|
@@ -58,9 +58,9 @@ dependencies:
|
|
58
58
|
version_requirement:
|
59
59
|
version_requirements: !ruby/object:Gem::Requirement
|
60
60
|
requirements:
|
61
|
-
- - "
|
61
|
+
- - "="
|
62
62
|
- !ruby/object:Gem::Version
|
63
|
-
version: 1.0.
|
63
|
+
version: 1.0.4
|
64
64
|
version:
|
65
65
|
- !ruby/object:Gem::Dependency
|
66
66
|
name: merb-cache
|
@@ -68,9 +68,9 @@ dependencies:
|
|
68
68
|
version_requirement:
|
69
69
|
version_requirements: !ruby/object:Gem::Requirement
|
70
70
|
requirements:
|
71
|
-
- - "
|
71
|
+
- - "="
|
72
72
|
- !ruby/object:Gem::Version
|
73
|
-
version: 1.0.
|
73
|
+
version: 1.0.4
|
74
74
|
version:
|
75
75
|
- !ruby/object:Gem::Dependency
|
76
76
|
name: merb-exceptions
|
@@ -78,9 +78,9 @@ dependencies:
|
|
78
78
|
version_requirement:
|
79
79
|
version_requirements: !ruby/object:Gem::Requirement
|
80
80
|
requirements:
|
81
|
-
- - "
|
81
|
+
- - "="
|
82
82
|
- !ruby/object:Gem::Version
|
83
|
-
version: 1.0.
|
83
|
+
version: 1.0.4
|
84
84
|
version:
|
85
85
|
- !ruby/object:Gem::Dependency
|
86
86
|
name: merb-gen
|
@@ -88,9 +88,9 @@ dependencies:
|
|
88
88
|
version_requirement:
|
89
89
|
version_requirements: !ruby/object:Gem::Requirement
|
90
90
|
requirements:
|
91
|
-
- - "
|
91
|
+
- - "="
|
92
92
|
- !ruby/object:Gem::Version
|
93
|
-
version: 1.0.
|
93
|
+
version: 1.0.4
|
94
94
|
version:
|
95
95
|
- !ruby/object:Gem::Dependency
|
96
96
|
name: merb-haml
|
@@ -98,9 +98,9 @@ dependencies:
|
|
98
98
|
version_requirement:
|
99
99
|
version_requirements: !ruby/object:Gem::Requirement
|
100
100
|
requirements:
|
101
|
-
- - "
|
101
|
+
- - "="
|
102
102
|
- !ruby/object:Gem::Version
|
103
|
-
version: 1.0.
|
103
|
+
version: 1.0.4
|
104
104
|
version:
|
105
105
|
- !ruby/object:Gem::Dependency
|
106
106
|
name: merb-helpers
|
@@ -108,9 +108,9 @@ dependencies:
|
|
108
108
|
version_requirement:
|
109
109
|
version_requirements: !ruby/object:Gem::Requirement
|
110
110
|
requirements:
|
111
|
-
- - "
|
111
|
+
- - "="
|
112
112
|
- !ruby/object:Gem::Version
|
113
|
-
version: 1.0.
|
113
|
+
version: 1.0.4
|
114
114
|
version:
|
115
115
|
- !ruby/object:Gem::Dependency
|
116
116
|
name: merb-mailer
|
@@ -118,9 +118,9 @@ dependencies:
|
|
118
118
|
version_requirement:
|
119
119
|
version_requirements: !ruby/object:Gem::Requirement
|
120
120
|
requirements:
|
121
|
-
- - "
|
121
|
+
- - "="
|
122
122
|
- !ruby/object:Gem::Version
|
123
|
-
version: 1.0.
|
123
|
+
version: 1.0.4
|
124
124
|
version:
|
125
125
|
- !ruby/object:Gem::Dependency
|
126
126
|
name: merb-param-protection
|
@@ -128,19 +128,9 @@ dependencies:
|
|
128
128
|
version_requirement:
|
129
129
|
version_requirements: !ruby/object:Gem::Requirement
|
130
130
|
requirements:
|
131
|
-
- - "
|
132
|
-
- !ruby/object:Gem::Version
|
133
|
-
version: 1.0.3
|
134
|
-
version:
|
135
|
-
- !ruby/object:Gem::Dependency
|
136
|
-
name: merb_datamapper
|
137
|
-
type: :runtime
|
138
|
-
version_requirement:
|
139
|
-
version_requirements: !ruby/object:Gem::Requirement
|
140
|
-
requirements:
|
141
|
-
- - ">="
|
131
|
+
- - "="
|
142
132
|
- !ruby/object:Gem::Version
|
143
|
-
version: 1.0.
|
133
|
+
version: 1.0.4
|
144
134
|
version:
|
145
135
|
description: (merb - merb-core) == merb-more. The Full Stack. Take what you need; leave what you don't.
|
146
136
|
email: merb@engineyard.com
|