CHANGELOG README README.textile bin/garlic lib/garlic/generator.rb lib/garlic/runner.rb lib/garlic/shell.rb templates/default.rb templates/rspec.rb templates/shoulda.rb @@ -2,4 +2,4 @@ work/* repos/* *.tmproj -garlic-*.gem \ No newline at end of file +garlic-*.gem .gitignore @@ -9,21 +9,21 @@ $LOAD_PATH.unshift File.dirname(__FILE__) + '/lib' require 'garlic' spec = Gem::Specification.new do |s| - s.name = "garlic" - s.version = Garlic::Version::String - s.summary = "Lightweight set of rake tasks to help with CI." - s.description = "Lightweight set of rake tasks to help with CI." - s.author = "Ian White" - s.email = "ian.w.white@gmail.com" - s.homepage = "http://github.com/ianwhite/garlic/tree" - s.has_rdoc = false - s.test_files = FileList["spec/**/*_spec.rb"] - s.files = FileList[ - "lib/**/*.rb", - "MIT-LICENSE", - "README.rdoc", - "TODO" + s.name = "garlic" + s.version = Garlic::Version::String + s.summary = "Lightweight set of rake tasks to help with CI." + s.description = "Lightweight set of rake tasks to help with CI." + s.author = "Ian White" + s.email = "ian.w.white@gmail.com" + s.homepage = "http://github.com/ianwhite/garlic/tree" + s.has_rdoc = true + s.rdoc_options << "--title" << "Garlic" << "--line-numbers" + s.test_files = FileList["spec/**/*_spec.rb"] + s.files = FileList[ + "lib/**/*.rb", "templates/*.rb", + "MIT-LICENSE", "README.textile", "TODO", "CHANGELOG" ] + s.executables = ["garlic"] end Rake::GemPackageTask.new(spec) do |p| Rakefile @@ -1,2 +1 @@ -* Make garlic a gem - and remove the need to clone the garlic repo each time * rewrite using grit? (research: is grit the defacto standard for ruby controlling git?) \ No newline at end of file TODO @@ -1,18 +1,16 @@ -# -*- encoding: utf-8 -*- - Gem::Specification.new do |s| s.name = %q{garlic} - s.version = "0.1.1" + s.version = "0.1.2" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Ian White"] - s.date = %q{2008-10-11} + s.date = %q{2008-10-30} s.description = %q{Lightweight set of rake tasks to help with CI.} s.email = %q{ian.w.white@gmail.com} - s.files = ["lib/garlic/configurator.rb", "lib/garlic/garlic.rb", "lib/garlic/repo.rb", "lib/garlic/target.rb", "lib/garlic/tasks.rb", "lib/garlic.rb", "MIT-LICENSE", "README.rdoc", "TODO", "spec/garlic/repo_spec.rb"] + s.files = ["lib/garlic/configurator.rb", "lib/garlic/repo.rb", "lib/garlic/session.rb", "lib/garlic/target.rb", "lib/garlic/tasks.rb", "lib/garlic.rb", "MIT-LICENSE", "README.textile", "TODO", "CHANGELOG", "spec/garlic/repo_spec.rb"] s.homepage = %q{http://github.com/ianwhite/garlic/tree} s.require_paths = ["lib"] - s.rubygems_version = %q{1.3.0} + s.rubygems_version = %q{1.2.0} s.summary = %q{Lightweight set of rake tasks to help with CI.} s.test_files = ["spec/garlic/repo_spec.rb"] @@ -20,7 +18,7 @@ Gem::Specification.new do |s| current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION s.specification_version = 2 - if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then + if current_version >= 3 then else end else garlic.gemspec @@ -1,14 +1,37 @@ -require "garlic/garlic" +require "garlic/runner" require "garlic/configurator" require "garlic/repo" require "garlic/target" +require "garlic/generator" +require "garlic/shell" module Garlic + include Generator + module Version Major = 0 Minor = 1 - Tiny = 1 + Tiny = 2 String = [Major, Minor, Tiny].join('.') end + + # return the current garlic runner + def garlic(config = nil, &block) + @garlic ||= Garlic::Runner.new(self) + load_config(config) + @garlic.configure(&block) if block_given? + @garlic + end + + # load config from + def load_config(config = nil) + unless @garlic_config_file + @garlic_config_file = config || "garlic.rb" + unless File.exists?(@garlic_config_file) + raise "garlic requries a configuration file (can't find #{@garlic_config_file}), try:\n garlic generate [#{available_templates.join('|')}] > garlic.rb" + end + eval File.read(@garlic_config_file) + end + end end \ No newline at end of file lib/garlic.rb @@ -1,4 +1,5 @@ module Garlic + # Configures the garlic runner in a decalarative style class Configurator attr_reader :garlic @@ -7,14 +8,6 @@ module Garlic instance_eval(&block) if block_given? end - def work_path(path) - garlic.work_path = path - end - - def repo_path(path) - garlic.repo_path = path - end - def repo(name, options = {}) options[:name] = name options[:path] ||= "#{garlic.repo_path}/#{name}" @@ -33,6 +26,19 @@ module Garlic garlic.targets << Target.new(garlic, options) end + def respond_to?(method) + super || garlic.respond_to?("#{method}=") + end + + protected + def method_missing(attribute, value) + if garlic.respond_to?("#{attribute}=") + garlic.send("#{attribute}=", value) + else + super + end + end + class BlockParser attr_reader :options, :whitelist lib/garlic/configurator.rb @@ -1,3 +1,5 @@ +require 'shell' + module Garlic class Target attr_reader :garlic, :path, :name, :rails_repo_name, :tree_ish @@ -20,7 +22,7 @@ module Garlic runner.run(&@prepare) if @prepare end - def run + def run(command = nil) runner.run(&garlic.all_targets[:run]) if garlic.all_targets[:run] runner.run(&@run) if @run end @@ -29,9 +31,18 @@ module Garlic read_sha('vendor/rails') end + def shell + unless @shell + @shell = Shell.new + @shell.verbose = false + @shell.cd path + end + @shell + end + private def runner - @runner ||= Runner.new(self) + @runner ||= Target::Runner.new(self) end def read_sha(install_path) lib/garlic/target.rb @@ -1,51 +1,23 @@ -$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__))) -require "garlic" +require File.expand_path(File.join(File.dirname(__FILE__), '..', 'garlic')) -def garlic(&block) - @garlic ||= Garlic::Garlic.new(self) - @garlic.configure(&block) if block_given? - @garlic +include Garlic + +# configure the garlic runner +garlic ENV['CONFIG'] do + verbose ['true', 'yes', '1'].include?(ENV['VERBOSE']) + run_targets ENV['TARGETS'] || ENV['TARGET'] end -desc "Prepare and run specified TARGET(S) (default all)" -task :garlic => ['garlic:prepare_targets', 'garlic:run_targets'] +desc "Run garlic:default (CONFIG=path, TARGETS=list, VERBOSE=true)" +task :garlic do + garlic.default +end namespace :garlic do - desc "Install repos, update repos, check repos, prepare targets, and run CI in them" - task :all => [:install_repos, :update_repos, :check_repos, :prepare_targets, :run_targets] - - desc "Prepare specified TARGET(S) (default all)" - task :prepare_targets do - garlic.prepare - end - - desc "Clean all of the work away, but not the repos" - task :clean do - garlic.clean - end - - desc "Run the CI 'run' task in specified TARGET(S) (default all)" - task :run_targets do - garlic.run - end - - desc "Install required repositories" - task :install_repos do - garlic.install_repos - end - - desc "Update installed repositories" - task :update_repos do - garlic.update_repos - end - - desc "Check that repositories are installed" - task :check_repos do - garlic.check_repos - end - - desc "Reset all repos back to master" - task :reset_repos do - garlic.reset_repos + Garlic::Runner.commands_with_description.each do |command, description| + desc description + task command do + garlic.send command + end end end \ No newline at end of file lib/garlic/tasks.rb README.rdoc lib/garlic/garlic.rb 09af25f8d0b7cabb789a6875f29d1528cdc10ee8 Ian White ian.w.white@gmail.com http://github.com/ianwhite/garlic/commit/ea4d8e6512d2fc40adb8e64057553e8f20586c59 ea4d8e6512d2fc40adb8e64057553e8f20586c59 2008-11-01T03:17:11-07:00 2008-11-01T03:17:11-07:00 0.1.2 - garlic now works as a command line tool 2796360f88b33d3b7c5e28201488b1c41ddf3c8c Ian White ian.w.white@gmail.com