merb-more 0.9.3 → 0.9.4

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 +77 -18
  2. data/lib/merb-more.rb +2 -0
  3. metadata +50 -14
data/Rakefile CHANGED
@@ -1,23 +1,27 @@
1
1
  ## THESE ARE CRUCIAL
2
2
  module Merb
3
3
  # Set this to the version of merb-core that you are building against/for
4
- VERSION = "0.9.3"
4
+ VERSION = "0.9.4"
5
5
 
6
6
  # Set this to the version of merb-more you plan to release
7
- MORE_VERSION = "0.9.3"
7
+ MORE_VERSION = "0.9.4"
8
8
  end
9
9
 
10
+ GEM_VERSION = Merb::VERSION
11
+
10
12
  require "rake/clean"
11
13
  require "rake/gempackagetask"
14
+ require 'merb-core/tasks/merb_rake_helper'
12
15
  require 'fileutils'
13
16
  include FileUtils
14
17
 
15
18
  gems = %w[
16
19
  merb-action-args merb-assets merb-gen merb-haml
17
- merb-builder merb-mailer merb-parts merb-cache merb-freezer
20
+ merb-builder merb-mailer merb-parts merb-cache merb-freezer merb-slices merb-jquery
18
21
  ]
19
22
 
20
23
  merb_more_spec = Gem::Specification.new do |s|
24
+ s.rubyforge_project = 'merb'
21
25
  s.name = "merb-more"
22
26
  s.version = Merb::MORE_VERSION
23
27
  s.platform = Gem::Platform::RUBY
@@ -34,6 +38,7 @@ merb_more_spec = Gem::Specification.new do |s|
34
38
  end
35
39
 
36
40
  merb_spec = Gem::Specification.new do |s|
41
+ s.rubyforge_project = 'merb'
37
42
  s.name = "merb"
38
43
  s.version = Merb::MORE_VERSION
39
44
  s.platform = Gem::Platform::RUBY
@@ -50,13 +55,6 @@ end
50
55
 
51
56
  CLEAN.include ["**/.*.sw?", "pkg", "lib/*.bundle", "*.gem", "doc/rdoc", ".config", "coverage", "cache", "lib/merb-more.rb"]
52
57
 
53
- windows = (PLATFORM =~ /win32|cygwin/) rescue nil
54
-
55
- SUDO = windows ? "" : "sudo"
56
-
57
- # desc "Installs Merb More."
58
- # task :default => :install
59
-
60
58
  Rake::GemPackageTask.new(merb_more_spec) do |package|
61
59
  package.gem_spec = merb_more_spec
62
60
  end
@@ -66,12 +64,10 @@ Rake::GemPackageTask.new(merb_spec) do |package|
66
64
  end
67
65
 
68
66
  gem_home = ENV['GEM_HOME'] ? "GEM_HOME=#{ENV['GEM_HOME']}" : ""
69
- install_home = ENV['GEM_HOME'] ? "-i #{ENV['GEM_HOME']}" : ""
70
-
71
67
  desc "Install it all"
72
68
  task :install => [:install_gems, :package] do
