ianwhite-garlic 0.1.5 → 0.1.6

data/History.txt

@@ -1,3 +1,13 @@
+== 0.1.6 2008-11-27
+
+* 3 minor enhancements
+  * Updated Readme/TODO
+  * Some crufty output is now suppressed/removed
+  * garlic all command cleans the work path
+
+* 1 bugfix
+  * --targets, -t option now actually works
+
 == 0.1.5 2008-11-25
 
 * 4 minor enhancements

data/README.textile

@@ -1,7 +1,7 @@
 h1. garlic: lightweight continuous integration for rails using git
 
 This is not a CI server, use cruisecontrol.rb for that.  This is a simple set
-of rake tasks that let you specify a bunch of rails builds to run against, and
+of commands (or rake tasks) that let you specify a bunch of rails builds to run against, and
 dependencies to install.
 
 This is aimed at testing plugins (or apps) against multiple versions of rails,
@@ -15,10 +15,14 @@ Garlic works by cloning git repos for all your dependencies (so they all must be
 git repos), and then using git to checkout various tags and branches to build
 your app against.
 
+"Here's an example of running a plugin against 3 different rails verisons and 3 different rspec versions":http://gist.github.com/28786
+
 h2. It's still new, and not shiny yet
 
 Please feel free to make it shinier.  I'm successfully using it on most of my plugins, and I test
-with garlic and cucumber.
+with rspec and cucumber.
+
+Check out the "TODO LIST":http://github.com/ianwhite/garlic/tree/master/Todo.txt
 
 h2. Get up and running quickly
 
@@ -89,7 +93,12 @@ Check dis out
   garlic shell  # "Example output":http://gist.github.com/28795
   
 You can pipe any thing into garlic shell and it will execute across all of your garlic targets
-  
+
+h2. Rake tasks
+
+If you prefer to use garlic via rake tasks, then just require 'garlic/tasks' and you'll get a bunch of em.
+Once required, do rake -T to see descriptions.
+
 h2. Lend a hand
 
 This is an early release, so there is plenty of scope for changes and improvement
@@ -103,6 +112,6 @@ h2. Lent a hand
 Thanks very much to:
 
 * Pat Allan
-* Dr Nic Williams
+* Dr Nic Williams (API suggestions)
 
 

data/Todo.txt

@@ -1,4 +1,4 @@
-* add 'gem' dependency - should it freeze the gem?  or use ginger?
+* add 'gem' command - should it freeze the gem in to vendor/gems?
+* BETTER OUTPUT - even less uninteresting cruft in the output please
 * specs!
 * cucumber features!
-* rewrite using grit? (research: is grit the defacto standard for ruby controlling git?)

data/bin/garlic

@@ -23,8 +23,9 @@ OPTIONS:
   --help             -h  You're reading it
   --verbose          -v  Show work
   --config CONFIG    -c  Specify a different location of garlic config
-  --targets TARGETS  -t  Specify subset of targets, e.g. edge,2.1.0 (default all)
-  --backtrace            Show ruby bakctrace on error
+  --backtrace            Show ruby backtrace on error
+  --targets TARGETS  -t  Specify subset of targets comma separated or
+                         regexp part e.g. -t 2-1,2-2
 
 You can generate a sample garlic.rb with
   garlic generate [TEMPLATE [PLUGIN_NAME]] (Available templates: #{available_templates.join(', ')})
@@ -59,10 +60,9 @@ begin
     verbose(@verbose)
     
     # configure the garlic runner
-    garlic @config_file do
-      verbose @verbose
-      run_targets @run_targets
-    end
+    garlic(@config_file) # load up the garlic instance
+    garlic.verbose = @verbose
+    garlic.run_targets = @run_targets
   
     # run the command
     ARGV << 'default' if ARGV.empty?

data/lib/garlic/session.rb

@@ -61,6 +61,7 @@ module Garlic
     define_command :all, "Install and update all repos, prepare and run TARGETs" do
       install_repos
       update_repos
+      clean
       prepare
       run
     end
@@ -94,11 +95,7 @@ module Garlic
     end
     
     define_command :prepare, "Prepare each garlic TARGET" do
-      begin
-        determine_targets.each {|target| target.prepare }
-      ensure
-        repo('rails').checkout('master') # we get rails back to master if something goes wrong
-      end
+      determine_targets.each {|target| target.prepare }
     end
 
     define_command :shell, "Run shell commands from stdin across specified targets" do |*path|
@@ -137,7 +134,7 @@ protected
     end
 
     def determine_targets
-      run_targets ? targets.select{|t| run_targets.include?(t.name)} : targets
+      run_targets ? targets.select{|t| t.name =~ /(?:#{run_targets.join("|")})/i} : targets
     end
   end
 end

data/lib/garlic/target.rb

@@ -58,26 +58,24 @@ module Garlic
         puts "Rails app for #{name} exists"
       else
         puts "Creating rails app for #{name}..."
-        sh "ruby #{rails_repo.path}/railties/bin/rails #{path}", :verbose => false
+        `ruby #{rails_repo.path}/railties/bin/rails #{path}`
       end
-      install_dependency(rails_repo, 'vendor/rails') { sh "rake rails:update" }
+      install_dependency(rails_repo, 'vendor/rails') { `rake rails:update` }
     end
 
     def install_dependency(repo, install_path = ".", options = {}, &block)
       repo = garlic.repo(repo) unless repo.is_a?(Repo)
       tree_ish = Repo.tree_ish(options)
       
-      puts tree_ish
-      
       if options[:clone]
         if Repo.path?(install_path)
           puts "#{install_path} exists, and is a repo"
-          cd(install_path) { sh "git fetch origin" }
+          cd(install_path) { `git fetch origin` }
         else
           puts "cloning #{repo.name} to #{install_path}"
           repo.clone_to(File.join(path, install_path))
         end
-        cd(install_path) { sh "git checkout #{tree_ish || repo.head_sha}" }
+        cd(install_path) { `git checkout #{tree_ish || repo.head_sha}` }
       
       else
         if read_sha(install_path) == repo.head_sha

data/lib/garlic.rb

@@ -11,7 +11,7 @@ module Garlic
   module Version
     Major = 0
     Minor = 1
-    Tiny  = 5
+    Tiny  = 6
     
     String = [Major, Minor, Tiny].join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ianwhite-garlic
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors: 
 - Ian White
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-25 00:00:00 -08:00
+date: 2008-11-27 00:00:00 -08:00
 default_executable: garlic
 dependencies: []