@@ -1,4 +1,5 @@ require 'rubygems' +require "merb-core" require 'rake/gempackagetask' require "extlib" require File.join(File.dirname(__FILE__), '../merb-core/lib/merb-core/tasks/merb_rake_helper') @@ -17,7 +18,7 @@ EMAIL = "ykatz@engineyard.com" GEM_NAME = "merb-action-args" PKG_BUILD = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : '' -GEM_VERSION = (Merb::VERSION rescue "0.9.10") + PKG_BUILD +GEM_VERSION = Merb::VERSION + PKG_BUILD RELEASE_NAME = "REL #{GEM_VERSION}" @@ -35,7 +36,7 @@ spec = Gem::Specification.new do |s| s.author = AUTHOR s.email = EMAIL s.homepage = PROJECT_URL - s.add_dependency('merb-core', '>= 0.9.10') + s.add_dependency('merb-core', ">= #{Merb::VERSION}") s.add_dependency('ruby2ruby', '>= 1.1.9') s.add_dependency('ParseTree', '>= 2.2') s.require_path = 'lib' merb-action-args/Rakefile @@ -19,7 +19,7 @@ GEM_EMAIL = "ez@engineyard.com" GEM_NAME = "merb-assets" PKG_BUILD = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : '' -GEM_VERSION = (Merb::VERSION rescue "0.9.10") + PKG_BUILD +GEM_VERSION = Merb::VERSION + PKG_BUILD RELEASE_NAME = "REL #{GEM_VERSION}" @@ -37,7 +37,7 @@ spec = Gem::Specification.new do |s| s.author = GEM_AUTHOR s.email = GEM_EMAIL s.homepage = PROJECT_URL - s.add_dependency('merb-core', "= #{Merb::VERSION}") + s.add_dependency('merb-core', ">= #{Merb::VERSION}") s.require_path = 'lib' s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec}/**/*") end merb-assets/Rakefile @@ -1,7 +1,5 @@ require File.join(File.dirname(__FILE__), "../merb-core/lib/merb-core/version.rb") -GEM_VERSION = Merb::VERSION -GEM_NAME = "merb-auth" require "rake/clean" require "rake/gempackagetask" require 'rubygems/specification' @@ -88,4 +86,4 @@ task :spec do gems.each do |gem| Dir.chdir(gem) { sh "#{Gem.ruby} -S rake spec" } end -end \ No newline at end of file +end merb-auth/Rakefile @@ -9,7 +9,9 @@ require 'rake/testtask' GEM_NAME = "merb-auth-core" -GEM_VERSION = Merb::VERSION +PKG_BUILD = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : '' +GEM_VERSION = Merb::VERSION + PKG_BUILD + AUTHOR = "Adam French, Daniel Neighman" EMAIL = "has.sox@gmail.com" HOMEPAGE = "http://merbivore.com/" @@ -27,7 +29,7 @@ spec = Gem::Specification.new do |s| s.author = AUTHOR s.email = EMAIL s.homepage = HOMEPAGE - s.add_dependency('merb-core', '~>0.9.9') + s.add_dependency('merb-core', "~> #{Merb::VERSION}") s.add_dependency('extlib') s.require_path = 'lib' s.files = %w(LICENSE README.textile Rakefile TODO) + Dir.glob("{lib,spec}/**/*") merb-auth/merb-auth-core/Rakefile @@ -10,7 +10,9 @@ require 'rake/testtask' require File.join(File.dirname(__FILE__), "../../merb-core/lib/merb-core/version.rb") GEM_NAME = "merb-auth-more" -GEM_VERSION = Merb::VERSION +PKG_BUILD = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : '' +GEM_VERSION = Merb::VERSION + PKG_BUILD + AUTHOR = "Daniel Neighman" EMAIL = "has.sox@gmail.com" HOMEPAGE = "http://merbivore.com/" @@ -28,7 +30,7 @@ spec = Gem::Specification.new do |s| s.author = AUTHOR s.email = EMAIL s.homepage = HOMEPAGE - s.add_dependency("merb-auth-core", "= #{Merb::VERSION}") + s.add_dependency("merb-auth-core", ">= #{Merb::VERSION}") s.require_path = 'lib' s.files = %w(LICENSE README.textile Rakefile TODO) + Dir.glob("{lib,spec}/**/*") merb-auth/merb-auth-more/Rakefile @@ -5,11 +5,12 @@ require 'merb-core' require 'merb-core/tasks/merb' GEM_NAME = "merb-auth-slice-password" -AUTHOR = "Your Name" -EMAIL = "Your Email" +AUTHOR = "Daniel Neighman" +EMAIL = "has.sox@gmail.com" HOMEPAGE = "http://merbivore.com/" -SUMMARY = "Merb Slice that provides ..." -GEM_VERSION = Merb::VERSION +SUMMARY = "Merb Slice that provides UI for password strategy of merb-auth." +PKG_BUILD = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : '' +GEM_VERSION = Merb::VERSION + PKG_BUILD spec = Gem::Specification.new do |s| s.rubyforge_project = 'merb' @@ -23,9 +24,9 @@ spec = Gem::Specification.new do |s| s.author = AUTHOR s.email = EMAIL s.homepage = HOMEPAGE - s.add_dependency('merb-slices', '>= 0.9.9') - s.add_dependency('merb-auth-core', "= #{Merb::VERSION}") - s.add_dependency('merb-auth-more', "= #{Merb::VERSION}") + s.add_dependency('merb-slices', ">= #{Merb::VERSION}") + s.add_dependency('merb-auth-core', ">= #{Merb::VERSION}") + s.add_dependency('merb-auth-more', ">= #{Merb::VERSION}") s.require_path = 'lib' s.files = %w(LICENSE README.textile Rakefile TODO) + Dir.glob("{lib,spec,app,public,stubs}/**/*") end @@ -49,4 +50,4 @@ end require 'spec/rake/spectask' require 'merb-core/test/tasks/spectasks' desc 'Default: run spec examples' -task :default => 'spec' \ No newline at end of file +task :default => 'spec' merb-auth/merb-auth-slice-password/Rakefile @@ -25,7 +25,7 @@ if defined?(Merb::Plugins) # Slice metadata self.description = "MerbAuthSlicePassword is a merb slice that provides basic password based logins" - self.version = "0.9.9" + self.version = "0.9.10" self.author = "Daniel Neighman" # Stub classes loaded hook - runs before LoadClasses BootLoader merb-auth/merb-auth-slice-password/lib/merb-auth-slice-password.rb @@ -1,4 +1,5 @@ require 'rubygems' +require "merb-core" require 'rake/gempackagetask' require "extlib" require 'merb-core/tasks/merb_rake_helper' @@ -17,7 +18,7 @@ GEM_EMAIL = "ben@benburkert.com" GEM_NAME = "merb-cache" PKG_BUILD = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : '' -GEM_VERSION = (Merb::VERSION rescue "0.9.10") + PKG_BUILD +GEM_VERSION = Merb::VERSION + PKG_BUILD RELEASE_NAME = "REL #{GEM_VERSION}" @@ -35,7 +36,7 @@ spec = Gem::Specification.new do |s| s.author = GEM_AUTHOR s.email = GEM_EMAIL s.homepage = PROJECT_URL - s.add_dependency('merb-core', '>= 0.9.10') + s.add_dependency('merb-core', ">= #{Merb::VERSION}") s.require_path = 'lib' s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec}/**/*") end merb-cache/Rakefile @@ -20,7 +20,7 @@ GEM_EMAIL = "andy@new-bamboo.co.uk" GEM_NAME = "merb-exceptions" PKG_BUILD = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : '' -GEM_VERSION = (Merb::VERSION rescue "0.9.9") + PKG_BUILD +GEM_VERSION = Merb::VERSION + PKG_BUILD RELEASE_NAME = "REL #{GEM_VERSION}" @@ -35,7 +35,7 @@ spec = Gem::Specification.new do |s| s.author = GEM_AUTHOR s.email = GEM_EMAIL s.homepage = PROJECT_URL - s.add_dependency('merb-core', '>= 0.9.9') + s.add_dependency('merb-core', ">= #{Merb::VERSION}") s.require_path = 'lib' s.files = %w(LICENSE README.markdown Rakefile) + Dir.glob("{lib,spec}/**/*") end merb-exceptions/Rakefile @@ -40,7 +40,7 @@ spec = Gem::Specification.new do |s| s.bindir = "bin" s.executables = %w( merb-gen ) - s.add_dependency "merb-core", ">= 0.9.10" + s.add_dependency "merb-core", ">= #{Merb::VERSION}" s.add_dependency "templater", ">= 0.3.3" s.require_path = 'lib' merb-gen/Rakefile @@ -90,6 +90,14 @@ module Merb # ==== Layout specific things # + def merb_gems_version + "0.9.10" + end + + def dm_gems_version + "0.9.6" + end + # empty array means all files are considered to be just # files, not templates glob! "app" merb-gen/lib/generators/merb/merb_stack.rb @@ -1,15 +1,15 @@ -dependency "merb-action-args", "0.9.9" # Provides support for querystring arguments to be passed in to controller actions -dependency "merb-assets", "0.9.9" # Provides link_to, asset_path, auto_link, image_tag methods (and lots more) -dependency "merb-cache", "0.9.9" # Provides your application with caching functions -dependency "merb-helpers", "0.9.9" # Provides the form, date/time, and other helpers -dependency "merb-mailer", "0.9.9" # Integrates mail support via Merb Mailer -dependency "merb-slices", "0.9.9" # Provides a mechanism for letting plugins provide controllers, views, etc. to your app -dependency "merb-auth", "0.9.9" # An authentication slice (Merb's equivalent to Rails' restful authentication) -dependency "merb-param-protection", "0.9.9" +dependency "merb-action-args", "<%= merb_gems_version %>" # Provides support for querystring arguments to be passed in to controller actions +dependency "merb-assets", "<%= merb_gems_version %>" # Provides link_to, asset_path, auto_link, image_tag methods (and lots more) +dependency "merb-cache", "<%= merb_gems_version %>" # Provides your application with caching functions +dependency "merb-helpers", "<%= merb_gems_version %>" # Provides the form, date/time, and other helpers +dependency "merb-mailer", "<%= merb_gems_version %>" # Integrates mail support via Merb Mailer +dependency "merb-slices", "<%= merb_gems_version %>" # Provides a mechanism for letting plugins provide controllers, views, etc. to your app +dependency "merb-auth", "<%= merb_gems_version %>" # An authentication slice (Merb's equivalent to Rails' restful authentication) +dependency "merb-param-protection", "<%= merb_gems_version %>" -dependency "dm-core", "0.9.6" # The datamapper ORM -dependency "dm-aggregates", "0.9.6" # Provides your DM models with count, sum, avg, min, max, etc. -dependency "dm-migrations", "0.9.6" # Make incremental changes to your database. -dependency "dm-timestamps", "0.9.6" # Automatically populate created_at, created_on, etc. when those properties are present. -dependency "dm-types", "0.9.6" # Provides additional types, including csv, json, yaml. -dependency "dm-validations", "0.9.6" # Validation framework +dependency "dm-core", "<%= dm_gems_version %>" # The datamapper ORM +dependency "dm-aggregates", "<%= dm_gems_version %>" # Provides your DM models with count, sum, avg, min, max, etc. +dependency "dm-migrations", "<%= dm_gems_version %>" # Make incremental changes to your database. +dependency "dm-timestamps", "<%= dm_gems_version %>" # Automatically populate created_at, created_on, etc. when those properties are present. +dependency "dm-types", "<%= dm_gems_version %>" # Provides additional types, including csv, json, yaml. +dependency "dm-validations", "<%= dm_gems_version %>" # Validation framework merb-gen/lib/generators/templates/application/merb_stack/config/dependencies.rb @@ -37,7 +37,7 @@ spec = Gem::Specification.new do |s| s.author = GEM_AUTHOR s.email = GEM_EMAIL s.homepage = PROJECT_URL - s.add_dependency('merb-core', "= #{Merb::VERSION}") + s.add_dependency('merb-core', ">= #{Merb::VERSION}") s.require_path = 'lib' s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec}/**/*") end merb-helpers/Rakefile @@ -37,7 +37,7 @@ spec = Gem::Specification.new do |s| s.author = GEM_AUTHOR s.email = GEM_EMAIL s.homepage = PROJECT_URL - s.add_dependency('merb-core', '>= 0.9.10') + s.add_dependency('merb-core', ">= #{Merb::VERSION}") s.add_dependency('mailfactory', '>= 1.2.3') s.require_path = 'lib' s.files = %w(LICENSE README.textile Rakefile TODO Generators) + Dir.glob("{lib,spec}/**/*") @@ -77,4 +77,4 @@ Spec::Rake::SpecTask.new('spec') do |t| end desc 'Default: run spec examples' -task :default => 'spec' \ No newline at end of file +task :default => 'spec' merb-mailer/Rakefile @@ -37,7 +37,7 @@ spec = Gem::Specification.new do |s| s.author = GEM_AUTHOR s.email = GEM_EMAIL s.homepage = PROJECT_URL - s.add_dependency('merb-core', '>= 0.9.8') + s.add_dependency('merb-core', ">= #{Merb::VERSION}") s.require_path = 'lib' s.files = %w(LICENSE README Rakefile) + Dir.glob("{lib,specs}/**/*") end @@ -76,4 +76,4 @@ Spec::Rake::SpecTask.new('spec') do |t| end desc 'Default: run spec examples' -task :default => 'spec' \ No newline at end of file +task :default => 'spec' merb-param-protection/Rakefile @@ -37,7 +37,7 @@ spec = Gem::Specification.new do |s| s.author = GEM_AUTHOR s.email = GEM_EMAIL s.homepage = PROJECT_URL - s.add_dependency('merb-core', '>= 0.9.10') + s.add_dependency('merb-core', ">= #{Merb::VERSION}") s.require_path = 'lib' s.files = %w(LICENSE README Rakefile Generators TODO) + Dir.glob("{lib,spec}/**/*") s.bindir = "bin" merb-slices/Rakefile @@ -20,7 +20,7 @@ GEM_EMAIL = "jtoy@rubynow.com" GEM_NAME = "merb_datamapper" PKG_BUILD = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : '' -GEM_VERSION = (Merb::VERSION rescue "0.9.10") + PKG_BUILD +GEM_VERSION = Merb::VERSION + PKG_BUILD RELEASE_NAME = "REL #{GEM_VERSION}" merb_datamapper/Rakefile @@ -1,5 +1,5 @@ module DataMapper module MerbDataMapper - VERSION = "0.9.9" + VERSION = "0.9.10" end end merb_datamapper/lib/merb_datamapper/version.rb merb-auth/merb-auth-core/merb-auth-core.gemspec merb-auth/merb-auth-more/merb-auth-more.gemspec merb-auth/merb-auth-slice-password/merb-auth-slice-password.gemspec merb-core/merb-core.gemspec 8b81364e92fac79009aa2c352c86c099cc00dd35 michael.s.klishin@gmail.com michael.s.klishin@gmail.com http://github.com/wycats/merb/commit/c364cdf3af58f9aca4b608a5d2897067025cb0d2 c364cdf3af58f9aca4b608a5d2897067025cb0d2 2008-10-16T01:34:47-07:00 2008-10-14T11:00:04-07:00 Use Merb::VERSION in Rakefiles. Extract versions in dependencies.rb into methods on the generator. 23786ef2a4147479ecafa735626e4c85727a6aea Carl Lerche carllerche@mac.com