73
- sh %{#{SUDO} gem install #{install_home} --local pkg/merb-more-#{Merb::MORE_VERSION}.gem --no-update-sources}
74
- sh %{#{SUDO} gem install #{install_home} --local pkg/merb-#{Merb::MORE_VERSION}.gem --no-update-sources}
69
+ sh %{#{sudo} gem install #{install_home} --local pkg/merb-more-#{Merb::MORE_VERSION}.gem --no-update-sources}
70
+ sh %{#{sudo} gem install #{install_home} --local pkg/merb-#{Merb::MORE_VERSION}.gem --no-update-sources}
75
71
  end
76
72
 
77
73
  desc "Build the merb-more gems"
@@ -91,10 +87,18 @@ end
91
87
  desc "Uninstall the merb-more sub-gems"
92
88
  task :uninstall_gems do
93
89
  gems.each do |sub_gem|
94
- sh %{#{SUDO} gem uninstall #{sub_gem}}
90
+ sh %{#{sudo} gem uninstall #{sub_gem}}
95
91
  end
96
92
  end
97
93
 
94
+ desc "Clobber the merb-more sub-gems"
95
+ task :clobber_gems do
96
+ gems.each do |gem|
97
+ Dir.chdir(gem){ sh "rake clobber" }
98
+ end
99
+ end
100
+
101
+
98
102
  task :package => ["lib/merb-more.rb"]
99
103
  desc "Create merb-more.rb"
100
104
  task "lib/merb-more.rb" do
@@ -114,9 +118,64 @@ task :bundle => [:package, :build_gems] do
114
118
  cp "pkg/merb-#{Merb::MORE_VERSION}.gem", "bundle"
115
119
  cp "pkg/merb-more-#{Merb::MORE_VERSION}.gem", "bundle"
116
120
  gems.each do |gem|
117
- File.open("#{gem}/Rakefile") do |rakefile|
118
- rakefile.read.detect {|l| l =~ /^VERSION\s*=\s*"(.*)"$/ }
119
- sh %{cp #{gem}/pkg/#{gem}-#{$1}.gem bundle/}
121
+ sh %{cp #{gem}/pkg/#{gem}-#{Merb::MORE_VERSION}.gem bundle/}
122
+ end
123
+ end
124
+
125
+
126
+ RUBY_FORGE_PROJECT = "merb"
127
+
128
+ GROUP_NAME = "merb"
129
+ PKG_BUILD = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
130
+ PKG_VERSION = GEM_VERSION + PKG_BUILD
131
+
132
+ RELEASE_NAME = "REL #{PKG_VERSION}"
133
+
134
+ namespace :release do
135
+ desc "Publish Merb More release files to RubyForge."
136
+ task :merb_more => [ :package ] do
137
+ require 'rubyforge'
138
+ require 'rake/contrib/rubyforgepublisher'
139
+
140
+ packages = %w( gem tgz zip ).collect{ |ext| "pkg/merb-more-#{PKG_VERSION}.#{ext}" }
141
+
142
+ begin
143
+ sh %{rubyforge login}
144
+ sh %{rubyforge add_release #{RUBY_FORGE_PROJECT} merb-more #{Merb::MORE_VERSION} #{packages.join(' ')}}
145
+ sh %{rubyforge add_file #{RUBY_FORGE_PROJECT} merb-more #{Merb::MORE_VERSION} #{packages.join(' ')}}
146
+ rescue Exception => e
147
+ puts
148
+ puts "Release failed: #{e.message}"
149
+ puts
150
+ puts "Set PKG_BUILD environment variable if you do a subrelease (0.9.4.2008_08_02 when version is 0.9.4)"
151
+ end
152
+ end
153
+
154
+ desc "Publish Merb More gem to RubyForge, one by one."
155
+ task :merb_more_gems => [ :build_gems ] do
156
+ gems.each do |gem|
157
+ Dir.chdir(gem){ sh "rake release" }
158
+ end
159
+ end
160
+
161
+
162
+ desc "Publish Merb release files to RubyForge."
163
+ task :merb => [ :package ] do
164
+ require 'rubyforge'
165
+ require 'rake/contrib/rubyforgepublisher'
166
+
167
+ packages = %w( gem tgz zip ).collect{ |ext| "pkg/merb-#{PKG_VERSION}.#{ext}" }
168
+
169
+ begin
170
+ sh %{rubyforge login}
171
+ sh %{rubyforge add_release #{RUBY_FORGE_PROJECT} merb #{Merb::VERSION} #{packages.join(' ')}}
172
+ sh %{rubyforge add_file #{RUBY_FORGE_PROJECT} merb #{Merb::VERSION} #{packages.join(' ')}}
173
+ rescue Exception => e
174
+ puts
175
+ puts "Release failed: #{e.message}"
176
+ puts
177
+ puts "Set PKG_BUILD environment variable if you do a subrelease (0.9.4.2008_08_02 when version is 0.9.4)"
120
178
  end
121
179
  end
122
180
  end
181
+
data/lib/merb-more.rb CHANGED
@@ -7,3 +7,5 @@ require 'merb-mailer'
7
7
  require 'merb-parts'
8
8
  require 'merb-cache'
9
9
  require 'merb-freezer'
10
+ require 'merb-slices'
11
+ require 'merb-jquery'
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.3
4
+ version: 0.9.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ezra Zygmuntowicz
@@ -9,122 +9,158 @@ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
11
 
12
- date: 2008-05-04 00:00:00 -05:00
12
+ date: 2008-08-13 00:00:00 +03:00
13
13
  default_executable:
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: merb-core
17
+ type: :runtime
17
18
  version_requirement:
18
19
  version_requirements: !ruby/object:Gem::Requirement
19
20
  requirements:
20
21
  - - ">="
21
22
  - !ruby/object:Gem::Version
22
- version: 0.9.3
23
+ version: 0.9.4
23
24
  version:
24
25
  - !ruby/object:Gem::Dependency
25
26
  name: merb-action-args
27
+ type: :runtime
26
28
  version_requirement:
27
29
  version_requirements: !ruby/object:Gem::Requirement
28
30
  requirements:
29
31
  - - ">="
30
32
  - !ruby/object:Gem::Version
31
- version: 0.9.3
33
+ version: 0.9.4
32
34
  - - <=
33
35
  - !ruby/object:Gem::Version
34
36
  version: "1.0"
35
37
  version:
36
38
  - !ruby/object:Gem::Dependency
37
39
  name: merb-assets
40
+ type: :runtime
38
41
  version_requirement:
39
42
  version_requirements: !ruby/object:Gem::Requirement
40
43
  requirements:
41
44
  - - ">="
42
45
  - !ruby/object:Gem::Version
43
- version: 0.9.3
46
+ version: 0.9.4
44
47
  - - <=
45
48
  - !ruby/object:Gem::Version
46
49
  version: "1.0"
47
50
  version:
48
51
  - !ruby/object:Gem::Dependency
49
52
  name: merb-gen
53
+ type: :runtime
50
54
  version_requirement:
51
55
  version_requirements: !ruby/object:Gem::Requirement
52
56
  requirements:
53
57
  - - ">="
54
58
  - !ruby/object:Gem::Version
55
- version: 0.9.3
59
+ version: 0.9.4
56
60
  - - <=
57
61
  - !ruby/object:Gem::Version
58
62
  version: "1.0"
59
63
  version:
60
64
  - !ruby/object:Gem::Dependency
61
65
  name: merb-haml
66
+ type: :runtime
62
67
  version_requirement:
63
68
  version_requirements: !ruby/object:Gem::Requirement
64
69
  requirements:
65
70
  - - ">="
66
71
  - !ruby/object:Gem::Version
67
- version: 0.9.3
72
+ version: 0.9.4
68
73
  - - <=
69
74
  - !ruby/object:Gem::Version
70
75
  version: "1.0"
71
76
  version:
72
77
  - !ruby/object:Gem::Dependency
73
78
  name: merb-builder
79
+ type: :runtime
74
80
  version_requirement:
75
81
  version_requirements: !ruby/object:Gem::Requirement
76
82
  requirements:
77
83
  - - ">="
78
84
  - !ruby/object:Gem::Version
79
- version: 0.9.3
85
+ version: 0.9.4
80
86
  - - <=
81
87
  - !ruby/object:Gem::Version
82
88
  version: "1.0"
83
89
  version:
84
90
  - !ruby/object:Gem::Dependency
85
91
  name: merb-mailer
92
+ type: :runtime
86
93
  version_requirement:
87
94
  version_requirements: !ruby/object:Gem::Requirement
88
95
  requirements:
89
96
  - - ">="
90
97
  - !ruby/object:Gem::Version
91
- version: 0.9.3
98
+ version: 0.9.4
92
99
  - - <=
93
100
  - !ruby/object:Gem::Version
94
101
  version: "1.0"
95
102
  version:
96
103
  - !ruby/object:Gem::Dependency
97
104
  name: merb-parts
105
+ type: :runtime
98
106
  version_requirement:
99
107
  version_requirements: !ruby/object:Gem::Requirement
100
108
  requirements:
101
109
  - - ">="
102
110
  - !ruby/object:Gem::Version
103
- version: 0.9.3
111
+ version: 0.9.4
104
112
  - - <=
105
113
  - !ruby/object:Gem::Version
106
114
  version: "1.0"
107
115
  version:
108
116
  - !ruby/object:Gem::Dependency
109
117
  name: merb-cache
118
+ type: :runtime
110
119
  version_requirement:
111
120
  version_requirements: !ruby/object:Gem::Requirement
112
121
  requirements:
113
122
  - - ">="
114
123
  - !ruby/object:Gem::Version
115
- version: 0.9.3
124
+ version: 0.9.4
116
125
  - - <=
117
126
  - !ruby/object:Gem::Version
118
127
  version: "1.0"
119
128
  version:
120
129
  - !ruby/object:Gem::Dependency
121
130
  name: merb-freezer
131
+ type: :runtime
122
132
  version_requirement:
123
133
  version_requirements: !ruby/object:Gem::Requirement
124
134
  requirements:
125
135
  - - ">="
126
136
  - !ruby/object:Gem::Version
127
- version: 0.9.3
137
+ version: 0.9.4
138
+ - - <=
139
+ - !ruby/object:Gem::Version
140
+ version: "1.0"
141
+ version:
142
+ - !ruby/object:Gem::Dependency
143
+ name: merb-slices
144
+ type: :runtime
145
+ version_requirement:
146
+ version_requirements: !ruby/object:Gem::Requirement
147
+ requirements:
148
+ - - ">="
149
+ - !ruby/object:Gem::Version
150
+ version: 0.9.4
151
+ - - <=
152
+ - !ruby/object:Gem::Version
153
+ version: "1.0"
154
+ version:
155
+ - !ruby/object:Gem::Dependency
156
+ name: merb-jquery
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.4
128
164
  - - <=
129
165
  - !ruby/object:Gem::Version
130
166
  version: "1.0"
@@ -164,8 +200,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
164
200
  version:
165
201
  requirements: []
166
202
 
167
- rubyforge_project:
168
- rubygems_version: 1.0.1
203
+ rubyforge_project: merb
204
+ rubygems_version: 1.2.0
169
205
  signing_key:
170
206
  specification_version: 2
171
207
  summary: (merb - merb-core) == merb-more. The Full Stack. Take what you need; leave what you don't.