ianwhite-garlic 0.1.4 → 0.1.5

data/History.txt

@@ -0,0 +1,28 @@
+== 0.1.5 2008-11-25
+
+* 4 minor enhancements
+  * Removed 'all_targets' - just use ruby to DRY up garlic.rb
+  * Changed templates wrt above
+  * Better tabtab completions
+  * Updated TODO
+
+== 0.1.4 2008-11-20
+
+* 1 minor enhancement
+  * Added tabtab definitions that are in the right place
+
+== 0.1.3 2008-11-20
+
+* 1 minor enhancement
+  * Added tabtab definitions
+
+== 0.1.2
+
+* 2 major enhancements
+  * garlic CLI
+  * repos are now stored in ~/.garlic/repos (and this shared across multiple garlic sessions), work is in ./.garlic
+
+== 0.1.1
+
+* 1 major enhancement:
+  * freelancing-god added gem goodness

data/README.textile

@@ -15,6 +15,11 @@ 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.
 
+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.
+
 h2. Get up and running quickly
 
 You have a plugin and you want it tested against different versions of rails?
@@ -81,113 +86,9 @@ h2. Running Shell commands across multiple targets
 
 Check dis out
 
-  garlic shell  # "Example output":http://gist.github.com/21496
-  
----
-
-The following still needs to be updated for the new gem/cmd-line version
-
-h2. Example workflow
-
-Let's say I'm patching resources_controller.
-
-First I grab it, and set up garlic
-  
-  git clone git://github.com/ianwhite/resources_controller.git
-  cd resources_controller
-  rake get_garlic
-  cp garlic_example.rb garlic.rb
-  # I could now edit garlic.rb to point the repos at my local copies, for speed
-  
-Now, I download and run the CI suite
-  
-  rake garlic:all
-
-Now, I make some changes
-
-  git checkout -b my_change
-  # ... commit some changes into 'my_change'
-  rake garlic
-  # ... everything is fine, so I can merge these into master, or send a pull request
-
-h3. How do I run the specs on uncommitted code?
-
-The best way is to make the changes in one of the 'work' targets.  For example:
-
-  # after running rake garlic:all
-  cd garlic/work/edge/vendor/plugins/resources_controller
-  # ... make changes without committing
-  rake spec
-  # ... it passes, so commit
-  git commit -m "My great change"
-  
-Now you can push these changes back upstream to your local 'master' repo
-
-  git push origin my_changes # or you could push to master branch or whatever
+  garlic shell  # "Example output":http://gist.github.com/28795
   
-Then cd back up there, and run rake garlic to verify your changes against the other
-targets.  If these all pass, you can push, or send a pull request
-
-h2.How to add garlic to your repo (example: rails plugin)
-
-h4. 1. require the garlic tasks into your own Rakefile
-
-  # rescue this just in case the plugin user doesn't have garlic
-  begin
-    require 'garlic'
-  rescue LoadError
-  end
-
-h4. 2. add a garlic.rb
-
-An example garlic.rb:
-
-  garlic do
-    # repos
-    repo 'rails', :url => 'git://github.com/rails/rails'
-    repo 'rspec', :url => 'git://github.com/dchelimsky/rspec'
-    repo 'rspec-rails', :url => 'git://github.com/dchelimsky/rspec-rails'
-    repo 'resources_controller', :path => '.'
-
-    # targets
-    target 'edge'
-    target '2.0-stable', :branch => 'origin/2-0-stable'
-    target '2.0.2', :tag => 'v2.0.2'
-
-    all_targets do
-      prepare do
-        plugin 'resources_controller', :clone => true
-        plugin 'rspec'
-        plugin 'rspec-rails' do
-          sh "script/generate rspec -f"
-        end
-      end
-
-      run do
-        cd "vendor/plugins/resources_controller"
-          sh "rake spec:rcov:verify"
-        end
-      end
-    end
-  end
-  
-h4. 3. ignore the garlic artefacts
-
-Example .gitignore
-
-  .garlic_work
-  
-h4. 4. Run it
-
-  rake garlic:all
-  
-And to run it again, once you've made changes
-
-  rake garlic
-  
-To make sure you're running against the latest repos:
-
-  rake garlic:update_repos
+You can pipe any thing into garlic shell and it will execute across all of your garlic targets
   
 h2. Lend a hand
 
@@ -202,5 +103,6 @@ h2. Lent a hand
 Thanks very much to:
 
 * Pat Allan
+* Dr Nic Williams
 
 

data/Todo.txt

@@ -0,0 +1,4 @@
+* add 'gem' dependency - should it freeze the gem?  or use ginger?
+* specs!
+* cucumber features!
+* rewrite using grit? (research: is grit the defacto standard for ruby controlling git?)

data/lib/garlic.rb

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

data/lib/garlic/configurator.rb

@@ -13,15 +13,10 @@ module Garlic
       options[:path] ||= "#{garlic.repo_path}/#{name}"
       garlic.repos << Repo.new(options)
     end
-
-    def all_targets(options = {}, &block)
-      BlockParser.new(options, [:prepare, :run], &block) if block_given?
-      garlic.all_targets = options
-    end
     
     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
@@ -31,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)

data/lib/garlic/generator.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

data/lib/garlic/session.rb

@@ -2,13 +2,12 @@ module Garlic
   # this class runs the top level garlic commands
   class Session
     attr_reader :actor, :run_targets
