Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'rails' into rails-2-2-0

  • Loading branch information...
commit df1f6f5e298535114a1704c5591a026c0df6607f 2 parents 36ba9a1 + d0e05d9
@btakita btakita authored
Showing with 35 additions and 16 deletions.
  1. +25 −7 Rakefile
  2. +9 −8 erector.gemspec
  3. +1 −1  lib/erector/version.rb
View
32 Rakefile
@@ -14,30 +14,48 @@ dir = File.dirname(__FILE__)
$: << "#{dir}/lib"
require "erector/version"
+gem_definition = lambda do |s|
+ s.name = "erector"
+ s.summary = "Html Builder library."
+ s.email = "erector-devel@rubyforge.org"
+ s.description = "Html Builder library."
+ specs = Dir.glob("spec/**/*").reject{|file| file =~ %r{^spec/rails_root}}
+ s.files = ["lib/**/*", "README.txt", "VERSION.yml", "bin/erect", specs]
+ s.test_files = specs
+end
+
begin
require 'jeweler'
Jeweler::Tasks.new do |s|
- s.name = "erector"
- s.summary = "Html Builder library."
- s.email = "erector-devel@rubyforge.org"
+ gem_definition.call(s)
s.homepage = "http://erector.rubyforge.org/"
- s.description = "Html Builder library."
s.authors = [
"Alex Chaffee",
"Brian Takita",
"Jeff Dean",
"Jim Kingdon",
]
- specs = Dir.glob("spec/**/*").reject{|file| file =~ %r{^spec/rails_root}}
- s.files = ["lib/**/*", "README.txt", "VERSION.yml", "bin/erect", specs]
- s.test_files = specs
s.add_dependency 'treetop', ">= 1.2.3"
end
rescue LoadError
puts "Jeweler, or one of its dependencies, is not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
end
+
RAILS_PATH = "spec/rails_root/vendor/rails"
+Hoe.new("erector", Erector::VERSION) do |hoe|
+ gem_definition.call(hoe)
+ hoe.developer("Pivotal Labs", "pivotallabsopensource@googlegroups.com")
+ hoe.rdoc_dir = "rdoc"
+ hoe.remote_rdoc_dir = "rdoc"
+
+ # Many of these options are based on what will work with rubyforge and
+ # groups and permissions
+ hoe.rsync_args = "-rlpv --delete --inplace --exclude .svn"
+end
+Hoe::remove_tasks("audit", "check_manifest", "post_blog", "multi", "test", "test_deps", "docs")
+
+EDGE_PATH = "spec/rails_root/vendor/rails_versions/edge"
desc "Default: run tests"
task :default => :spec
View
17 erector.gemspec
@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Alex Chaffee", "Brian Takita", "Jeff Dean", "Jim Kingdon"]
- s.date = %q{2009-04-05}
+ s.date = %q{2009-04-12}
s.default_executable = %q{erect}
s.description = %q{Html Builder library.}
s.email = %q{erector-devel@rubyforge.org}
@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
"lib/erector/rails/extensions/widget.rb",
"lib/erector/rails/extensions/widget/1.2.5/widget.rb",
"lib/erector/rails/extensions/widget/2.2.0/widget.rb",
+ "lib/erector/rails/extensions/widget/helpers.rb",
"lib/erector/rails/supported_rails_versions.rb",
"lib/erector/rails/template_handlers/1.2.5/action_view_template_handler.rb",
"lib/erector/rails/template_handlers/2.0.0/action_view_template_handler.rb",
@@ -64,20 +65,20 @@ Gem::Specification.new do |s|
s.rubygems_version = %q{1.3.1}
s.summary = %q{Html Builder library.}
s.test_files = [
+ "spec/rails_spec_suite.rb",
+ "spec/spec_suite.rb",
"spec/erector",
+ "spec/erector/indentation_spec.rb",
+ "spec/erector/unicode_builder_spec.rb",
"spec/erector/widgets",
"spec/erector/widgets/table_spec.rb",
- "spec/erector/unicode_builder_spec.rb",
"spec/erector/widget_spec.rb",
- "spec/erector/indentation_spec.rb",
- "spec/rails_spec_suite.rb",
- "spec/spec_suite.rb",
- "spec/core_spec_suite.rb",
- "spec/spec_helper.rb",
"spec/erect",
"spec/erect/erected_spec.rb",
+ "spec/erect/rhtml_parser_spec.rb",
"spec/erect/erect_spec.rb",
- "spec/erect/rhtml_parser_spec.rb"
+ "spec/spec_helper.rb",
+ "spec/core_spec_suite.rb"
]
if s.respond_to? :specification_version then
View
2  lib/erector/version.rb
@@ -4,7 +4,7 @@ module Erector
if !Erector.const_defined?(:VERSION)
dir = File.dirname(__FILE__)
version = YAML.load_file(File.expand_path("#{dir}/../../VERSION.yml"))
- VERSION = "#{version['major']}.#{version['minor']}.#{version['patch']}"
+ VERSION = "#{version[:major]}.#{version[:minor]}.#{version[:patch]}"
end
end
Please sign in to comment.
Something went wrong with that request. Please try again.