From bb6ecb0a6ce624a8277df032ab99202c729fcd38 Mon Sep 17 00:00:00 2001 From: Davide D'Agostino Date: Sun, 7 Mar 2010 16:54:54 +0100 Subject: [PATCH] [padrino-gen] Added favicon [padrino-core] Now we use Sinatra 0.9.6 since previous versions on ruby >= 1.8.7-p248 raise a segfault bug --- CHANGES.rdoc | 6 ++++++ Rakefile | 1 + padrino-admin/padrino-admin.gemspec | 2 +- padrino-core/Rakefile | 2 +- padrino-core/padrino-core.gemspec | 8 ++++---- .../lib/padrino-gen/generators/project/public/favicon.ico | 0 padrino-gen/padrino-gen.gemspec | 2 +- padrino-gen/test/helper.rb | 1 + padrino-gen/test/test_project_generator.rb | 1 + padrino-helpers/padrino-helpers.gemspec | 2 +- padrino-mailer/padrino-mailer.gemspec | 2 +- padrino/padrino.gemspec | 2 +- 12 files changed, 19 insertions(+), 10 deletions(-) create mode 100644 padrino-gen/lib/padrino-gen/generators/project/public/favicon.ico diff --git a/CHANGES.rdoc b/CHANGES.rdoc index d6bd9bd7d..26b750d0b 100644 --- a/CHANGES.rdoc +++ b/CHANGES.rdoc @@ -2,6 +2,12 @@ == 0.9.5 (Unreleased) +* Now we use Sinatra 0.9.6 since previous versions on ruby >= 1.8.7-p248 raise a segfault bug +* Refactored executables +* Added strip_tags helper +* Fixed model_attribute_translate helper +* Added favicon +* Prevent bundler gem clashing * Fixed minor SASS support issue for haml generated projects == 0.9.4 diff --git a/Rakefile b/Rakefile index 81b9faf08..a09ca41ad 100644 --- a/Rakefile +++ b/Rakefile @@ -48,6 +48,7 @@ task :clean do %w(doc tmp pkg coverage).each { |dir| FileUtils.rm_rf dir } end end + Dir["**/*.gem"].each { |gem| FileUtils.rm_rf gem } end desc "Clean pkg and other stuff" diff --git a/padrino-admin/padrino-admin.gemspec b/padrino-admin/padrino-admin.gemspec index 4b5c956f8..9d4e8ac78 100644 --- a/padrino-admin/padrino-admin.gemspec +++ b/padrino-admin/padrino-admin.gemspec @@ -9,7 +9,7 @@ Gem::Specification.new do |s| s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"] - s.date = %q{2010-03-03} + s.date = %q{2010-03-07} s.description = %q{Admin View for Padrino applications} s.email = %q{padrinorb@gmail.com} s.extra_rdoc_files = [ diff --git a/padrino-core/Rakefile b/padrino-core/Rakefile index 8c2989077..19edfff6b 100644 --- a/padrino-core/Rakefile +++ b/padrino-core/Rakefile @@ -13,7 +13,7 @@ begin gem.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"] gem.executables = ["padrino"] gem.rubyforge_project = 'padrino-core' - gem.add_runtime_dependency "sinatra", ">= 0.9.4" + gem.add_runtime_dependency "sinatra", ">= 0.9.6" gem.add_runtime_dependency "i18n", ">= 0.3.2" gem.add_runtime_dependency "usher", ">= 0.6.2" gem.add_runtime_dependency "thor", ">= 0.13.0" diff --git a/padrino-core/padrino-core.gemspec b/padrino-core/padrino-core.gemspec index b53071cb6..7ae0ca0d6 100644 --- a/padrino-core/padrino-core.gemspec +++ b/padrino-core/padrino-core.gemspec @@ -9,7 +9,7 @@ Gem::Specification.new do |s| s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"] - s.date = %q{2010-03-03} + s.date = %q{2010-03-07} s.default_executable = %q{padrino} s.description = %q{The Padrino core gem required for use of this framework} s.email = %q{padrinorb@gmail.com} @@ -78,7 +78,7 @@ Gem::Specification.new do |s| s.specification_version = 3 if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then - s.add_runtime_dependency(%q, [">= 0.9.4"]) + s.add_runtime_dependency(%q, [">= 0.9.6"]) s.add_runtime_dependency(%q, [">= 0.3.2"]) s.add_runtime_dependency(%q, [">= 0.6.2"]) s.add_runtime_dependency(%q, [">= 0.13.0"]) @@ -89,7 +89,7 @@ Gem::Specification.new do |s| s.add_development_dependency(%q, [">= 0.5.0"]) s.add_development_dependency(%q, [">= 0.5.1"]) else - s.add_dependency(%q, [">= 0.9.4"]) + s.add_dependency(%q, [">= 0.9.6"]) s.add_dependency(%q, [">= 0.3.2"]) s.add_dependency(%q, [">= 0.6.2"]) s.add_dependency(%q, [">= 0.13.0"]) @@ -101,7 +101,7 @@ Gem::Specification.new do |s| s.add_dependency(%q, [">= 0.5.1"]) end else - s.add_dependency(%q, [">= 0.9.4"]) + s.add_dependency(%q, [">= 0.9.6"]) s.add_dependency(%q, [">= 0.3.2"]) s.add_dependency(%q, [">= 0.6.2"]) s.add_dependency(%q, [">= 0.13.0"]) diff --git a/padrino-gen/lib/padrino-gen/generators/project/public/favicon.ico b/padrino-gen/lib/padrino-gen/generators/project/public/favicon.ico new file mode 100644 index 000000000..e69de29bb diff --git a/padrino-gen/padrino-gen.gemspec b/padrino-gen/padrino-gen.gemspec index 852f87e18..716355f55 100644 --- a/padrino-gen/padrino-gen.gemspec +++ b/padrino-gen/padrino-gen.gemspec @@ -9,7 +9,7 @@ Gem::Specification.new do |s| s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"] - s.date = %q{2010-03-03} + s.date = %q{2010-03-07} s.default_executable = %q{padrino-gen} s.description = %q{Generators for easily creating and building padrino applications from the console} s.email = %q{padrinorb@gmail.com} diff --git a/padrino-gen/test/helper.rb b/padrino-gen/test/helper.rb index a25fa1df5..1b6dabf9c 100644 --- a/padrino-gen/test/helper.rb +++ b/padrino-gen/test/helper.rb @@ -14,6 +14,7 @@ end require 'padrino-gen' +require 'padrino-core/support_lite' Padrino::Generators.load_components! diff --git a/padrino-gen/test/test_project_generator.rb b/padrino-gen/test/test_project_generator.rb index 34e550746..c62c1361e 100644 --- a/padrino-gen/test/test_project_generator.rb +++ b/padrino-gen/test/test_project_generator.rb @@ -16,6 +16,7 @@ def setup assert_file_exists('/tmp/sample_project/app') assert_file_exists('/tmp/sample_project/config/boot.rb') assert_file_exists('/tmp/sample_project/spec/spec_helper.rb') + assert_file_exists('/tmp/sample_project/public/favicon.ico') end should "not create models folder if no orm is chosen" do diff --git a/padrino-helpers/padrino-helpers.gemspec b/padrino-helpers/padrino-helpers.gemspec index 068304faa..88d1adbdf 100644 --- a/padrino-helpers/padrino-helpers.gemspec +++ b/padrino-helpers/padrino-helpers.gemspec @@ -9,7 +9,7 @@ Gem::Specification.new do |s| s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"] - s.date = %q{2010-03-03} + s.date = %q{2010-03-07} s.description = %q{Tag helpers, asset helpers, form helpers, form builders and many more helpers for padrino} s.email = %q{padrinorb@gmail.com} s.extra_rdoc_files = [ diff --git a/padrino-mailer/padrino-mailer.gemspec b/padrino-mailer/padrino-mailer.gemspec index f10c4e138..1ca2057ec 100644 --- a/padrino-mailer/padrino-mailer.gemspec +++ b/padrino-mailer/padrino-mailer.gemspec @@ -9,7 +9,7 @@ Gem::Specification.new do |s| s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"] - s.date = %q{2010-03-03} + s.date = %q{2010-03-07} s.description = %q{Mailer system for padrino allowing easy delivery of application emails} s.email = %q{padrinorb@gmail.com} s.extra_rdoc_files = [ diff --git a/padrino/padrino.gemspec b/padrino/padrino.gemspec index a175965fa..88b047a49 100644 --- a/padrino/padrino.gemspec +++ b/padrino/padrino.gemspec @@ -9,7 +9,7 @@ Gem::Specification.new do |s| s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"] - s.date = %q{2010-03-03} + s.date = %q{2010-03-07} s.description = %q{The Godfather of Sinatra provides a full-stack agnostic framework on top of Sinatra} s.email = %q{padrinorb@gmail.com} s.extra_rdoc_files = [