merb-more 0.9.8 → 0.9.9

Sign up to get free protection for your applications and to get access to all the features.
Files changed (3) hide show
  1. data/Rakefile +69 -81
  2. data/lib/merb-more.rb +7 -6
  3. metadata +39 -26
data/Rakefile CHANGED
@@ -1,105 +1,103 @@
1
1
  ## THESE ARE CRUCIAL
2
- module Merb
3
- # Set this to the version of merb-core that you are building against/for
4
- VERSION = "0.9.8"
5
-
6
- # Set this to the version of merb-more you plan to release
7
- MORE_VERSION = "0.9.8"
8
- end
9
-
10
- GEM_VERSION = Merb::VERSION
2
+ require File.join(File.dirname(__FILE__), "merb-core/lib/merb-core/version.rb")
11
3
 
12
4
  require "rake/clean"
13
5
  require "rake/gempackagetask"
14
- require 'merb-core/tasks/merb_rake_helper'
6
+ require File.join(File.dirname(__FILE__), 'merb-core/lib/merb-core/tasks/merb_rake_helper')
15
7
  require 'fileutils'
16
8
  include FileUtils
17
9
 
18
- gems = %w[
19
- merb-action-args merb-assets merb-gen merb-haml
20
- merb-builder merb-mailer merb-parts merb-cache merb-slices
21
- merb-jquery merb-helpers
10
+ merb_more_gem_paths = %w[
11
+ merb-action-args
12
+ merb-assets
13
+ merb-auth
14
+ merb-cache
15
+ merb-exceptions
16
+ merb-gen
17
+ merb-haml
18
+ merb-helpers
19
+ merb-mailer
20
+ merb-param-protection
21
+ merb-slices
22
+ merb_datamapper
22
23
  ]
23
24
 
25
+ merb_gem_paths = %w[merb-core] + merb_more_gem_paths
26
+
27
+ merb_gems = merb_gem_paths.map { |p| File.basename(p) }
28
+ merb_more_gems = merb_more_gem_paths.map { |p| File.basename(p) }
29
+
24
30
  merb_more_spec = Gem::Specification.new do |s|
25
- s.rubyforge_project = 'merb'
31
+ s.rubyforge_project = 'merb-more'
26
32
  s.name = "merb-more"
27
- s.version = Merb::MORE_VERSION
33
+ s.version = Merb::VERSION
28
34
  s.platform = Gem::Platform::RUBY
29
- s.author = "Ezra Zygmuntowicz"
30
- s.email = "ez@engineyard.com"
35
+ s.author = "Engine Yard"
36
+ s.email = "merb@engineyard.com"
31
37
  s.homepage = "http://www.merbivore.com"
32
38
  s.summary = "(merb - merb-core) == merb-more. The Full Stack. Take what you need; leave what you don't."
33
39
  s.description = s.summary
34
40
  s.files = %w( LICENSE README Rakefile TODO lib/merb-more.rb )
35
41
  s.add_dependency "merb-core", ">= #{Merb::VERSION}"
36
- gems.each do |gem|
42
+ merb_more_gems.each do |gem|
37
43
  s.add_dependency gem, [">= #{Merb::VERSION}", "<= 1.0"]
38
44
  end
39
45
  end
40
46
 
41
- merb_spec = Gem::Specification.new do |s|
42
- s.rubyforge_project = 'merb'
43
- s.name = "merb"
44
- s.version = Merb::MORE_VERSION
45
- s.platform = Gem::Platform::RUBY
46
- s.author = "Ezra Zygmuntowicz"
47
- s.email = "ez@engineyard.com"
48
- s.homepage = "http://www.merbivore.com"
49
- s.summary = "(merb-core + merb-more) == all of Merb"
50
- s.description = s.summary
51
- s.files = %w( LICENSE README Rakefile TODO )
52
- s.add_dependency "merb-core", "= #{Merb::VERSION}"
53
- s.add_dependency "merb-more", "= #{Merb::MORE_VERSION}"
54
- s.add_dependency "mongrel", ">= 1.0.1"
55
- end
56
-
57
47
  CLEAN.include ["**/.*.sw?", "pkg", "lib/*.bundle", "*.gem", "doc/rdoc", ".config", "coverage", "cache", "lib/merb-more.rb"]
58
48
 
59
49
  Rake::GemPackageTask.new(merb_more_spec) do |package|
60
50
  package.gem_spec = merb_more_spec
61
51
  end
62
52
 
63
- Rake::GemPackageTask.new(merb_spec) do |package|
64
- package.gem_spec = merb_spec
53
+ namespace :install do
54
+
55
+ desc "Install core gem"
56
+ task :core => :clean do
57
+ Merb::RakeHelper.install('merb-core', :version => Merb::VERSION)
58
+ end
59
+
60
+ desc "Install all merb-more gems"
61
+ task :more => :clean do
62
+ merb_more_gems.each do |gem|
63
+ Merb::RakeHelper.install(gem, :version => Merb::VERSION)
64
+ end
65
+ end
66
+
65
67
  end
66
68
 
67
- desc "Install all gems"
68
- task :install do
69
- Merb::RakeHelper.install('merb-more', :version => Merb::MORE_VERSION)
70
- Merb::RakeHelper.install_package("pkg/merb-#{Merb::MORE_VERSION}.gem")
69
+ namespace :uninstall do
70
+
71
+ desc "Uninstall core gem"
72
+ task :core do
73
+ Merb::RakeHelper.uninstall('merb-core', :version => Merb::VERSION)
74
+ end
75
+
76
+ desc "Uninstall all merb-more gems"
77
+ task :more do
78
+ merb_more_gems.each do |gem|
79
+ Merb::RakeHelper.uninstall(gem, :version => Merb::VERSION)
80
+ end
81
+ end
82
+
71
83
  end
72
84
 
85
+ desc "Install all gems"
86
+ task :install => ['install:core', 'install:more']
87
+
73
88
  desc "Uninstall all gems"
74
- task :uninstall => :uninstall_gems do
75
- Merb::RakeHelper.uninstall('merb-more', :version => Merb::MORE_VERSION)
76
- Merb::RakeHelper.uninstall('merb', :version => Merb::MORE_VERSION)
77
- end
89
+ task :uninstall => ['uninstall:core', 'uninstall:more']
78
90
 
79
91
  desc "Build the merb-more gems"
80
92
  task :build_gems do
81
- gems.each do |dir|
93
+ merb_gem_paths.each do |dir|
82
94
  Dir.chdir(dir) { sh "#{Gem.ruby} -S rake package" }
83
95
  end
84
96
  end
85
97
 
86
- desc "Install the merb-more sub-gems"
87
- task :install_gems do
88
- gems.each do |dir|
89
- Dir.chdir(dir) { sh "#{Gem.ruby} -S rake install" }
90
- end
91
- end
92
-
93
- desc "Uninstall the merb-more sub-gems"
94
- task :uninstall_gems do
95
- gems.each do |dir|
96
- Dir.chdir(dir) { sh "#{Gem.ruby} -S rake uninstall" }
97
- end
98
- end
99
-
100
98
  desc "Clobber the merb-more sub-gems"
101
99
  task :clobber_gems do
102
- gems.each do |dir|
100
+ merb_gem_paths.each do |dir|
103
101
  Dir.chdir(dir) { sh "#{Gem.ruby} -S rake clobber" }
104
102
  end
105
103
  end
@@ -109,29 +107,19 @@ desc "Create merb-more.rb"
109
107
  task "lib/merb-more.rb" do
110
108
  mkdir_p "lib"
111
109
  File.open("lib/merb-more.rb","w+") do |file|
112
- file.puts "### AUTOMATICALLY GENERATED. DO NOT EDIT."
113
- gems.each do |gem|
110
+ file.puts "### AUTOMATICALLY GENERATED. DO NOT EDIT!"
111
+ merb_more_gems.each do |gem|
114
112
  next if gem == "merb-gen"
115
113
  file.puts "require '#{gem}'"
116
114
  end
117
115
  end
118
116
  end
119
117
 
120
- desc "Bundle up all the merb-more gems"
121
- task :bundle => [:package, :build_gems] do
122
- mkdir_p "bundle"
123
- cp "pkg/merb-#{Merb::MORE_VERSION}.gem", "bundle"
124
- cp "pkg/merb-more-#{Merb::MORE_VERSION}.gem", "bundle"
125
- gems.each do |gem|
126
- sh %{cp #{gem}/pkg/#{gem}-#{Merb::MORE_VERSION}.gem bundle/}
127
- end
128
- end
129
-
130
118
  RUBY_FORGE_PROJECT = "merb"
131
119
 
132
120
  GROUP_NAME = "merb"
133
121
  PKG_BUILD = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
134
- PKG_VERSION = GEM_VERSION + PKG_BUILD
122
+ PKG_VERSION = Merb::VERSION + PKG_BUILD
135
123
 
136
124
  RELEASE_NAME = "REL #{PKG_VERSION}"
137
125
 
@@ -145,8 +133,8 @@ namespace :release do
145
133
 
146
134
  begin
147
135
  sh %{rubyforge login}
148
- sh %{rubyforge add_release #{RUBY_FORGE_PROJECT} merb-more #{Merb::MORE_VERSION} #{packages.join(' ')}}
149
- sh %{rubyforge add_file #{RUBY_FORGE_PROJECT} merb-more #{Merb::MORE_VERSION} #{packages.join(' ')}}
136
+ sh %{rubyforge add_release #{RUBY_FORGE_PROJECT} merb-more #{Merb::VERSION} #{packages.join(' ')}}
137
+ sh %{rubyforge add_file #{RUBY_FORGE_PROJECT} merb-more #{Merb::VERSION} #{packages.join(' ')}}
150
138
  rescue Exception => e
151
139
  puts
152
140
  puts "Release failed: #{e.message}"
@@ -157,7 +145,7 @@ namespace :release do
157
145
 
158
146
  desc "Publish Merb More gem to RubyForge, one by one."
159
147
  task :merb_more_gems => [ :build_gems ] do
160
- gems.each do |gem|
148
+ (merb_more_gems - ["merb-auth"]).each do |gem|
161
149
  Dir.chdir(gem){ sh "#{Gem.ruby} -S rake release" }
162
150
  end
163
151
  end
@@ -167,12 +155,12 @@ namespace :release do
167
155
  require 'rubyforge'
168
156
  require 'rake/contrib/rubyforgepublisher'
169
157
 
170
- packages = %w( gem tgz zip ).collect{ |ext| "pkg/merb-#{PKG_VERSION}.#{ext}" }
158
+ packages = %w( gem tgz zip ).collect{ |ext| "pkg/merb-more-#{PKG_VERSION}.#{ext}" }
171
159
 
172
160
  begin
173
161
  sh %{rubyforge login}
174
- sh %{rubyforge add_release #{RUBY_FORGE_PROJECT} merb #{Merb::VERSION} #{packages.join(' ')}}
175
- sh %{rubyforge add_file #{RUBY_FORGE_PROJECT} merb #{Merb::VERSION} #{packages.join(' ')}}
162
+ sh %{rubyforge add_release #{RUBY_FORGE_PROJECT} merb-more #{Merb::VERSION} #{packages.join(' ')}}
163
+ sh %{rubyforge add_file #{RUBY_FORGE_PROJECT} merb-more #{Merb::VERSION} #{packages.join(' ')}}
176
164
  rescue Exception => e
177
165
  puts
178
166
  puts "Release failed: #{e.message}"
@@ -184,7 +172,7 @@ end
184
172
 
185
173
  desc "Run spec examples for Merb More gems, one by one."
186
174
  task :spec do
187
- gems.each do |gem|
175
+ merb_gem_paths.each do |gem|
188
176
  Dir.chdir(gem) { sh "#{Gem.ruby} -S rake spec" }
189
177
  end
190
178
  end
data/lib/merb-more.rb CHANGED
@@ -1,11 +1,12 @@
1
- ### AUTOMATICALLY GENERATED. DO NOT EDIT.
1
+ ### AUTOMATICALLY GENERATED. DO NOT EDIT!
2
2
  require 'merb-action-args'
3
3
  require 'merb-assets'
4
+ require 'merb-auth'
5
+ require 'merb-cache'
6
+ require 'merb-exceptions'
4
7
  require 'merb-haml'
5
- require 'merb-builder'
8
+ require 'merb-helpers'
6
9
  require 'merb-mailer'
7
- require 'merb-parts'
8
- require 'merb-cache'
10
+ require 'merb-param-protection'
9
11
  require 'merb-slices'
10
- require 'merb-jquery'
11
- require 'merb-helpers'
12
+ require 'merb_datamapper'
metadata CHANGED
@@ -1,15 +1,15 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: merb-more
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.8
4
+ version: 0.9.9
5
5
  platform: ruby
6
6
  authors:
7
- - Ezra Zygmuntowicz
7
+ - Engine Yard
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
11
 
12
- date: 2008-10-07 00:00:00 +03:00
12
+ date: 2008-10-14 00:00:00 +03: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.8
23
+ version: 0.9.9
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: 0.9.8
33
+ version: 0.9.9
34
34
  - - <=
35
35
  - !ruby/object:Gem::Version
36
36
  version: "1.0"
@@ -43,130 +43,143 @@ dependencies:
43
43
  requirements:
44
44
  - - ">="
45
45
  - !ruby/object:Gem::Version
46
- version: 0.9.8
46
+ version: 0.9.9
47
47
  - - <=
48
48
  - !ruby/object:Gem::Version
49
49
  version: "1.0"
50
50
  version:
51
51
  - !ruby/object:Gem::Dependency
52
- name: merb-gen
52
+ name: merb-auth
53
53
  type: :runtime
54
54
  version_requirement:
55
55
  version_requirements: !ruby/object:Gem::Requirement
56
56
  requirements:
57
57
  - - ">="
58
58
  - !ruby/object:Gem::Version
59
- version: 0.9.8
59
+ version: 0.9.9
60
60
  - - <=
61
61
  - !ruby/object:Gem::Version
62
62
  version: "1.0"
63
63
  version:
64
64
  - !ruby/object:Gem::Dependency
65
- name: merb-haml
65
+ name: merb-cache
66
66
  type: :runtime
67
67
  version_requirement:
68
68
  version_requirements: !ruby/object:Gem::Requirement
69
69
  requirements:
70
70
  - - ">="
71
71
  - !ruby/object:Gem::Version
72
- version: 0.9.8
72
+ version: 0.9.9
73
73
  - - <=
74
74
  - !ruby/object:Gem::Version
75
75
  version: "1.0"
76
76
  version:
77
77
  - !ruby/object:Gem::Dependency
78
- name: merb-builder
78
+ name: merb-exceptions
79
79
  type: :runtime
80
80
  version_requirement:
81
81
  version_requirements: !ruby/object:Gem::Requirement
82
82
  requirements:
83
83
  - - ">="
84
84
  - !ruby/object:Gem::Version
85
- version: 0.9.8
85
+ version: 0.9.9
86
86
  - - <=
87
87
  - !ruby/object:Gem::Version
88
88
  version: "1.0"
89
89
  version:
90
90
  - !ruby/object:Gem::Dependency
91
- name: merb-mailer
91
+ name: merb-gen
92
92
  type: :runtime
93
93
  version_requirement:
94
94
  version_requirements: !ruby/object:Gem::Requirement
95
95
  requirements:
96
96
  - - ">="
97
97
  - !ruby/object:Gem::Version
98
- version: 0.9.8
98
+ version: 0.9.9
99
99
  - - <=
100
100
  - !ruby/object:Gem::Version
101
101
  version: "1.0"
102
102
  version:
103
103
  - !ruby/object:Gem::Dependency
104
- name: merb-parts
104
+ name: merb-haml
105
105
  type: :runtime
106
106
  version_requirement:
107
107
  version_requirements: !ruby/object:Gem::Requirement
108
108
  requirements:
109
109
  - - ">="
110
110
  - !ruby/object:Gem::Version
111
- version: 0.9.8
111
+ version: 0.9.9
112
112
  - - <=
113
113
  - !ruby/object:Gem::Version
114
114
  version: "1.0"
115
115
  version:
116
116
  - !ruby/object:Gem::Dependency
117
- name: merb-cache
117
+ name: merb-helpers
118
118
  type: :runtime
119
119
  version_requirement:
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
121
  requirements:
122
122
  - - ">="
123
123
  - !ruby/object:Gem::Version
124
- version: 0.9.8
124
+ version: 0.9.9
125
125
  - - <=
126
126
  - !ruby/object:Gem::Version
127
127
  version: "1.0"
128
128
  version:
129
129
  - !ruby/object:Gem::Dependency
130
- name: merb-slices
130
+ name: merb-mailer
131
131
  type: :runtime
132
132
  version_requirement:
133
133
  version_requirements: !ruby/object:Gem::Requirement
134
134
  requirements:
135
135
  - - ">="
136
136
  - !ruby/object:Gem::Version
137
- version: 0.9.8
137
+ version: 0.9.9
138
138
  - - <=
139
139
  - !ruby/object:Gem::Version
140
140
  version: "1.0"
141
141
  version:
142
142
  - !ruby/object:Gem::Dependency
143
- name: merb-jquery
143
+ name: merb-param-protection
144
144
  type: :runtime
145
145
  version_requirement:
146
146
  version_requirements: !ruby/object:Gem::Requirement
147
147
  requirements:
148
148
  - - ">="
149
149
  - !ruby/object:Gem::Version
150
- version: 0.9.8
150
+ version: 0.9.9
151
151
  - - <=
152
152
  - !ruby/object:Gem::Version
153
153
  version: "1.0"
154
154
  version:
155
155
  - !ruby/object:Gem::Dependency
156
- name: merb-helpers
156
+ name: merb-slices
157
+ type: :runtime
158
+ version_requirement:
159
+ version_requirements: !ruby/object:Gem::Requirement
160
+ requirements:
161
+ - - ">="
162
+ - !ruby/object:Gem::Version
163
+ version: 0.9.9
164
+ - - <=
165
+ - !ruby/object:Gem::Version
166
+ version: "1.0"
167
+ version:
168
+ - !ruby/object:Gem::Dependency
169
+ name: merb_datamapper
157
170
  type: :runtime
158
171
  version_requirement:
159
172
  version_requirements: !ruby/object:Gem::Requirement
160
173
  requirements:
161
174
  - - ">="
162
175
  - !ruby/object:Gem::Version
163
- version: 0.9.8
176
+ version: 0.9.9
164
177
  - - <=
165
178
  - !ruby/object:Gem::Version
166
179
  version: "1.0"
167
180
  version:
168
181
  description: (merb - merb-core) == merb-more. The Full Stack. Take what you need; leave what you don't.
169
- email: ez@engineyard.com
182
+ email: merb@engineyard.com
170
183
  executables: []
171
184
 
172
185
  extensions: []
@@ -200,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
200
213
  version:
201
214
  requirements: []
202
215
 
203
- rubyforge_project: merb
216
+ rubyforge_project: merb-more
204
217
  rubygems_version: 1.2.0
205
218
  signing_key:
206
219
  specification_version: 2