merb 1.0.15 → 1.1.0.pre

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 +55 -104
  2. data/lib/merb.rb +7 -6
  3. metadata +39 -28
data/Rakefile CHANGED
@@ -1,109 +1,60 @@
1
- require File.expand_path(File.join(File.dirname(__FILE__), "..", "rake_helpers"))
1
+ require 'rubygems'
2
+ require 'rake'
3
+
4
+ # Assume a typical dev checkout to fetch the current version information
5
+ require File.expand_path('../../merb-core/lib/merb-core/version', __FILE__)
6
+ require File.expand_path('../../../merb_datamapper/lib/merb_datamapper/version', __FILE__)
7
+
8
+ begin
9
+
10
+ gem 'jeweler', '~> 1.4'
11
+ require 'jeweler'
12
+
13
+ Jeweler::Tasks.new do |gemspec|
14
+
15
+ gemspec.version = Merb::VERSION
16
+
17
+ gemspec.name = "merb"
18
+ gemspec.description = "The Merb stack"
19
+ gemspec.summary = "The Merb stack includes the most common merb plugins plus datamapper"
20
+
21
+ gemspec.authors = [ "The Merb Team" ]
22
+ gemspec.email = "team@merbivore.com"
23
+ gemspec.homepage = "http://merbivore.com/"
24
+
25
+ gemspec.files = %w(LICENSE Rakefile README) + Dir['lib/**/*']
26
+
27
+ # Runtime dependencies
28
+ gemspec.add_dependency "merb-core", "= #{Merb::VERSION}"
29
+ gemspec.add_dependency "merb-action-args", "= #{Merb::VERSION}"
30
+ gemspec.add_dependency "merb-assets", "= #{Merb::VERSION}"
31
+ gemspec.add_dependency "merb-auth", "= #{Merb::VERSION}"
32
+ gemspec.add_dependency "merb-cache", "= #{Merb::VERSION}"
33
+ gemspec.add_dependency "merb-exceptions", "= #{Merb::VERSION}"
34
+ gemspec.add_dependency "merb-gen", "= #{Merb::VERSION}"
35
+ gemspec.add_dependency "merb-haml", "= #{Merb::VERSION}"
36
+ gemspec.add_dependency "merb-helpers", "= #{Merb::VERSION}"
37
+ gemspec.add_dependency "merb-mailer", "= #{Merb::VERSION}"
38
+ gemspec.add_dependency "merb-param-protection", "= #{Merb::VERSION}"
39
+ gemspec.add_dependency "merb-slices", "= #{Merb::VERSION}"
40
+ gemspec.add_dependency "merb_datamapper", "= #{Merb::VERSION}"
41
+ gemspec.add_dependency "do_sqlite3", Merb::DataMapper::DM_VERSION_REQUIREMENT
42
+ gemspec.add_dependency "dm-timestamps", Merb::DataMapper::DM_VERSION_REQUIREMENT
43
+ gemspec.add_dependency "dm-types", Merb::DataMapper::DM_VERSION_REQUIREMENT
44
+ gemspec.add_dependency "dm-aggregates", Merb::DataMapper::DM_VERSION_REQUIREMENT
45
+ gemspec.add_dependency "dm-validations", Merb::DataMapper::DM_VERSION_REQUIREMENT
46
+ gemspec.add_dependency "dm-sweatshop", Merb::DataMapper::DM_VERSION_REQUIREMENT
47
+ gemspec.add_dependency "dm-serializer", Merb::DataMapper::DM_VERSION_REQUIREMENT
48
+ gemspec.add_dependency "dm-constraints", Merb::DataMapper::DM_VERSION_REQUIREMENT
49
+
50
+ # Requirements
51
+ gemspec.requirements << "install the json gem to get faster json parsing"
52
+ gemspec.required_ruby_version = ">= 1.8.6"
2
53
 
