@@ -11,7 +11,7 @@ Gem::Specification.new do |s| s.description = %q{Set of commands/rake-tasks for CI against multiple version of rails/deps.} s.email = %q{ian.w.white@gmail.com} s.executables = ["garlic"] - s.files = ["lib/garlic/configurator.rb", "lib/garlic/generator.rb", "lib/garlic/repo.rb", "lib/garlic/session.rb", "lib/garlic/shell.rb", "lib/garlic/target.rb", "lib/garlic/tasks.rb", "lib/garlic.rb", "lib/tabtab_definitions/garlic.rb", "templates/default.rb", "templates/rspec.rb", "templates/shoulda.rb", "MIT-LICENSE", "README.textile", "TODO", "CHANGELOG", "spec/garlic/repo_spec.rb", "bin/garlic"] + s.files = ["lib/garlic/configurator.rb", "lib/garlic/generator.rb", "lib/garlic/repo.rb", "lib/garlic/session.rb", "lib/garlic/shell.rb", "lib/garlic/target.rb", "lib/garlic/tasks.rb", "lib/garlic.rb", "lib/tabtab_definitions/garlic.rb", "templates/default.rb", "templates/rspec.rb", "templates/shoulda.rb", "License.txt", "README.textile", "Todo.txt", "History.txt", "spec/garlic/repo_spec.rb", "bin/garlic"] s.has_rdoc = true s.homepage = %q{http://github.com/ianwhite/garlic/tree} s.rdoc_options = ["--title", "Garlic", "--line-numbers"] garlic.gemspec @@ -16,7 +16,7 @@ module Garlic def target(name, options = {}, &block) options[:name] = name - options[:path] = "#{garlic.work_path}/#{name}" + options[:path] = "#{garlic.work_path}/#{name_to_path(name)}" BlockParser.new(options, [:prepare, :run], &block) if block_given? garlic.targets << Target.new(garlic, options) end @@ -26,6 +26,10 @@ module Garlic end protected + def name_to_path(name) + name.gsub(/[^\w\d_.-]/,'_').downcase + end + def method_missing(attribute, value) if garlic.respond_to?("#{attribute}=") garlic.send("#{attribute}=", value) lib/garlic/configurator.rb @@ -18,9 +18,9 @@ module Garlic protected def copy_templates - mkdir_p TEMPLATES_PATH + mkdir_p TEMPLATES_PATH, :verbose => false Dir[File.join(File.dirname(__FILE__), '../../templates/*.rb')].each do |file| - cp file, File.join(TEMPLATES_PATH, File.basename(file)) + cp file, File.join(TEMPLATES_PATH, File.basename(file)), :verbose => false end end end lib/garlic/generator.rb @@ -6,7 +6,7 @@ module Garlic def initialize(garlic, options = {}) @garlic = garlic - @tree_ish = Repo.tree_ish(options) || 'master' + @tree_ish = Repo.tree_ish(options) || 'origin/master' @rails_repo_name = options[:rails] || 'rails' @path = options[:path] or raise ArgumentError, "Target requires a :path" @path = File.expand_path(@path) lib/garlic/target.rb @@ -6,6 +6,6 @@ TabTab::Definition.register('garlic', :import => '--help') do |g| end g.command :generate do - `ls ~/.garlic/templates`.split + `ls ~/.garlic/templates`.split.map{|t| t.sub('.rb','')} end end \ No newline at end of file lib/tabtab_definitions/garlic.rb @@ -11,7 +11,7 @@ garlic do ['origin/master', 'origin/2-2-stable', 'origin/2-1-stable', 'origin/2-0-stable'].each do |rails| # declare how to prepare, and run each CI target - target "Rails: #{rails}", :tree_ish => rails do + target "Rails: \#{rails}", :tree_ish => rails do prepare do plugin "#{plugin}", :clone => true # so we can work in targets end templates/default.rb @@ -13,7 +13,7 @@ garlic do ['origin/master', 'origin/2-2-stable', 'origin/2-1-stable', 'origin/2-0-stable'].each do |rails| # declare how to prepare, and run each CI target - target "Rails: #{rails}", :tree_ish => rails do + target "Rails: \#{rails}", :tree_ish => rails do prepare do plugin "#{plugin}", :clone => true # so we can work in targets plugin "rspec" templates/rspec.rb @@ -12,7 +12,7 @@ garlic do ['origin/master', 'origin/2-2-stable', 'origin/2-1-stable', 'origin/2-0-stable'].each do |rails| # declare how to prepare, and run each CI target - target "Rails: #{rails}", :tree_ish => rails do + target "Rails: \#{rails}", :tree_ish => rails do prepare do plugin "#{plugin}", :clone => true # so we can work in targets plugin "shoulda" templates/shoulda.rb e252e31e5c86fe83897de8ddd899a7a83eadf00d Ian White ian.w.white@gmail.com http://github.com/ianwhite/garlic/commit/a76d7c4c50634fd1b8a60775713bd0d75e1b5374 a76d7c4c50634fd1b8a60775713bd0d75e1b5374 2008-11-24T21:52:21-08:00 2008-11-24T21:52:21-08:00 0.1.5 - the 'use ruby duh' release be655a2eb8db7195e589639bd731d1316307b35b Ian White ian.w.white@gmail.com