merb 0.9.2 → 0.9.3

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 +10 -6
  2. metadata +13 -4
data/Rakefile CHANGED
@@ -1,10 +1,10 @@
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.2"
4
+ VERSION = "0.9.3"
5
5
 
6
6
  # Set this to the version of merb-more you plan to release
7
- MORE_VERSION = "0.9.2"
7
+ MORE_VERSION = "0.9.3"
8
8
  end
9
9
 
10
10
  require "rake/clean"
@@ -14,7 +14,7 @@ include FileUtils
14
14
 
15
15
  gems = %w[
16
16
  merb-action-args merb-assets merb-gen merb-haml
17
- merb-builder merb-mailer merb-parts merb-cache
17
+ merb-builder merb-mailer merb-parts merb-cache merb-freezer
18
18
  ]
19
19
 
20
20
  merb_more_spec = Gem::Specification.new do |s|
@@ -45,6 +45,7 @@ merb_spec = Gem::Specification.new do |s|
45
45
  s.files = %w( LICENSE README Rakefile TODO )
46
46
  s.add_dependency "merb-core", "= #{Merb::VERSION}"
47
47
  s.add_dependency "merb-more", "= #{Merb::MORE_VERSION}"
48
+ s.add_dependency "mongrel", ">= 1.0.1"
48
49
  end
49
50
 
50
51
  CLEAN.include ["**/.*.sw?", "pkg", "lib/*.bundle", "*.gem", "doc/rdoc", ".config", "coverage", "cache", "lib/merb-more.rb"]
@@ -64,10 +65,13 @@ Rake::GemPackageTask.new(merb_spec) do |package|
64
65
  package.gem_spec = merb_spec
65
66
  end
66
67
 
68
+ gem_home = ENV['GEM_HOME'] ? "GEM_HOME=#{ENV['GEM_HOME']}" : ""
69
+ install_home = ENV['GEM_HOME'] ? "-i #{ENV['GEM_HOME']}" : ""
70
+
67
71
  desc "Install it all"
68
72
  task :install => [:install_gems, :package] do
69
- sh %{#{SUDO} gem install --local pkg/merb-more-#{Merb::MORE_VERSION}.gem --no-update-sources}
70
- sh %{#{SUDO} gem install --local pkg/merb-#{Merb::MORE_VERSION}.gem --no-update-sources}
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}
71
75
  end
72
76
 
73
77
  desc "Build the merb-more gems"
@@ -80,7 +84,7 @@ end
80
84
  desc "Install the merb-more sub-gems"
81
85
  task :install_gems do
82
86
  gems.each do |dir|
83
- Dir.chdir(dir){ sh "#{SUDO} rake install" }
87
+ Dir.chdir(dir){ sh "rake install" }
84
88
  end
85
89
  end
86
90
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: merb
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.2
4
+ version: 0.9.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ezra Zygmuntowicz
@@ -9,7 +9,7 @@ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
11
 
12
- date: 2008-03-24 00:00:00 -05:00
12
+ date: 2008-05-04 00:00:00 -05:00
13
13
  default_executable:
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
@@ -19,7 +19,7 @@ dependencies:
19
19
  requirements:
20
20
  - - "="
21
21
  - !ruby/object:Gem::Version
22
- version: 0.9.2
22
+ version: 0.9.3
23
23
  version:
24
24
  - !ruby/object:Gem::Dependency
25
25
  name: merb-more
@@ -28,7 +28,16 @@ dependencies:
28
28
  requirements:
29
29
  - - "="
30
30
  - !ruby/object:Gem::Version
31
- version: 0.9.2
31
+ version: 0.9.3
32
+ version:
33
+ - !ruby/object:Gem::Dependency
34
+ name: mongrel
35
+ version_requirement:
36
+ version_requirements: !ruby/object:Gem::Requirement
37
+ requirements:
38
+ - - ">="
39
+ - !ruby/object:Gem::Version
40
+ version: 1.0.1
32
41
  version:
33
42
  description: (merb-core + merb-more) == all of Merb
34
43
  email: ez@engineyard.com