ianwhite-garlic 0.1.8 → 0.1.9

data/History.txt

@@ -1,3 +1,11 @@
+== 0.1.9
+
+* 1 major enhancement
+  * added garlic shell commands (sh/garlic.sh) for easing the galric workflow
+    to use them, add this to your ~/.profile
+    
+      source `gem environment gemdir`/gems/ianwhite-garlic*/sh/garlic.sh
+
 == 0.1.8
 
 * 1 bugfix

data/README.textile

@@ -99,6 +99,32 @@ 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. garlic workflow shell commands
+
+If you add the following line to your .profile
+
+  source `gem environment gemdir`/gems/ianwhite-garlic*/sh/garlic.sh
+  
+Then you'll get these 4 new shell commands:
+
+  gcd [target]    cds into the specified target working repo
+  gcdp [target]   cds into the specified target plugin in the working repo
+  gup             cds back up to the garlic'd repo from within a working path
+  gpush [branch]  from within a working repo, pushes changes back to the local garlic target, and resets
+                  local changes in that target to HEAD.
+                  
+This means you might have a workflow as follows (example is for a plugin):
+
+  # run garlic, see probs in '2-2-stable'
+  
+  gcdp 2-2  # => takes you into the working repo in the '2-2-stable' target
+  
+  # fix the changes, make some commits
+  
+  gpush     # => pushes the changes back to the enclosing garlic'd repo
+  gup       # => go back up there
+  garlic    # => rerun garlic to see how the changes affect the other targets
+  
 h2. Lend a hand
 
 This is an early release, so there is plenty of scope for changes and improvement

data/lib/garlic/session.rb

@@ -104,6 +104,11 @@ module Garlic
       shell.run
     end
     
+    define_command :path, "return the work dir for the specified target" do |*path_target|
+      self.run_targets = path_target.first if path_target.any?
+      puts determine_targets.first.path
+    end
+    
     define_command :run, "Run each garlic TARGET" do
       these_targets = determine_targets
       target_names, failed_names = these_targets.map{|t| t.name}, []

data/lib/garlic/target.rb

@@ -81,9 +81,9 @@ module Garlic
         old_tree_ish = repo.head_sha
         repo.checkout(tree_ish) if tree_ish       
         if read_sha(install_path) == repo.head_sha
-          puts "#{install_path} is up to date at #{tree_ish || 'default'}"
+          puts "#{install_path} is up to date at #{tree_ish || repo.head_sha[0..6]}"
         else
-          puts "#{install_path} needs update to #{tree_ish || 'default'}, exporting archive from #{repo.name}..."
+          puts "#{install_path} needs update to #{tree_ish || repo.head_sha[0..6]}, exporting archive from #{repo.name}..."
           repo.export_to(File.join(path, install_path))
           cd(path) { garlic.instance_eval(&block) } if block_given?
           write_sha(install_path, repo.head_sha)

data/lib/garlic.rb

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

data/sh/garlic.sh

@@ -0,0 +1,34 @@
+# garlic shell helpers
+
+# cd into the work path of a garlic target
+gcd ()
+{
+  cd `garlic path $1`
+}
+
+# cd into probable plugin dir of a garlic target
+gcdp ()
+{
+  here=`pwd | sed 's/.*\///'`
+  cd `garlic path $1`/vendor/plugins/$here
+}
+
+# cd back up to enclosing garlic project
+gup ()
+{
+  cd `pwd | sed 's/\.garlic.*//'`
+}
+
+# push changes back to local garlic origin, resetting the origin
+gpush ()
+{
+  if [ `pwd | sed 's/\.garlic//'` == `pwd` ]; then
+      echo "gpush can only be used in a garlic work repo";
+  else
+    git push origin $1 2>&1 | grep -v warning;
+    here=`pwd`;
+    gup;
+    git reset --hard;
+    cd $here;
+  fi
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ianwhite-garlic
 version: !ruby/object:Gem::Version 
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors: 
 - Ian White
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-08 00:00:00 -08:00
+date: 2009-06-27 00:00:00 -07:00
 default_executable: garlic
 dependencies: []
 
@@ -34,12 +34,13 @@ files:
 - templates/default.rb
 - templates/rspec.rb
 - templates/shoulda.rb
+- bin/garlic
+- sh/garlic.sh
 - License.txt
 - README.textile
 - Todo.txt
 - History.txt
 - spec/garlic/repo_spec.rb
-- bin/garlic
 has_rdoc: true
 homepage: http://github.com/ianwhite/garlic/tree
 post_install_message: