merb-more 1.0.1 → 1.0.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 (2) hide show
  1. data/Rakefile +57 -29
  2. metadata +15 -15
data/Rakefile CHANGED
@@ -7,21 +7,44 @@ require File.join(File.dirname(__FILE__), 'merb-core/lib/merb-core/tasks/merb_ra
7
7
  require 'fileutils'
8
8
  include FileUtils
9
9
 
10
- merb_more_gem_paths = %w[
11
- merb-action-args
12
- merb-assets
13
- merb-slices
14
- merb-auth
15
- merb-cache
16
- merb-exceptions
17
- merb-gen
18
- merb-haml
19
- merb-helpers
20
- merb-mailer
21
- merb-param-protection
22
- merb_datamapper
10
+ merb_more_gem_paths = [
11
+ "merb-action-args",
12
+ "merb-assets",
13
+ "merb-slices",
14
+ "merb-auth",
15
+ "merb-cache",
16
+ "merb-exceptions",
17
+ "merb-gen",
18
+ "merb-haml",
19
+ "merb-helpers",
20
+ "merb-mailer",
21
+ "merb-param-protection",
22
+ "merb_datamapper"
23
23
  ]
24
24
 
25
+ merb_release = {
26
+ "merb" =>
27
+ ["merb-action-args",
28
+ "merb-assets",
29
+ "merb-slices",
30
+ "merb-cache",
31
+ "merb-core",
32
+ "merb-exceptions",
33
+ "merb-gen",
34
+ "merb-haml",
35
+ "merb-helpers",
36
+ "merb-mailer",
37
+ "merb-more",
38
+ "merb-param-protection",
39
+ "merb_datamapper"],
40
+ "merb-auth" =>
41
+ ["merb-auth",
42
+ "merb-auth-core",
43
+ "merb-auth-more",
44
+ "merb-auth-slice-password"]
45
+ }
46
+
47
+
25
48
  merb_gem_paths = %w[merb merb-core] + merb_more_gem_paths
26
49
 
27
50
  merb_gems = merb_gem_paths.map { |p| File.basename(p) }
@@ -45,7 +68,7 @@ merb_more_spec = Gem::Specification.new do |s|
45
68
  end
46
69
  end
47
70
 
48
- CLEAN.include ["**/.*.sw?", "pkg", "lib/*.bundle", "*.gem", "doc/rdoc", ".config", "coverage", "cache", "lib/merb-more.rb"]
71
+ CLEAN.include ["**/.*.sw?", "pkg", "lib/*.bundle", "*.gem", "doc/rdoc", ".config", "coverage", "cache", "lib/merb-more.rb", "gems/*"]
49
72
 
50
73
  Rake::GemPackageTask.new(merb_more_spec) do |package|
51
74
  package.gem_spec = merb_more_spec
@@ -133,10 +156,6 @@ end
133
156
  # This task is only for releasing edge gems on edge.merbivore.com
134
157
 
135
158
  task :release_edge => :package do
136
- Dir.chdir("..") do
137
- FileUtils.rm_rf("gems")
138
- FileUtils.mkdir_p("gems")
139
- end
140
159
  FileUtils.cp(Dir["gems/*.gem"], "../gems")
141
160
  Dir.chdir("..") do
142
161
  `gem generate_index`
@@ -183,17 +202,26 @@ namespace :release do
183
202
  require 'rubyforge'
184
203
  require 'rake/contrib/rubyforgepublisher'
185
204
 
186
- packages = %w( gem tgz zip ).collect{ |ext| "gems/merb-#{PKG_VERSION}.#{ext}" }
187
-
188
- begin
189
- sh %{rubyforge login}
190
- sh %{rubyforge add_release #{RUBY_FORGE_PROJECT} merb #{Merb::VERSION} #{packages.join(' ')}}
191
- sh %{rubyforge add_file #{RUBY_FORGE_PROJECT} merb #{Merb::VERSION} #{packages.join(' ')}}
192
- rescue Exception => e
193
- puts
194
- puts "Release failed: #{e.message}"
195
- puts
196
- puts "Set PKG_BUILD environment variable if you do a subrelease (0.9.4.2008_08_02 when version is 0.9.4)"
205
+ sh %{rubyforge login}
206
+ merb_release.each do |project, packages|
207
+ packages.each do |package|
208
+ begin
209
+ puts "Releasing #{project}: #{package}"
210
+ files = %w( gem tgz zip ).collect{ |ext| "gems/#{package}-#{PKG_VERSION}.#{ext}" }
211
+ sh %{rubyforge add_release #{project} #{package} #{Merb::VERSION} #{files.join(" ")}}
212
+ sh %{rubyforge add_files #{project} #{package} #{Merb::VERSION} #{files.join(" ")}}
213
+ rescue Exception => e
214
+ if e.message =~ /You have already released this version/
215
+ puts "You already released #{project}: #{package} #{PKG_VERSION}. Continuing."
216
+ else
217
+ puts
218
+ puts "Release failed: #{e.message}"
219
+ puts
220
+ puts "Set PKG_BUILD environment variable if you do a subrelease (0.9.4.2008_08_02 when version is 0.9.4)"
221
+ exit!
222
+ end
223
+ end
224
+ end
197
225
  end
198
226
  end
199
227
  end
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.1
4
+ version: 1.0.2
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-18 00:00:00 -08:00
12
+ date: 2008-11-24 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.1
23
+ version: 1.0.2
24
24
  version:
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: merb-action-args
@@ -30,7 +30,7 @@ dependencies:
30
30
  requirements:
31
31
  - - ">="
32
32
  - !ruby/object:Gem::Version
33
- version: 1.0.1
33
+ version: 1.0.2
34
34
  version:
35
35
  - !ruby/object:Gem::Dependency
36
36
  name: merb-assets
@@ -40,7 +40,7 @@ dependencies:
40
40
  requirements:
41
41
  - - ">="
42
42
  - !ruby/object:Gem::Version
43
- version: 1.0.1
43
+ version: 1.0.2
44
44
  version:
45
45
  - !ruby/object:Gem::Dependency
46
46
  name: merb-slices
@@ -50,7 +50,7 @@ dependencies:
50
50
  requirements:
51
51
  - - ">="
52
52
  - !ruby/object:Gem::Version
53
- version: 1.0.1
53
+ version: 1.0.2
54
54
  version:
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: merb-auth
@@ -60,7 +60,7 @@ dependencies:
60
60
  requirements:
61
61
  - - ">="
62
62
  - !ruby/object:Gem::Version
63
- version: 1.0.1
63
+ version: 1.0.2
64
64
  version:
65
65
  - !ruby/object:Gem::Dependency
66
66
  name: merb-cache
@@ -70,7 +70,7 @@ dependencies:
70
70
  requirements:
71
71
  - - ">="
72
72
  - !ruby/object:Gem::Version
73
- version: 1.0.1
73
+ version: 1.0.2
74
74
  version:
75
75
  - !ruby/object:Gem::Dependency
76
76
  name: merb-exceptions
@@ -80,7 +80,7 @@ dependencies:
80
80
  requirements:
81
81
  - - ">="
82
82
  - !ruby/object:Gem::Version
83
- version: 1.0.1
83
+ version: 1.0.2
84
84
  version:
85
85
  - !ruby/object:Gem::Dependency
86
86
  name: merb-gen
@@ -90,7 +90,7 @@ dependencies:
90
90
  requirements:
91
91
  - - ">="
92
92
  - !ruby/object:Gem::Version
93
- version: 1.0.1
93
+ version: 1.0.2
94
94
  version:
95
95
  - !ruby/object:Gem::Dependency
96
96
  name: merb-haml
@@ -100,7 +100,7 @@ dependencies:
100
100
  requirements:
101
101
  - - ">="
102
102
  - !ruby/object:Gem::Version
103
- version: 1.0.1
103
+ version: 1.0.2
104
104
  version:
105
105
  - !ruby/object:Gem::Dependency
106
106
  name: merb-helpers
@@ -110,7 +110,7 @@ dependencies:
110
110
  requirements:
111
111
  - - ">="
112
112
  - !ruby/object:Gem::Version
113
- version: 1.0.1
113
+ version: 1.0.2
114
114
  version:
115
115
  - !ruby/object:Gem::Dependency
116
116
  name: merb-mailer
@@ -120,7 +120,7 @@ dependencies:
120
120
  requirements:
121
121
  - - ">="
122
122
  - !ruby/object:Gem::Version
123
- version: 1.0.1
123
+ version: 1.0.2
124
124
  version:
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: merb-param-protection
@@ -130,7 +130,7 @@ dependencies:
130
130
  requirements:
131
131
  - - ">="
132
132
  - !ruby/object:Gem::Version
133
- version: 1.0.1
133
+ version: 1.0.2
134
134
  version:
135
135
  - !ruby/object:Gem::Dependency
136
136
  name: merb_datamapper
@@ -140,7 +140,7 @@ dependencies:
140
140
  requirements:
141
141
  - - ">="
142
142
  - !ruby/object:Gem::Version
143
- version: 1.0.1
143
+ version: 1.0.2
144
144
  version:
145
145
  description: (merb - merb-core) == merb-more. The Full Stack. Take what you need; leave what you don't.
146
146
  email: merb@engineyard.com