merb-more 0.9.13 → 1.0

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 (3) hide show
  1. data/Rakefile +12 -4
  2. data/lib/merb-more.rb +1 -1
  3. metadata +13 -49
data/Rakefile CHANGED
@@ -10,6 +10,7 @@ include FileUtils
10
10
  merb_more_gem_paths = %w[
11
11
  merb-action-args
12
12
  merb-assets
13
+ merb-slices
13
14
  merb-auth
14
15
  merb-cache
15
16
  merb-exceptions
@@ -18,7 +19,6 @@ merb_more_gem_paths = %w[
18
19
  merb-helpers
19
20
  merb-mailer
20
21
  merb-param-protection
21
- merb-slices
22
22
  merb_datamapper
23
23
  ]
24
24
 
@@ -38,9 +38,10 @@ merb_more_spec = Gem::Specification.new do |s|
38
38
  s.summary = "(merb - merb-core) == merb-more. The Full Stack. Take what you need; leave what you don't."
39
39
  s.description = s.summary
40
40
  s.files = %w( LICENSE README Rakefile TODO lib/merb-more.rb )
41
+ s.required_rubygems_version = ">= 1.3.0"
41
42
  s.add_dependency "merb-core", ">= #{Merb::VERSION}"
42
43
  merb_more_gems.each do |gem|
43
- s.add_dependency gem, [">= #{Merb::VERSION}", "<= 1.0"]
44
+ s.add_dependency gem, ">= #{Merb::VERSION}"
44
45
  end
45
46
  end
46
47
 
@@ -62,6 +63,7 @@ namespace :install do
62
63
  merb_more_gems.each do |gem|
63
64
  Merb::RakeHelper.install(gem, :version => Merb::VERSION)
64
65
  end
66
+ Merb::RakeHelper.install("merb", :version => Merb::VERSION)
65
67
  end
66
68
 
67
69
  end
@@ -83,7 +85,13 @@ namespace :uninstall do
83
85
  end
84
86
 
85
87
  desc "Install all gems"
86
- task :install => ['install:core', 'install:more']
88
+ task :install do
89
+ merb_more_gems.each do |gem|
90
+ Merb::RakeHelper.install(gem, :version => Merb::VERSION)
91
+ end
92
+ %x{sudo gem install gems/merb-more-#{Merb::VERSION}.gem}
93
+ %x{sudo gem install gems/merb-#{Merb::VERSION}.gem}
94
+ end
87
95
 
88
96
  desc "Uninstall all gems"
89
97
  task :uninstall => ['uninstall:core', 'uninstall:more']
@@ -175,7 +183,7 @@ namespace :release do
175
183
  require 'rubyforge'
176
184
  require 'rake/contrib/rubyforgepublisher'
177
185
 
178
- packages = %w( gem tgz zip ).collect{ |ext| "pkg/merb-#{PKG_VERSION}.#{ext}" }
186
+ packages = %w( gem tgz zip ).collect{ |ext| "gems/merb-#{PKG_VERSION}.#{ext}" }
179
187
 
180
188
  begin
181
189
  sh %{rubyforge login}
data/lib/merb-more.rb CHANGED
@@ -1,6 +1,7 @@
1
1
  ### AUTOMATICALLY GENERATED. DO NOT EDIT!
2
2
  require 'merb-action-args'
3
3
  require 'merb-assets'
4
+ require 'merb-slices'
4
5
  require 'merb-auth'
5
6
  require 'merb-cache'
6
7
  require 'merb-exceptions'
@@ -8,5 +9,4 @@ require 'merb-haml'
8
9
  require 'merb-helpers'
9
10
  require 'merb-mailer'
10
11
  require 'merb-param-protection'
11
- require 'merb-slices'
12
12
  require 'merb_datamapper'
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: 0.9.13
4
+ version: "1.0"
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-11-03 00:00:00 -08:00
12
+ date: 2008-11-08 00:00:00 -05: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: 0.9.13
23
+ version: "1.0"
24
24
  version:
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: merb-action-args
@@ -29,9 +29,6 @@ dependencies:
29
29
  version_requirements: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - ">="
32
- - !ruby/object:Gem::Version
33
- version: 0.9.13
34
- - - <=
35
32
  - !ruby/object:Gem::Version
36
33
  version: "1.0"
37
34
  version:
@@ -42,126 +39,96 @@ dependencies:
42
39
  version_requirements: !ruby/object:Gem::Requirement
43
40
  requirements:
44
41
  - - ">="
45
- - !ruby/object:Gem::Version
46
- version: 0.9.13
47
- - - <=
48
42
  - !ruby/object:Gem::Version
49
43
  version: "1.0"
50
44
  version:
51
45
  - !ruby/object:Gem::Dependency
52
- name: merb-auth
46
+ name: merb-slices
53
47
  type: :runtime
54
48
  version_requirement:
55
49
  version_requirements: !ruby/object:Gem::Requirement
56
50
  requirements:
57
51
  - - ">="
58
- - !ruby/object:Gem::Version
59
- version: 0.9.13
60
- - - <=
61
52
  - !ruby/object:Gem::Version
62
53
  version: "1.0"
63
54
  version:
64
55
  - !ruby/object:Gem::Dependency
65
- name: merb-cache
56
+ name: merb-auth
66
57
  type: :runtime
67
58
  version_requirement:
68
59
  version_requirements: !ruby/object:Gem::Requirement
69
60
  requirements:
70
61
  - - ">="
71
- - !ruby/object:Gem::Version
72
- version: 0.9.13
73
- - - <=
74
62
  - !ruby/object:Gem::Version
75
63
  version: "1.0"
76
64
  version:
77
65
  - !ruby/object:Gem::Dependency
78
- name: merb-exceptions
66
+ name: merb-cache
79
67
  type: :runtime
80
68
  version_requirement:
81
69
  version_requirements: !ruby/object:Gem::Requirement
82
70
  requirements:
83
71
  - - ">="
84
- - !ruby/object:Gem::Version
85
- version: 0.9.13
86
- - - <=
87
72
  - !ruby/object:Gem::Version
88
73
  version: "1.0"
89
74
  version:
90
75
  - !ruby/object:Gem::Dependency
91
- name: merb-gen
76
+ name: merb-exceptions
92
77
  type: :runtime
93
78
  version_requirement:
94
79
  version_requirements: !ruby/object:Gem::Requirement
95
80
  requirements:
96
81
  - - ">="
97
- - !ruby/object:Gem::Version
98
- version: 0.9.13
99
- - - <=
100
82
  - !ruby/object:Gem::Version
101
83
  version: "1.0"
102
84
  version:
103
85
  - !ruby/object:Gem::Dependency
104
- name: merb-haml
86
+ name: merb-gen
105
87
  type: :runtime
106
88
  version_requirement:
107
89
  version_requirements: !ruby/object:Gem::Requirement
108
90
  requirements:
109
91
  - - ">="
110
- - !ruby/object:Gem::Version
111
- version: 0.9.13
112
- - - <=
113
92
  - !ruby/object:Gem::Version
114
93
  version: "1.0"
115
94
  version:
116
95
  - !ruby/object:Gem::Dependency
117
- name: merb-helpers
96
+ name: merb-haml
118
97
  type: :runtime
119
98
  version_requirement:
120
99
  version_requirements: !ruby/object:Gem::Requirement
121
100
  requirements:
122
101
  - - ">="
123
- - !ruby/object:Gem::Version
124
- version: 0.9.13
125
- - - <=
126
102
  - !ruby/object:Gem::Version
127
103
  version: "1.0"
128
104
  version:
129
105
  - !ruby/object:Gem::Dependency
130
- name: merb-mailer
106
+ name: merb-helpers
131
107
  type: :runtime
132
108
  version_requirement:
133
109
  version_requirements: !ruby/object:Gem::Requirement
134
110
  requirements:
135
111
  - - ">="
136
- - !ruby/object:Gem::Version
137
- version: 0.9.13
138
- - - <=
139
112
  - !ruby/object:Gem::Version
140
113
  version: "1.0"
141
114
  version:
142
115
  - !ruby/object:Gem::Dependency
143
- name: merb-param-protection
116
+ name: merb-mailer
144
117
  type: :runtime
145
118
  version_requirement:
146
119
  version_requirements: !ruby/object:Gem::Requirement
147
120
  requirements:
148
121
  - - ">="
149
- - !ruby/object:Gem::Version
150
- version: 0.9.13
151
- - - <=
152
122
  - !ruby/object:Gem::Version
153
123
  version: "1.0"
154
124
  version:
155
125
  - !ruby/object:Gem::Dependency
156
- name: merb-slices
126
+ name: merb-param-protection
157
127
  type: :runtime
158
128
  version_requirement:
159
129
  version_requirements: !ruby/object:Gem::Requirement
160
130
  requirements:
161
131
  - - ">="
162
- - !ruby/object:Gem::Version
163
- version: 0.9.13
164
- - - <=
165
132
  - !ruby/object:Gem::Version
166
133
  version: "1.0"
167
134
  version:
@@ -172,9 +139,6 @@ dependencies:
172
139
  version_requirements: !ruby/object:Gem::Requirement
173
140
  requirements:
174
141
  - - ">="
175
- - !ruby/object:Gem::Version
176
- version: 0.9.13
177
- - - <=
178
142
  - !ruby/object:Gem::Version
179
143
  version: "1.0"
180
144
  version:
@@ -209,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
209
173
  requirements:
210
174
  - - ">="
211
175
  - !ruby/object:Gem::Version
212
- version: "0"
176
+ version: 1.3.0
213
177
  version:
214
178
  requirements: []
215
179