-    attr_accessor :repos, :targets, :all_targets, :repo_path, :work_path, :verbose
+    attr_accessor :repos, :targets, :repo_path, :work_path, :verbose
 
     def initialize(actor = nil, &block)
       @actor = actor
       self.repos = []
       self.targets = []
-      self.all_targets = {}
       self.work_path = ".garlic"
       self.repo_path = "~/.garlic/repos"
       configure(&block) if block_given?

data/lib/garlic/target.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)
@@ -18,12 +18,10 @@ module Garlic
     def prepare
       puts "\nPreparing target #{name} (#{tree_ish})"
       install_rails
-      runner.run(&garlic.all_targets[:prepare]) if garlic.all_targets[:prepare]
       runner.run(&@prepare) if @prepare
     end
     
-    def run(command = nil)
-      runner.run(&garlic.all_targets[:run]) if garlic.all_targets[:run]
+    def run
       runner.run(&@run) if @run
     end
     

data/lib/tabtab_definitions/garlic.rb

@@ -4,4 +4,8 @@ TabTab::Definition.register('garlic', :import => '--help') do |g|
   Garlic::Session.commands.each do |c|
     g.command c
   end
+  
+  g.command :generate do 
+    `ls ~/.garlic/templates`.split.map{|t| t.sub('.rb','')}
+  end
 end

data/templates/default.rb

@@ -7,21 +7,19 @@ garlic do
   # other repos
   repo "rails", :url => "git://github.com/rails/rails"
   
-  # targets
-  target "edge", :branch => 'origin/master'
-  target "2.1", :branch => "origin/2-1-stable"
-  target "2.0", :branch => "origin/2-0-stable"
-  target "1.2", :branch => "origin/1-2-stable"
-  
-  # all targets
-  all_targets do
-    prepare do
-      plugin "#{plugin}", :clone => true # so we can work in targets
-    end
+  # target railses
+  ['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
+      prepare do
+        plugin "#{plugin}", :clone => true # so we can work in targets
+      end
     
-    run do
-      cd "vendor/plugins/#{plugin}" do
-        sh "rake"
+      run do
+        cd "vendor/plugins/#{plugin}" do
+          sh "rake"
+        end
       end
     end
   end

data/templates/rspec.rb

@@ -9,25 +9,23 @@ garlic do
   repo "rspec", :url => "git://github.com/dchelimsky/rspec"
   repo "rspec-rails", :url => "git://github.com/dchelimsky/rspec-rails"
   
-  # targets
-  target "edge", :branch => 'origin/master'
-  target "2.1", :branch => "origin/2-1-stable"
-  target "2.0", :branch => "origin/2-0-stable"
-  target "1.2", :branch => "origin/1-2-stable"
-  
-  # all targets
-  all_targets do
-    prepare do
-      plugin "#{plugin}", :clone => true # so we can work in targets
-      plugin "rspec"
-      plugin "rspec-rails" do
-        sh "script/generate rspec -f"
+  # target railses
+  ['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
+      prepare do
+        plugin "#{plugin}", :clone => true # so we can work in targets
+        plugin "rspec"
+        plugin "rspec-rails" do
+          `script/generate rspec -f`
+        end
       end
-    end
-      
-    run do
-      cd "vendor/plugins/#{plugin}" do
-        sh "rake"
+    
+      run do
+        cd "vendor/plugins/#{plugin}" do
+          sh "rake"
+        end
       end
     end
   end

data/templates/shoulda.rb

@@ -8,22 +8,20 @@ garlic do
   repo "rails", :url => "git://github.com/rails/rails"
   repo "shoulda", :url => "git://github.com/thoughtbot/shoulda"
   
-  # targets
-  target "edge", :branch => 'origin/master'
-  target "2.1", :branch => "origin/2-1-stable"
-  target "2.0", :branch => "origin/2-0-stable"
-  target "1.2", :branch => "origin/1-2-stable"
-  
-  # all targets
-  all_targets do
-    prepare do
-      plugin "#{plugin}", :clone => true # so we can work in targets
-      plugin "shoulda"
-    end
+  # target railses
+  ['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
+      prepare do
+        plugin "#{plugin}", :clone => true # so we can work in targets
+        plugin "shoulda"
+      end
     
-    run do
-      cd "vendor/plugins/#{plugin}" do
-        sh "rake"
+      run do
+        cd "vendor/plugins/#{plugin}" do
+          sh "rake"
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ianwhite-garlic
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Ian White
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-23 00:00:00 -08:00
+date: 2008-11-25 00:00:00 -08:00
 default_executable: garlic
 dependencies: []
 
@@ -34,10 +34,10 @@ files:
 - templates/default.rb
 - templates/rspec.rb
 - templates/shoulda.rb
-- MIT-LICENSE
+- License.txt
 - README.textile
-- TODO
-- CHANGELOG
+- Todo.txt
+- History.txt
 - spec/garlic/repo_spec.rb
 - bin/garlic
 has_rdoc: true

data/CHANGELOG

@@ -1,5 +0,0 @@
-* 0.1.2
-  * making use of garlic as a gem
-  * changed paths, repos are now stored in ~/.garlic/repos (and this shared across multiple garlic sessions), work is in .garlic_work
-
-* 0.1.1 freelancing-god added gem goodness

data/TODO

@@ -1,2 +0,0 @@
-* specs
-* rewrite using grit? (research: is grit the defacto standard for ruby controlling git?)