Permalink
Browse files

Merge branch 'master' of github.com:padrino/padrino-framework

Conflicts:
	CHANGES.rdoc
  • Loading branch information...
DAddYE committed Aug 31, 2011
2 parents a221564 + ecf9852 commit bf21dd4ef19e8cb2b3d6ecfdc4248fa106818dca
Showing with 9 additions and 9 deletions.
  1. +0 −7 CHANGES.rdoc
  2. +8 −2 Rakefile
  3. +1 −0 padrino/Rakefile
View
@@ -23,13 +23,6 @@
* [FIX #631] reloading futzing with the query parameters [Thanks @chromaticbum]
* [FIX] recognize_path now is compatible with http_router >0.10
-
-
-* Fixes issue with reloader and libxml2 [Thanks farcaller]
-* Fixes cache tests so they don't fail on CI
-* Fix require path in shoulda model test generation [Thanks to futurechimp]
-* Fix require path in model tests to generate correctly if specifing app
-
== 0.10.1
* Added a Mongo store for padrino-cache [Thanks to aliem]
View
@@ -1,3 +1,4 @@
+# rake bump[X.X.X] && rake publish
require 'rubygems' unless defined?(Gem)
require 'fileutils' unless defined?(FileUtils)
require 'rake'
@@ -26,7 +27,7 @@ end
desc "Run 'install' for all projects"
task :install do
GEM_PATHS.each do |dir|
- Dir.chdir(dir) { sh_rake(name) }
+ Dir.chdir(dir) { sh_rake(:install) }
end
end
@@ -60,6 +61,11 @@ task :bump, [:version] do |t, args|
Rake::Task['commit'].invoke("Bumped version to #{args.version.to_s}")
end
+desc "Commits all staged files"
+task :commit, [:message] do |t, args|
+ sh %Q{git commit -a -m "#{args.message}"}
+end
+
desc "Executes a fresh install removing all padrino version and then reinstall all gems"
task :fresh => [:uninstall, :install, :clean]
@@ -87,7 +93,7 @@ task :test do
# Omit the padrino metagem since no tests there
GEM_PATHS[0..-2].each do |g|
# Hardcode the 'cd' into the command and do not use Dir.chdir because this causes random tests to fail
- sh "cd #{File.join(ROOT, g)} && #{Gem.ruby} -S rake test"#, :verbose => true
+ sh "cd #{File.join(ROOT, g)} && #{Gem.ruby} -S rake test"
end
end
View
@@ -6,6 +6,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../gem_rake_helper')
########### CUSTOM TASKS ##########
+gemspec = ::Gem::Specification.load(File.expand_path(File.dirname(__FILE__) + "/padrino.gemspec"))
subgems = [
["padrino-core", "= #{gemspec.version}"],
["padrino-helpers", "= #{gemspec.version}"],

0 comments on commit bf21dd4

Please sign in to comment.