3
- NAME = "merb"
4
- AUTHOR = "Merb Team"
5
- EMAIL = "team@merbivore.com"
6
- HOMEPAGE = "http://merbivore.com/"
7
- SUMMARY = "(merb-core + merb-more + DM) == Merb stack"
8
-
9
- # For RubyForge release task
10
- RUBY_FORGE_PROJECT = "merb"
11
- PROJECT_URL = HOMEPAGE
12
- PROJECT_SUMMARY = SUMMARY
13
- PROJECT_DESCRIPTION = SUMMARY
14
-
15
- GEM_AUTHOR = AUTHOR
16
- GEM_EMAIL = EMAIL
17
-
18
- GEM_NAME = NAME
19
- PKG_BUILD = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
20
- GEM_VERSION = Merb::VERSION + PKG_BUILD
21
- DM_VERSION = Merb::DM_VERSION
22
-
23
- RELEASE_NAME = "REL #{GEM_VERSION}"
24
-
25
- gems = [
26
- ["merb-core", "= #{GEM_VERSION}"],
27
- ["merb-action-args", "= #{GEM_VERSION}"],
28
- ["merb-assets", "= #{GEM_VERSION}"],
29
- ["merb-auth", "= #{GEM_VERSION}"],
30
- ["merb-cache", "= #{GEM_VERSION}"],
31
- ["merb-exceptions", "= #{GEM_VERSION}"],
32
- ["merb-gen", "= #{GEM_VERSION}"],
33
- ["merb-haml", "= #{GEM_VERSION}"],
34
- ["merb-helpers", "= #{GEM_VERSION}"],
35
- ["merb-mailer", "= #{GEM_VERSION}"],
36
- ["merb-param-protection", "= #{GEM_VERSION}"],
37
- ["merb-slices", "= #{GEM_VERSION}"],
38
- ["merb_datamapper", "= #{GEM_VERSION}"],
39
- ["do_sqlite3", "~> #{DM_VERSION}"],
40
- ["dm-timestamps", "~> #{DM_VERSION}"],
41
- ["dm-types", "~> #{DM_VERSION}"],
42
- ["dm-aggregates", "~> #{DM_VERSION}"],
43
- ["dm-validations", "~> #{DM_VERSION}"],
44
- ["dm-sweatshop", "~> #{DM_VERSION}"],
45
- ["dm-serializer", "~> #{DM_VERSION}"]
46
- ]
47
-
48
- merb_spec = Gem::Specification.new do |s|
49
- s.rubyforge_project = 'merb'
50
- s.name = NAME
51
- s.version = GEM_VERSION
52
- s.platform = Gem::Platform::RUBY
53
- s.author = AUTHOR
54
- s.email = EMAIL
55
- s.homepage = HOMEPAGE
56
- s.summary = SUMMARY
57
- s.description = SUMMARY
58
- s.files = %w(LICENSE README Rakefile) + Dir.glob("{lib}/**/*")
59
- s.required_rubygems_version = ">= 1.3.0"
60
- gems.each do |gem, version|
61
- s.add_dependency gem, version
62
- end
63
- end
64
-
65
- Rake::GemPackageTask.new(merb_spec) do |package|
66
- package.gem_spec = merb_spec
67
- end
68
-
69
- require "extlib/tasks/release"
70
-
71
- task :package => ["lib/merb.rb"]
72
- desc "Create merb.rb"
73
- task "lib/merb.rb" do
74
- mkdir_p "lib"
75
- File.open("lib/merb.rb","w+") do |file|
76
- file.puts "### AUTOMATICALLY GENERATED. DO NOT EDIT!"
77
- gems.each do |pair|
78
- g, _ = pair
79
- file.puts "require '#{g}'"
80
- end
81
- end
82
- end
83
-
84
- desc "Bundle up all the merb-more gems"
85
- task :bundle => [:package] do
86
- mkdir_p "bundle"
87
- cp "pkg/merb-#{GEM_VERSION}.gem", "bundle"
88
- cp "pkg/merb-more-#{GEM_VERSION}.gem", "bundle"
89
- gems.each do |gem|
90
- sh %{cp #{gem}/pkg/#{gem}-#{Merb::MORE_VERSION}.gem bundle/}
91
54
  end
92
- end
93
55
 
94
- desc "Install the gem"
95
- task :install do
96
- Merb::RakeHelper.install(GEM_NAME, :version => GEM_VERSION)
97
- end
56
+ Jeweler::GemcutterTasks.new
98
57
 
99
- desc "Uninstall the gem"
100
- task :uninstall do
101
- Merb::RakeHelper.uninstall(GEM_NAME, :version => GEM_VERSION)
102
- end
103
-
104
- desc "create a gemspec file"
105
- task :make_spec do
106
- File.open("#{NAME}.gemspec", "w") do |file|
107
- file.puts spec.to_ruby
108
- end
58
+ rescue LoadError
59
+ puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
109
60
  end
data/lib/merb.rb CHANGED
@@ -1,21 +1,22 @@
1
- ### AUTOMATICALLY GENERATED. DO NOT EDIT!
2
1
  require 'merb-core'
3
2
  require 'merb-action-args'
4
3
  require 'merb-assets'
5
- require 'merb-auth'
4
+ require 'merb-slices'
6
5
  require 'merb-cache'
7
- require 'merb-exceptions'
8
- require 'merb-gen'
9
- require 'merb-haml'
10
6
  require 'merb-helpers'
11
7
  require 'merb-mailer'
12
8
  require 'merb-param-protection'
13
- require 'merb-slices'
9
+ require 'merb-exceptions'
10
+ require 'merb-auth'
14
11
  require 'merb_datamapper'
12
+
13
+ require 'dm-core'
15
14
  require 'do_sqlite3'
16
15
  require 'dm-timestamps'
17
16
  require 'dm-types'
18
17
  require 'dm-aggregates'
18
+ require 'dm-migrations'
19
19
  require 'dm-validations'
20
20
  require 'dm-sweatshop'
21
21
  require 'dm-serializer'
22
+ require 'dm-constraints'
metadata CHANGED
@@ -1,15 +1,15 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: merb
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.15
4
+ version: 1.1.0.pre
5
5
  platform: ruby
6
6
  authors:
7
- - Merb Team
7
+ - The Merb Team
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
11
 
12
- date: 2009-11-04 00:00:00 +00:00
12
+ date: 2010-02-20 00:00:00 +00: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.15
23
+ version: 1.1.0.pre
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.15
33
+ version: 1.1.0.pre
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.15
43
+ version: 1.1.0.pre
44
44
  version:
45
45
  - !ruby/object:Gem::Dependency
46
46
  name: merb-auth
@@ -50,7 +50,7 @@ dependencies:
50
50
  requirements:
51
51
  - - "="
52
52
  - !ruby/object:Gem::Version
53
- version: 1.0.15
53
+ version: 1.1.0.pre
54
54
  version:
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: merb-cache
@@ -60,7 +60,7 @@ dependencies:
60
60
  requirements:
61
61
  - - "="
62
62
  - !ruby/object:Gem::Version
63
- version: 1.0.15
63
+ version: 1.1.0.pre
64
64
  version:
65
65
  - !ruby/object:Gem::Dependency
66
66
  name: merb-exceptions
@@ -70,7 +70,7 @@ dependencies:
70
70
  requirements:
71
71
  - - "="
72
72
  - !ruby/object:Gem::Version
73
- version: 1.0.15
73
+ version: 1.1.0.pre
74
74
  version:
75
75
  - !ruby/object:Gem::Dependency
76
76
  name: merb-gen
@@ -80,7 +80,7 @@ dependencies:
80
80
  requirements:
81
81
  - - "="
82
82
  - !ruby/object:Gem::Version
83
- version: 1.0.15
83
+ version: 1.1.0.pre
84
84
  version:
85
85
  - !ruby/object:Gem::Dependency
86
86
  name: merb-haml
@@ -90,7 +90,7 @@ dependencies:
90
90
  requirements:
91
91
  - - "="
92
92
  - !ruby/object:Gem::Version
93
- version: 1.0.15
93
+ version: 1.1.0.pre
94
94
  version:
95
95
  - !ruby/object:Gem::Dependency
96
96
  name: merb-helpers
@@ -100,7 +100,7 @@ dependencies:
100
100
  requirements:
101
101
  - - "="
102
102
  - !ruby/object:Gem::Version
103
- version: 1.0.15
103
+ version: 1.1.0.pre
104
104
  version:
105
105
  - !ruby/object:Gem::Dependency
106
106
  name: merb-mailer
@@ -110,7 +110,7 @@ dependencies:
110
110
  requirements:
111
111
  - - "="
112
112
  - !ruby/object:Gem::Version
113
- version: 1.0.15
113
+ version: 1.1.0.pre
114
114
  version:
115
115
  - !ruby/object:Gem::Dependency
116
116
  name: merb-param-protection
@@ -120,7 +120,7 @@ dependencies:
120
120
  requirements:
121
121
  - - "="
122
122
  - !ruby/object:Gem::Version
123
- version: 1.0.15
123
+ version: 1.1.0.pre
124
124
  version:
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: merb-slices
@@ -130,7 +130,7 @@ dependencies:
130
130
  requirements:
131
131
  - - "="
132
132
  - !ruby/object:Gem::Version
133
- version: 1.0.15
133
+ version: 1.1.0.pre
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.15
143
+ version: 1.1.0.pre
144
144
  version:
145
145
  - !ruby/object:Gem::Dependency
146
146
  name: do_sqlite3
@@ -212,14 +212,25 @@ dependencies:
212
212
  - !ruby/object:Gem::Version
213
213
  version: "0.10"
214
214
  version:
215
- description: (merb-core + merb-more + DM) == Merb stack
215
+ - !ruby/object:Gem::Dependency
216
+ name: dm-constraints
217
+ type: :runtime
218
+ version_requirement:
219
+ version_requirements: !ruby/object:Gem::Requirement
220
+ requirements:
221
+ - - ~>
222
+ - !ruby/object:Gem::Version
223
+ version: "0.10"
224
+ version:
225
+ description: The Merb stack
216
226
  email: team@merbivore.com
217
227
  executables: []
218
228
 
219
229
  extensions: []
220
230
 
221
- extra_rdoc_files: []
222
-
231
+ extra_rdoc_files:
232
+ - LICENSE
233
+ - README
223
234
  files:
224
235
  - LICENSE
225
236
  - README
@@ -230,28 +241,28 @@ homepage: http://merbivore.com/
230
241
  licenses: []
231
242
 
232
243
  post_install_message:
233
- rdoc_options: []
234
-
244
+ rdoc_options:
245
+ - --charset=UTF-8
235
246
  require_paths:
236
247
  - lib
237
248
  required_ruby_version: !ruby/object:Gem::Requirement
238
249
  requirements:
239
250
  - - ">="
240
251
  - !ruby/object:Gem::Version
241
- version: "0"
252
+ version: 1.8.6
242
253
  version:
243
254
  required_rubygems_version: !ruby/object:Gem::Requirement
244
255
  requirements:
245
- - - ">="
256
+ - - ">"
246
257
  - !ruby/object:Gem::Version
247
- version: 1.3.0
258
+ version: 1.3.1
248
259
  version:
249
- requirements: []
250
-
251
- rubyforge_project: merb
260
+ requirements:
261
+ - install the json gem to get faster json parsing
262
+ rubyforge_project:
252
263
  rubygems_version: 1.3.5
253
264
  signing_key:
254
265
  specification_version: 3
255
- summary: (merb-core + merb-more + DM) == Merb stack
266
+ summary: The Merb stack includes the most common merb plugins plus datamapper
256
267
  test_files: []
257
268